diff options
886 files changed, 2980 insertions, 2980 deletions
diff --git a/src/etc/checkstyle/RequiredHeader.txt b/src/etc/checkstyle/RequiredHeader.txt index 80f2af946..7c9d7cf72 100755 --- a/src/etc/checkstyle/RequiredHeader.txt +++ b/src/etc/checkstyle/RequiredHeader.txt @@ -1,4 +1,4 @@ -/* +/* * Copyright Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,5 +12,5 @@ * 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. - * + * */ diff --git a/src/main/org/apache/tools/ant/AntClassLoader.java b/src/main/org/apache/tools/ant/AntClassLoader.java index 28be916d9..3eed459b1 100644 --- a/src/main/org/apache/tools/ant/AntClassLoader.java +++ b/src/main/org/apache/tools/ant/AntClassLoader.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/AntTypeDefinition.java b/src/main/org/apache/tools/ant/AntTypeDefinition.java index 44e9b3459..de225845b 100644 --- a/src/main/org/apache/tools/ant/AntTypeDefinition.java +++ b/src/main/org/apache/tools/ant/AntTypeDefinition.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/BuildEvent.java b/src/main/org/apache/tools/ant/BuildEvent.java index e0e6cd046..10909661b 100644 --- a/src/main/org/apache/tools/ant/BuildEvent.java +++ b/src/main/org/apache/tools/ant/BuildEvent.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/BuildException.java b/src/main/org/apache/tools/ant/BuildException.java index 0d7916209..cb8c29f9a 100644 --- a/src/main/org/apache/tools/ant/BuildException.java +++ b/src/main/org/apache/tools/ant/BuildException.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/BuildListener.java b/src/main/org/apache/tools/ant/BuildListener.java index 6f7cb0560..e55e477e8 100644 --- a/src/main/org/apache/tools/ant/BuildListener.java +++ b/src/main/org/apache/tools/ant/BuildListener.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/BuildLogger.java b/src/main/org/apache/tools/ant/BuildLogger.java index 92a4741c4..9354c716e 100644 --- a/src/main/org/apache/tools/ant/BuildLogger.java +++ b/src/main/org/apache/tools/ant/BuildLogger.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/ComponentHelper.java b/src/main/org/apache/tools/ant/ComponentHelper.java index 320f55af3..5a5116b55 100644 --- a/src/main/org/apache/tools/ant/ComponentHelper.java +++ b/src/main/org/apache/tools/ant/ComponentHelper.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/DefaultLogger.java b/src/main/org/apache/tools/ant/DefaultLogger.java index f16a46dab..ced84ea92 100644 --- a/src/main/org/apache/tools/ant/DefaultLogger.java +++ b/src/main/org/apache/tools/ant/DefaultLogger.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/DemuxInputStream.java b/src/main/org/apache/tools/ant/DemuxInputStream.java index 2d844fd7c..32671a3b1 100644 --- a/src/main/org/apache/tools/ant/DemuxInputStream.java +++ b/src/main/org/apache/tools/ant/DemuxInputStream.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/DemuxOutputStream.java b/src/main/org/apache/tools/ant/DemuxOutputStream.java index 9582ace0a..cbd7a7507 100644 --- a/src/main/org/apache/tools/ant/DemuxOutputStream.java +++ b/src/main/org/apache/tools/ant/DemuxOutputStream.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/Diagnostics.java b/src/main/org/apache/tools/ant/Diagnostics.java index 6e096bf64..11235e6fe 100644 --- a/src/main/org/apache/tools/ant/Diagnostics.java +++ b/src/main/org/apache/tools/ant/Diagnostics.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java index 2f8234ce2..9c9c6aaf1 100644 --- a/src/main/org/apache/tools/ant/DirectoryScanner.java +++ b/src/main/org/apache/tools/ant/DirectoryScanner.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/DynamicConfigurator.java b/src/main/org/apache/tools/ant/DynamicConfigurator.java index 7e75e4bc2..18cd9a824 100644 --- a/src/main/org/apache/tools/ant/DynamicConfigurator.java +++ b/src/main/org/apache/tools/ant/DynamicConfigurator.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/ExitException.java b/src/main/org/apache/tools/ant/ExitException.java index 3bf8e3cef..ca2005eed 100644 --- a/src/main/org/apache/tools/ant/ExitException.java +++ b/src/main/org/apache/tools/ant/ExitException.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; @@ -48,7 +48,7 @@ public class ExitException extends SecurityException { super(msg); this.status = status; } - + /** * The status code returned by System.exit() * diff --git a/src/main/org/apache/tools/ant/FileScanner.java b/src/main/org/apache/tools/ant/FileScanner.java index 3ca9579a0..e55beff74 100644 --- a/src/main/org/apache/tools/ant/FileScanner.java +++ b/src/main/org/apache/tools/ant/FileScanner.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/IntrospectionHelper.java b/src/main/org/apache/tools/ant/IntrospectionHelper.java index 940d7e0c7..018929cc0 100644 --- a/src/main/org/apache/tools/ant/IntrospectionHelper.java +++ b/src/main/org/apache/tools/ant/IntrospectionHelper.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; @@ -996,7 +996,7 @@ public final class IntrospectionHelper implements BuildListener { } final boolean finalIncludeProject = includeProject; final Constructor finalConstructor = c; - + return new AttributeSetter() { public void set(Project p, Object parent, String value) throws InvocationTargetException, IllegalAccessException, BuildException { @@ -1017,7 +1017,7 @@ public final class IntrospectionHelper implements BuildListener { } } }; - + } } diff --git a/src/main/org/apache/tools/ant/Location.java b/src/main/org/apache/tools/ant/Location.java index d12d0ac44..74a9f3a81 100644 --- a/src/main/org/apache/tools/ant/Location.java +++ b/src/main/org/apache/tools/ant/Location.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/MagicNames.java b/src/main/org/apache/tools/ant/MagicNames.java index 5d7c5b55b..aa2913950 100644 --- a/src/main/org/apache/tools/ant/MagicNames.java +++ b/src/main/org/apache/tools/ant/MagicNames.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/Main.java b/src/main/org/apache/tools/ant/Main.java index 776143d61..bac37399e 100644 --- a/src/main/org/apache/tools/ant/Main.java +++ b/src/main/org/apache/tools/ant/Main.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/NoBannerLogger.java b/src/main/org/apache/tools/ant/NoBannerLogger.java index 1799f676f..da20f6a7b 100644 --- a/src/main/org/apache/tools/ant/NoBannerLogger.java +++ b/src/main/org/apache/tools/ant/NoBannerLogger.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/PathTokenizer.java b/src/main/org/apache/tools/ant/PathTokenizer.java index 99c1e25ff..31937539b 100644 --- a/src/main/org/apache/tools/ant/PathTokenizer.java +++ b/src/main/org/apache/tools/ant/PathTokenizer.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java index 73cb66e3f..1445a117c 100644 --- a/src/main/org/apache/tools/ant/Project.java +++ b/src/main/org/apache/tools/ant/Project.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/ProjectComponent.java b/src/main/org/apache/tools/ant/ProjectComponent.java index 0e2ee8973..fd711682b 100644 --- a/src/main/org/apache/tools/ant/ProjectComponent.java +++ b/src/main/org/apache/tools/ant/ProjectComponent.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java index e5cd97663..40f8f10ed 100644 --- a/src/main/org/apache/tools/ant/ProjectHelper.java +++ b/src/main/org/apache/tools/ant/ProjectHelper.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; @@ -497,7 +497,7 @@ public class ProjectHelper { } return componentName.substring(0, index); } - + /** * extract the element name from a component name * diff --git a/src/main/org/apache/tools/ant/PropertyHelper.java b/src/main/org/apache/tools/ant/PropertyHelper.java index 8cf3e0382..62658206d 100644 --- a/src/main/org/apache/tools/ant/PropertyHelper.java +++ b/src/main/org/apache/tools/ant/PropertyHelper.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/RuntimeConfigurable.java b/src/main/org/apache/tools/ant/RuntimeConfigurable.java index 460a813c3..9f49291f6 100644 --- a/src/main/org/apache/tools/ant/RuntimeConfigurable.java +++ b/src/main/org/apache/tools/ant/RuntimeConfigurable.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/Target.java b/src/main/org/apache/tools/ant/Target.java index 7a8b3b3e7..5e40eefdf 100644 --- a/src/main/org/apache/tools/ant/Target.java +++ b/src/main/org/apache/tools/ant/Target.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/Task.java b/src/main/org/apache/tools/ant/Task.java index 200026c99..3814c2dbb 100644 --- a/src/main/org/apache/tools/ant/Task.java +++ b/src/main/org/apache/tools/ant/Task.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/TaskAdapter.java b/src/main/org/apache/tools/ant/TaskAdapter.java index 6ec800a72..1027aaf36 100644 --- a/src/main/org/apache/tools/ant/TaskAdapter.java +++ b/src/main/org/apache/tools/ant/TaskAdapter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/TaskContainer.java b/src/main/org/apache/tools/ant/TaskContainer.java index 22e643b5a..f1d61b02a 100644 --- a/src/main/org/apache/tools/ant/TaskContainer.java +++ b/src/main/org/apache/tools/ant/TaskContainer.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/TypeAdapter.java b/src/main/org/apache/tools/ant/TypeAdapter.java index 936c2933f..e6fb02c39 100644 --- a/src/main/org/apache/tools/ant/TypeAdapter.java +++ b/src/main/org/apache/tools/ant/TypeAdapter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/UnknownElement.java b/src/main/org/apache/tools/ant/UnknownElement.java index 739feb27c..3c6ba11bc 100644 --- a/src/main/org/apache/tools/ant/UnknownElement.java +++ b/src/main/org/apache/tools/ant/UnknownElement.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; @@ -276,7 +276,7 @@ public class UnknownElement extends Task { // commented out for the moment as the unit tests fail // if it is done //getWrapper().setProxy(null); - + } /** diff --git a/src/main/org/apache/tools/ant/XmlLogger.java b/src/main/org/apache/tools/ant/XmlLogger.java index 4bdf00cd3..12f7efac1 100644 --- a/src/main/org/apache/tools/ant/XmlLogger.java +++ b/src/main/org/apache/tools/ant/XmlLogger.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/main/org/apache/tools/ant/filters/BaseFilterReader.java b/src/main/org/apache/tools/ant/filters/BaseFilterReader.java index bba23578d..7e1495e07 100644 --- a/src/main/org/apache/tools/ant/filters/BaseFilterReader.java +++ b/src/main/org/apache/tools/ant/filters/BaseFilterReader.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java b/src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java index 62e515643..dd84094b2 100644 --- a/src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java +++ b/src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/main/org/apache/tools/ant/filters/ChainableReader.java b/src/main/org/apache/tools/ant/filters/ChainableReader.java index 8db45766b..2141d2fd1 100644 --- a/src/main/org/apache/tools/ant/filters/ChainableReader.java +++ b/src/main/org/apache/tools/ant/filters/ChainableReader.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/main/org/apache/tools/ant/filters/ClassConstants.java b/src/main/org/apache/tools/ant/filters/ClassConstants.java index 4709dd554..a1d6b4109 100644 --- a/src/main/org/apache/tools/ant/filters/ClassConstants.java +++ b/src/main/org/apache/tools/ant/filters/ClassConstants.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/main/org/apache/tools/ant/filters/ConcatFilter.java b/src/main/org/apache/tools/ant/filters/ConcatFilter.java index 8ca2b733e..785e1ff38 100644 --- a/src/main/org/apache/tools/ant/filters/ConcatFilter.java +++ b/src/main/org/apache/tools/ant/filters/ConcatFilter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/main/org/apache/tools/ant/filters/EscapeUnicode.java b/src/main/org/apache/tools/ant/filters/EscapeUnicode.java index 189ebf442..310f7cb8f 100644 --- a/src/main/org/apache/tools/ant/filters/EscapeUnicode.java +++ b/src/main/org/apache/tools/ant/filters/EscapeUnicode.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/main/org/apache/tools/ant/filters/ExpandProperties.java b/src/main/org/apache/tools/ant/filters/ExpandProperties.java index 61dccc8a4..500d81d36 100644 --- a/src/main/org/apache/tools/ant/filters/ExpandProperties.java +++ b/src/main/org/apache/tools/ant/filters/ExpandProperties.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/main/org/apache/tools/ant/filters/HeadFilter.java b/src/main/org/apache/tools/ant/filters/HeadFilter.java index 547a03722..ef8e31daa 100644 --- a/src/main/org/apache/tools/ant/filters/HeadFilter.java +++ b/src/main/org/apache/tools/ant/filters/HeadFilter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/main/org/apache/tools/ant/filters/LineContains.java b/src/main/org/apache/tools/ant/filters/LineContains.java index 329129866..a255302da 100644 --- a/src/main/org/apache/tools/ant/filters/LineContains.java +++ b/src/main/org/apache/tools/ant/filters/LineContains.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java b/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java index ec362d0ba..287998f99 100644 --- a/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java +++ b/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/main/org/apache/tools/ant/filters/PrefixLines.java b/src/main/org/apache/tools/ant/filters/PrefixLines.java index 2407191e4..373f5c067 100644 --- a/src/main/org/apache/tools/ant/filters/PrefixLines.java +++ b/src/main/org/apache/tools/ant/filters/PrefixLines.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/main/org/apache/tools/ant/filters/ReplaceTokens.java b/src/main/org/apache/tools/ant/filters/ReplaceTokens.java index 35a8643a1..08fd22bee 100644 --- a/src/main/org/apache/tools/ant/filters/ReplaceTokens.java +++ b/src/main/org/apache/tools/ant/filters/ReplaceTokens.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/main/org/apache/tools/ant/filters/StringInputStream.java b/src/main/org/apache/tools/ant/filters/StringInputStream.java index c9740dabd..96a0732f3 100644 --- a/src/main/org/apache/tools/ant/filters/StringInputStream.java +++ b/src/main/org/apache/tools/ant/filters/StringInputStream.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/main/org/apache/tools/ant/filters/StripJavaComments.java b/src/main/org/apache/tools/ant/filters/StripJavaComments.java index 78387fde4..4b3240a56 100644 --- a/src/main/org/apache/tools/ant/filters/StripJavaComments.java +++ b/src/main/org/apache/tools/ant/filters/StripJavaComments.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/main/org/apache/tools/ant/filters/StripLineBreaks.java b/src/main/org/apache/tools/ant/filters/StripLineBreaks.java index 36af80bb9..9cd12bd92 100644 --- a/src/main/org/apache/tools/ant/filters/StripLineBreaks.java +++ b/src/main/org/apache/tools/ant/filters/StripLineBreaks.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/main/org/apache/tools/ant/filters/StripLineComments.java b/src/main/org/apache/tools/ant/filters/StripLineComments.java index 3d03f28fa..afaea8b0f 100644 --- a/src/main/org/apache/tools/ant/filters/StripLineComments.java +++ b/src/main/org/apache/tools/ant/filters/StripLineComments.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/main/org/apache/tools/ant/filters/TabsToSpaces.java b/src/main/org/apache/tools/ant/filters/TabsToSpaces.java index d76065b52..4341586da 100644 --- a/src/main/org/apache/tools/ant/filters/TabsToSpaces.java +++ b/src/main/org/apache/tools/ant/filters/TabsToSpaces.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/main/org/apache/tools/ant/filters/TailFilter.java b/src/main/org/apache/tools/ant/filters/TailFilter.java index cfade5777..45820194d 100644 --- a/src/main/org/apache/tools/ant/filters/TailFilter.java +++ b/src/main/org/apache/tools/ant/filters/TailFilter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/main/org/apache/tools/ant/filters/TokenFilter.java b/src/main/org/apache/tools/ant/filters/TokenFilter.java index 73aaf5849..d5ffbe42d 100644 --- a/src/main/org/apache/tools/ant/filters/TokenFilter.java +++ b/src/main/org/apache/tools/ant/filters/TokenFilter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java b/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java index 560ed6bcf..b037f5651 100644 --- a/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java +++ b/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters.util; diff --git a/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java b/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java index 40dfebecd..1abe795bd 100644 --- a/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java +++ b/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters.util; diff --git a/src/main/org/apache/tools/ant/helper/AntXMLContext.java b/src/main/org/apache/tools/ant/helper/AntXMLContext.java index 7f7df33ed..6d127509d 100644 --- a/src/main/org/apache/tools/ant/helper/AntXMLContext.java +++ b/src/main/org/apache/tools/ant/helper/AntXMLContext.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.helper; diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java index 4a30a6dac..e6c6eb921 100644 --- a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java +++ b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.helper; diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java b/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java index f89a68fbe..183db227f 100644 --- a/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java +++ b/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.helper; diff --git a/src/main/org/apache/tools/ant/input/DefaultInputHandler.java b/src/main/org/apache/tools/ant/input/DefaultInputHandler.java index fc5e601e3..fdfea36ed 100644 --- a/src/main/org/apache/tools/ant/input/DefaultInputHandler.java +++ b/src/main/org/apache/tools/ant/input/DefaultInputHandler.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.input; diff --git a/src/main/org/apache/tools/ant/input/InputHandler.java b/src/main/org/apache/tools/ant/input/InputHandler.java index af5741e6f..f877c7b4a 100644 --- a/src/main/org/apache/tools/ant/input/InputHandler.java +++ b/src/main/org/apache/tools/ant/input/InputHandler.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.input; diff --git a/src/main/org/apache/tools/ant/input/InputRequest.java b/src/main/org/apache/tools/ant/input/InputRequest.java index f9252f8f5..3f6720657 100644 --- a/src/main/org/apache/tools/ant/input/InputRequest.java +++ b/src/main/org/apache/tools/ant/input/InputRequest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.input; diff --git a/src/main/org/apache/tools/ant/input/MultipleChoiceInputRequest.java b/src/main/org/apache/tools/ant/input/MultipleChoiceInputRequest.java index ea9e24f95..8a6ff1872 100644 --- a/src/main/org/apache/tools/ant/input/MultipleChoiceInputRequest.java +++ b/src/main/org/apache/tools/ant/input/MultipleChoiceInputRequest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.input; diff --git a/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java b/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java index a98971085..b210b3952 100644 --- a/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java +++ b/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.input; diff --git a/src/main/org/apache/tools/ant/launch/AntMain.java b/src/main/org/apache/tools/ant/launch/AntMain.java index 08a38211e..e47fd14de 100644 --- a/src/main/org/apache/tools/ant/launch/AntMain.java +++ b/src/main/org/apache/tools/ant/launch/AntMain.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.launch; diff --git a/src/main/org/apache/tools/ant/launch/LaunchException.java b/src/main/org/apache/tools/ant/launch/LaunchException.java index 03bad1ff0..d3487902b 100644 --- a/src/main/org/apache/tools/ant/launch/LaunchException.java +++ b/src/main/org/apache/tools/ant/launch/LaunchException.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.launch; diff --git a/src/main/org/apache/tools/ant/launch/Launcher.java b/src/main/org/apache/tools/ant/launch/Launcher.java index 45808f73c..a8d69e10e 100644 --- a/src/main/org/apache/tools/ant/launch/Launcher.java +++ b/src/main/org/apache/tools/ant/launch/Launcher.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.launch; @@ -118,7 +118,7 @@ public class Launcher { while (myTokenizer.hasMoreElements()) { String elementName = myTokenizer.nextToken(); File element = new File(elementName); - if (elementName.startsWith("%") && elementName.endsWith("%") + if (elementName.startsWith("%") && elementName.endsWith("%") && !element.exists()) { continue; } diff --git a/src/main/org/apache/tools/ant/launch/Locator.java b/src/main/org/apache/tools/ant/launch/Locator.java index 17acaf9bf..7cc96a4d9 100644 --- a/src/main/org/apache/tools/ant/launch/Locator.java +++ b/src/main/org/apache/tools/ant/launch/Locator.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.launch; diff --git a/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java b/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java index 6d5e1d82e..eca1f4e86 100644 --- a/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java +++ b/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.listener; diff --git a/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java b/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java index a229ee7f3..54916758d 100644 --- a/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java +++ b/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.listener; diff --git a/src/main/org/apache/tools/ant/listener/Log4jListener.java b/src/main/org/apache/tools/ant/listener/Log4jListener.java index 966941567..93fe79eb9 100644 --- a/src/main/org/apache/tools/ant/listener/Log4jListener.java +++ b/src/main/org/apache/tools/ant/listener/Log4jListener.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.listener; diff --git a/src/main/org/apache/tools/ant/listener/MailLogger.java b/src/main/org/apache/tools/ant/listener/MailLogger.java index 22f390802..8fd61646b 100644 --- a/src/main/org/apache/tools/ant/listener/MailLogger.java +++ b/src/main/org/apache/tools/ant/listener/MailLogger.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.listener; diff --git a/src/main/org/apache/tools/ant/listener/defaults.properties b/src/main/org/apache/tools/ant/listener/defaults.properties index f60a3fd5e..6f9a00503 100644 --- a/src/main/org/apache/tools/ant/listener/defaults.properties +++ b/src/main/org/apache/tools/ant/listener/defaults.properties @@ -13,7 +13,7 @@ # 5 -> link # 7 -> Reverse # 8 -> Hidden -# +# # Foreground is one of the following: # 30 -> Black # 31 -> Red diff --git a/src/main/org/apache/tools/ant/loader/AntClassLoader2.java b/src/main/org/apache/tools/ant/loader/AntClassLoader2.java index 692f88c1e..24d494a9d 100644 --- a/src/main/org/apache/tools/ant/loader/AntClassLoader2.java +++ b/src/main/org/apache/tools/ant/loader/AntClassLoader2.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.loader; diff --git a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java index 7d6105773..0b8c80503 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Ant.java b/src/main/org/apache/tools/ant/taskdefs/Ant.java index 169034155..2bb9c1531 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Ant.java +++ b/src/main/org/apache/tools/ant/taskdefs/Ant.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java index a4dafe22a..7a1e70e2e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java +++ b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Antlib.java b/src/main/org/apache/tools/ant/taskdefs/Antlib.java index 43e2e614d..df6b35344 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Antlib.java +++ b/src/main/org/apache/tools/ant/taskdefs/Antlib.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/AntlibDefinition.java b/src/main/org/apache/tools/ant/taskdefs/AntlibDefinition.java index 621714daf..df2854b4e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AntlibDefinition.java +++ b/src/main/org/apache/tools/ant/taskdefs/AntlibDefinition.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Available.java b/src/main/org/apache/tools/ant/taskdefs/Available.java index 62d99826c..c5de47573 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Available.java +++ b/src/main/org/apache/tools/ant/taskdefs/Available.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java b/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java index e289ff584..9b88173f2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java +++ b/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/BZip2.java b/src/main/org/apache/tools/ant/taskdefs/BZip2.java index 2af573392..dff0fc8fc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/BZip2.java +++ b/src/main/org/apache/tools/ant/taskdefs/BZip2.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Basename.java b/src/main/org/apache/tools/ant/taskdefs/Basename.java index 90dd0e73e..c628624c4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Basename.java +++ b/src/main/org/apache/tools/ant/taskdefs/Basename.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/BuildNumber.java b/src/main/org/apache/tools/ant/taskdefs/BuildNumber.java index 5bc9f8057..e96a9c5a8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/BuildNumber.java +++ b/src/main/org/apache/tools/ant/taskdefs/BuildNumber.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/CVSPass.java b/src/main/org/apache/tools/ant/taskdefs/CVSPass.java index 9651fd677..5704986ad 100644 --- a/src/main/org/apache/tools/ant/taskdefs/CVSPass.java +++ b/src/main/org/apache/tools/ant/taskdefs/CVSPass.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/CallTarget.java b/src/main/org/apache/tools/ant/taskdefs/CallTarget.java index 1c3eec777..80e99b417 100644 --- a/src/main/org/apache/tools/ant/taskdefs/CallTarget.java +++ b/src/main/org/apache/tools/ant/taskdefs/CallTarget.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Checksum.java b/src/main/org/apache/tools/ant/taskdefs/Checksum.java index b42ced902..a03234a55 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Checksum.java +++ b/src/main/org/apache/tools/ant/taskdefs/Checksum.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Chmod.java b/src/main/org/apache/tools/ant/taskdefs/Chmod.java index 1dd4e426c..20bf07803 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Chmod.java +++ b/src/main/org/apache/tools/ant/taskdefs/Chmod.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Classloader.java b/src/main/org/apache/tools/ant/taskdefs/Classloader.java index 65691e82d..f7b0ef02a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Classloader.java +++ b/src/main/org/apache/tools/ant/taskdefs/Classloader.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Concat.java b/src/main/org/apache/tools/ant/taskdefs/Concat.java index 46f59488a..83ae01783 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Concat.java +++ b/src/main/org/apache/tools/ant/taskdefs/Concat.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java b/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java index 3f0b865f8..2e771fde7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Copy.java b/src/main/org/apache/tools/ant/taskdefs/Copy.java index 58e234a78..e6fbd763c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Copy.java +++ b/src/main/org/apache/tools/ant/taskdefs/Copy.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -374,7 +374,7 @@ public class Copy extends Task { } if (forceOverwrite || !destFile.exists() - || (file.lastModified() - granularity + || (file.lastModified() - granularity > destFile.lastModified())) { fileCopyMap.put(file.getAbsolutePath(), new String[] {destFile.getAbsolutePath()}); diff --git a/src/main/org/apache/tools/ant/taskdefs/Copydir.java b/src/main/org/apache/tools/ant/taskdefs/Copydir.java index 75f29bdc1..178b4ddf4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Copydir.java +++ b/src/main/org/apache/tools/ant/taskdefs/Copydir.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Copyfile.java b/src/main/org/apache/tools/ant/taskdefs/Copyfile.java index e4dde8a02..2e31a2034 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Copyfile.java +++ b/src/main/org/apache/tools/ant/taskdefs/Copyfile.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Cvs.java b/src/main/org/apache/tools/ant/taskdefs/Cvs.java index ebda5935c..522a07cf7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Cvs.java +++ b/src/main/org/apache/tools/ant/taskdefs/Cvs.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/DefBase.java b/src/main/org/apache/tools/ant/taskdefs/DefBase.java index 9f4412e72..4dc11b74a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/DefBase.java +++ b/src/main/org/apache/tools/ant/taskdefs/DefBase.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java b/src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java index 4df0d96da..09eff87fb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java +++ b/src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Definer.java b/src/main/org/apache/tools/ant/taskdefs/Definer.java index 684523ab1..0ac44460d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Definer.java +++ b/src/main/org/apache/tools/ant/taskdefs/Definer.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Delete.java b/src/main/org/apache/tools/ant/taskdefs/Delete.java index 08b86afe2..828259e04 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Delete.java +++ b/src/main/org/apache/tools/ant/taskdefs/Delete.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Deltree.java b/src/main/org/apache/tools/ant/taskdefs/Deltree.java index b77fdf520..ce0cf979b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Deltree.java +++ b/src/main/org/apache/tools/ant/taskdefs/Deltree.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/DependSet.java b/src/main/org/apache/tools/ant/taskdefs/DependSet.java index 02a685320..4f6c93d01 100644 --- a/src/main/org/apache/tools/ant/taskdefs/DependSet.java +++ b/src/main/org/apache/tools/ant/taskdefs/DependSet.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Dirname.java b/src/main/org/apache/tools/ant/taskdefs/Dirname.java index 229a05eb2..1ca2046ae 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Dirname.java +++ b/src/main/org/apache/tools/ant/taskdefs/Dirname.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Ear.java b/src/main/org/apache/tools/ant/taskdefs/Ear.java index 45fdefce8..38a2f6253 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Ear.java +++ b/src/main/org/apache/tools/ant/taskdefs/Ear.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Echo.java b/src/main/org/apache/tools/ant/taskdefs/Echo.java index 36818ab7b..d2fe5b302 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Echo.java +++ b/src/main/org/apache/tools/ant/taskdefs/Echo.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Exec.java b/src/main/org/apache/tools/ant/taskdefs/Exec.java index 20ff8a935..08f26fdff 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Exec.java +++ b/src/main/org/apache/tools/ant/taskdefs/Exec.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java index 7415f2ae2..fe1fc173d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Execute.java b/src/main/org/apache/tools/ant/taskdefs/Execute.java index f7d70abb4..a3f557c7f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Execute.java +++ b/src/main/org/apache/tools/ant/taskdefs/Execute.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java index b792c9420..02ff14c7e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java +++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ @@ -228,4 +228,4 @@ public class ExecuteJava implements Runnable, TimeoutObserver { public synchronized boolean killedProcess() { return timedOut; } -}
\ No newline at end of file +} diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java index 97e3f68d0..8ac1f54ee 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java +++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.java index 306a1a976..90a35b7ee 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java index aab1c71f6..e1d821c75 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java +++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Exit.java b/src/main/org/apache/tools/ant/taskdefs/Exit.java index 829ca292f..2983cf3c1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Exit.java +++ b/src/main/org/apache/tools/ant/taskdefs/Exit.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -140,4 +140,4 @@ public class Exit extends Task { return getProject().getProperty(unlessCondition) == null; } -}
\ No newline at end of file +} diff --git a/src/main/org/apache/tools/ant/taskdefs/Expand.java b/src/main/org/apache/tools/ant/taskdefs/Expand.java index c92f1dc4b..178857b24 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Expand.java +++ b/src/main/org/apache/tools/ant/taskdefs/Expand.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Filter.java b/src/main/org/apache/tools/ant/taskdefs/Filter.java index e5946d26d..91cc3faeb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Filter.java +++ b/src/main/org/apache/tools/ant/taskdefs/Filter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java index 0a88a70f7..f615d38ee 100644 --- a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java +++ b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -410,7 +410,7 @@ public class FixCRLF extends MatchingTask { } // end of try-catch } else { // (tabs != ASIS) - + while (line.getNext() < linelen) { switch (lines.getState()) { diff --git a/src/main/org/apache/tools/ant/taskdefs/GUnzip.java b/src/main/org/apache/tools/ant/taskdefs/GUnzip.java index 9dd8a170d..efef43dcc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/GUnzip.java +++ b/src/main/org/apache/tools/ant/taskdefs/GUnzip.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/GZip.java b/src/main/org/apache/tools/ant/taskdefs/GZip.java index c770e6c4b..5f12acf8a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/GZip.java +++ b/src/main/org/apache/tools/ant/taskdefs/GZip.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java index f1e5a0af1..7d864659b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java +++ b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Get.java b/src/main/org/apache/tools/ant/taskdefs/Get.java index 896cf3fde..5919e1e5c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Get.java +++ b/src/main/org/apache/tools/ant/taskdefs/Get.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/ImportTask.java b/src/main/org/apache/tools/ant/taskdefs/ImportTask.java index d2ec32434..c07b1973f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ImportTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/ImportTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -71,7 +71,7 @@ public class ImportTask extends Task { public void setOptional(boolean optional) { this.optional = true; } - + /** * the name of the file to import. How relative paths are resolved is still * in flux: use absolute paths for safety. @@ -95,7 +95,7 @@ public class ImportTask extends Task { || !"".equals(getOwningTarget().getName())) { throw new BuildException("import only allowed as a top-level task"); } - + ProjectHelper helper = (ProjectHelper) getProject().getReference("ant.projectHelper"); Vector importStack = helper.getImportStack(); diff --git a/src/main/org/apache/tools/ant/taskdefs/Input.java b/src/main/org/apache/tools/ant/taskdefs/Input.java index 976a2e045..b27f82c93 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Input.java +++ b/src/main/org/apache/tools/ant/taskdefs/Input.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java b/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java index 683826c7d..b5b239d16 100644 --- a/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java b/src/main/org/apache/tools/ant/taskdefs/Jar.java index 0f41a597e..f7ecaf35f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Jar.java +++ b/src/main/org/apache/tools/ant/taskdefs/Jar.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Java.java b/src/main/org/apache/tools/ant/taskdefs/Java.java index e82c7ce8e..0e2e3e96e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Java.java +++ b/src/main/org/apache/tools/ant/taskdefs/Java.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java index eb95f9586..18c3d2502 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javac.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java index 29addcf34..eb84cb2cd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Jikes.java b/src/main/org/apache/tools/ant/taskdefs/Jikes.java index 43c5ecfbf..829f70599 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Jikes.java +++ b/src/main/org/apache/tools/ant/taskdefs/Jikes.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java b/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java index 404eea35c..870efb8de 100644 --- a/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java +++ b/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/KeySubst.java b/src/main/org/apache/tools/ant/taskdefs/KeySubst.java index 33b2742b2..ecb1d9bb9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/KeySubst.java +++ b/src/main/org/apache/tools/ant/taskdefs/KeySubst.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/LoadFile.java b/src/main/org/apache/tools/ant/taskdefs/LoadFile.java index 9387b2c1b..ec2b4b34e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/LoadFile.java +++ b/src/main/org/apache/tools/ant/taskdefs/LoadFile.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java b/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java index 22fe8ff5b..bb2cb7b21 100644 --- a/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java +++ b/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -138,7 +138,7 @@ public final class LoadProperties extends Task { final Properties props = new Properties(); props.load(tis); - Property propertyTask = + Property propertyTask = (Property) getProject().createTask("property"); propertyTask.setTaskName(getTaskName()); propertyTask.addProperties(props); diff --git a/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java b/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java index 7c6e9c932..4e2281dca 100644 --- a/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java +++ b/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java index af46ddfaa..0ca9fefaf 100644 --- a/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/MacroDef.java b/src/main/org/apache/tools/ant/taskdefs/MacroDef.java index 504f801c7..f4ad1a850 100644 --- a/src/main/org/apache/tools/ant/taskdefs/MacroDef.java +++ b/src/main/org/apache/tools/ant/taskdefs/MacroDef.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java b/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java index ed6f7f925..6cd960194 100644 --- a/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java +++ b/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Manifest.java b/src/main/org/apache/tools/ant/taskdefs/Manifest.java index 119678820..e0e5692e7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Manifest.java +++ b/src/main/org/apache/tools/ant/taskdefs/Manifest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/ManifestException.java b/src/main/org/apache/tools/ant/taskdefs/ManifestException.java index 82cf9e885..0f73b699a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ManifestException.java +++ b/src/main/org/apache/tools/ant/taskdefs/ManifestException.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java b/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java index 588d4921a..38b89f20a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java b/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java index cb98f97a6..a0d7bc15b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -444,4 +444,4 @@ public abstract class MatchingTask extends Task implements SelectorContainer { protected final FileSet getImplicitFileSet() { return fileset; } -}
\ No newline at end of file +} diff --git a/src/main/org/apache/tools/ant/taskdefs/Mkdir.java b/src/main/org/apache/tools/ant/taskdefs/Mkdir.java index dbc691baa..3cba95022 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Mkdir.java +++ b/src/main/org/apache/tools/ant/taskdefs/Mkdir.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Move.java b/src/main/org/apache/tools/ant/taskdefs/Move.java index c01a81b86..0a059c3ff 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Move.java +++ b/src/main/org/apache/tools/ant/taskdefs/Move.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Nice.java b/src/main/org/apache/tools/ant/taskdefs/Nice.java index 738f48fa1..822943f3d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Nice.java +++ b/src/main/org/apache/tools/ant/taskdefs/Nice.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -95,4 +95,4 @@ public class Nice extends Task { this.newPriority = new Integer(newPriority); } -}
\ No newline at end of file +} diff --git a/src/main/org/apache/tools/ant/taskdefs/Pack.java b/src/main/org/apache/tools/ant/taskdefs/Pack.java index fb869d6f1..399220b16 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Pack.java +++ b/src/main/org/apache/tools/ant/taskdefs/Pack.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Parallel.java b/src/main/org/apache/tools/ant/taskdefs/Parallel.java index 99837ac94..6005c5a89 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Parallel.java +++ b/src/main/org/apache/tools/ant/taskdefs/Parallel.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Patch.java b/src/main/org/apache/tools/ant/taskdefs/Patch.java index 0fbd5502a..aa95ad888 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Patch.java +++ b/src/main/org/apache/tools/ant/taskdefs/Patch.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java index 60c04275d..a7b1b941a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java +++ b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/PreSetDef.java b/src/main/org/apache/tools/ant/taskdefs/PreSetDef.java index 8b7d78729..d3dea0c74 100644 --- a/src/main/org/apache/tools/ant/taskdefs/PreSetDef.java +++ b/src/main/org/apache/tools/ant/taskdefs/PreSetDef.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java b/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java index f844e9051..f699ecb55 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java +++ b/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Property.java b/src/main/org/apache/tools/ant/taskdefs/Property.java index 1ad270bbf..ec057c5d6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Property.java +++ b/src/main/org/apache/tools/ant/taskdefs/Property.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java index 690db6c5b..b4048b02f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Recorder.java b/src/main/org/apache/tools/ant/taskdefs/Recorder.java index 1f5687c7a..00e98089c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Recorder.java +++ b/src/main/org/apache/tools/ant/taskdefs/Recorder.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java b/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java index 05c46b47f..ca1a348f3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java +++ b/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Redirector.java b/src/main/org/apache/tools/ant/taskdefs/Redirector.java index a8a769c1c..40744669e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Redirector.java +++ b/src/main/org/apache/tools/ant/taskdefs/Redirector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Rename.java b/src/main/org/apache/tools/ant/taskdefs/Rename.java index c29582172..530c07b1d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Rename.java +++ b/src/main/org/apache/tools/ant/taskdefs/Rename.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Replace.java b/src/main/org/apache/tools/ant/taskdefs/Replace.java index 7baa1b51e..39d5688f0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Replace.java +++ b/src/main/org/apache/tools/ant/taskdefs/Replace.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/src/main/org/apache/tools/ant/taskdefs/Rmic.java index d5f30314b..5258e2638 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java +++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java index fa48a21bd..df970e81f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java +++ b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/SendEmail.java b/src/main/org/apache/tools/ant/taskdefs/SendEmail.java index 68dd9ae4f..78e72cfa7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/SendEmail.java +++ b/src/main/org/apache/tools/ant/taskdefs/SendEmail.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Sequential.java b/src/main/org/apache/tools/ant/taskdefs/Sequential.java index f4e11a4c3..0f9347389 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Sequential.java +++ b/src/main/org/apache/tools/ant/taskdefs/Sequential.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/SignJar.java b/src/main/org/apache/tools/ant/taskdefs/SignJar.java index 78a4cd4f5..82e4d9675 100644 --- a/src/main/org/apache/tools/ant/taskdefs/SignJar.java +++ b/src/main/org/apache/tools/ant/taskdefs/SignJar.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Sleep.java b/src/main/org/apache/tools/ant/taskdefs/Sleep.java index aa7797924..6d5d5da3a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Sleep.java +++ b/src/main/org/apache/tools/ant/taskdefs/Sleep.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java b/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java index af0c2f790..4efff5b21 100644 --- a/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java +++ b/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/SubAnt.java b/src/main/org/apache/tools/ant/taskdefs/SubAnt.java index d19a0d2c6..b316feeb2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/SubAnt.java +++ b/src/main/org/apache/tools/ant/taskdefs/SubAnt.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Sync.java b/src/main/org/apache/tools/ant/taskdefs/Sync.java index 0443e4c7b..7fac529cb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Sync.java +++ b/src/main/org/apache/tools/ant/taskdefs/Sync.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* diff --git a/src/main/org/apache/tools/ant/taskdefs/Tar.java b/src/main/org/apache/tools/ant/taskdefs/Tar.java index 6eb695353..6a97e4d02 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Tar.java +++ b/src/main/org/apache/tools/ant/taskdefs/Tar.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java b/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java index f3266d2d9..b38f53e9b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java +++ b/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Taskdef.java b/src/main/org/apache/tools/ant/taskdefs/Taskdef.java index 4cf51eaed..52804d437 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Taskdef.java +++ b/src/main/org/apache/tools/ant/taskdefs/Taskdef.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/TempFile.java b/src/main/org/apache/tools/ant/taskdefs/TempFile.java index b52792e54..fc8b3dd0c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/TempFile.java +++ b/src/main/org/apache/tools/ant/taskdefs/TempFile.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Touch.java b/src/main/org/apache/tools/ant/taskdefs/Touch.java index 041b990bc..670fa2566 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Touch.java +++ b/src/main/org/apache/tools/ant/taskdefs/Touch.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Transform.java b/src/main/org/apache/tools/ant/taskdefs/Transform.java index dca6c44f7..e23c0a877 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Transform.java +++ b/src/main/org/apache/tools/ant/taskdefs/Transform.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java index f4323ca76..50f8e30ed 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java +++ b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Typedef.java b/src/main/org/apache/tools/ant/taskdefs/Typedef.java index 56a971652..b6f378d0b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Typedef.java +++ b/src/main/org/apache/tools/ant/taskdefs/Typedef.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Unpack.java b/src/main/org/apache/tools/ant/taskdefs/Unpack.java index 277859726..402fb38fb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Unpack.java +++ b/src/main/org/apache/tools/ant/taskdefs/Unpack.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Untar.java b/src/main/org/apache/tools/ant/taskdefs/Untar.java index f65937cfe..d48a56063 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Untar.java +++ b/src/main/org/apache/tools/ant/taskdefs/Untar.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java index 706e3b34e..8484efc74 100644 --- a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java +++ b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/WaitFor.java b/src/main/org/apache/tools/ant/taskdefs/WaitFor.java index 5e2432068..d204c187b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/WaitFor.java +++ b/src/main/org/apache/tools/ant/taskdefs/WaitFor.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/War.java b/src/main/org/apache/tools/ant/taskdefs/War.java index f61ecba17..0a837f92b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/War.java +++ b/src/main/org/apache/tools/ant/taskdefs/War.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/WhichResource.java b/src/main/org/apache/tools/ant/taskdefs/WhichResource.java index d5c8782b2..6d17f9470 100644 --- a/src/main/org/apache/tools/ant/taskdefs/WhichResource.java +++ b/src/main/org/apache/tools/ant/taskdefs/WhichResource.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java b/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java index 38c2882bb..01ccca6ee 100644 --- a/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java +++ b/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison2.java b/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison2.java index 84875d623..5158780ab 100644 --- a/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison2.java +++ b/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison2.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTLogger.java b/src/main/org/apache/tools/ant/taskdefs/XSLTLogger.java index bd96163e7..c29d15eb7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/XSLTLogger.java +++ b/src/main/org/apache/tools/ant/taskdefs/XSLTLogger.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTLoggerAware.java b/src/main/org/apache/tools/ant/taskdefs/XSLTLoggerAware.java index a60c516d4..2f4a15a6b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/XSLTLoggerAware.java +++ b/src/main/org/apache/tools/ant/taskdefs/XSLTLoggerAware.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java index 15eb6f77d..34488909c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java +++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -910,4 +910,4 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger { } // -- class Factory -}
\ No newline at end of file +} diff --git a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java index 29b2e9248..105b3ec92 100644 --- a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java +++ b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java index dabd42d32..13dde4e6b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Zip.java +++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -452,7 +452,7 @@ public class Zip extends MatchingTask { r = new Resource[tmp.length + dr.length]; System.arraycopy(dr, 0, r, 0, dr.length); System.arraycopy(tmp, 0, r, dr.length, tmp.length); - } + } addResources(oldFiles, r, zOut); } finalizeZipOutputStream(zOut); @@ -594,19 +594,19 @@ public class Zip extends MatchingTask { name = name + "/"; } - if (!doFilesonly && !dealingWithFiles - && resources[i].isDirectory() + if (!doFilesonly && !dealingWithFiles + && resources[i].isDirectory() && !zfs.hasDirModeBeenSet()) { int nextToLastSlash = name.lastIndexOf("/", name.length() - 2); if (nextToLastSlash != -1) { - addParentDirs(base, name.substring(0, + addParentDirs(base, name.substring(0, nextToLastSlash + 1), zOut, prefix, dirMode); } ZipEntry ze = zf.getEntry(resources[i].getName()); addParentDirs(base, name, zOut, prefix, ze.getUnixMode()); - + } else { addParentDirs(base, name, zOut, prefix, dirMode); } @@ -617,7 +617,7 @@ public class Zip extends MatchingTask { zipFile(f, zOut, prefix + name, fileMode); } else if (!resources[i].isDirectory()) { ZipEntry ze = zf.getEntry(resources[i].getName()); - + if (ze != null) { boolean oldCompress = doCompress; if (keepCompression) { diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.java index bc7a4e9e5..0ce086ce9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.compilers; diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java b/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java index 5a2b5d7c0..779640816 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.compilers; diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java index f0a33d2fb..a06644737 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.compilers; diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java index c06251ba3..39c678849 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.compilers; diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java index 8dc87ba53..d16b289ae 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.compilers; diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java index f6682fff0..09f863ece 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.compilers; diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java b/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java index 6a2066e8b..c8f9f6952 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.compilers; diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java index 7a036371c..9b2c7347c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.compilers; diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java index 3c08801f9..796c9ecad 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.compilers; diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java index 8e65b2c30..a04e64950 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.compilers; diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Sj.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Sj.java index aa09aa05c..3dcc4f962 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/Sj.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Sj.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.compilers; diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/And.java b/src/main/org/apache/tools/ant/taskdefs/condition/And.java index f162cfe01..d9faea66f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/And.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/And.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.condition; diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Condition.java b/src/main/org/apache/tools/ant/taskdefs/condition/Condition.java index d1b1f3864..c5471a86c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Condition.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Condition.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.condition; diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java b/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java index e0a19fc57..7e29c1584 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.condition; diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Contains.java b/src/main/org/apache/tools/ant/taskdefs/condition/Contains.java index 01391b787..71fc8905d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Contains.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Contains.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.condition; diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Equals.java b/src/main/org/apache/tools/ant/taskdefs/condition/Equals.java index 6c482bb6a..36e520832 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Equals.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Equals.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.condition; diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java b/src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java index 88f6e97de..187ff3e0d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.condition; diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Http.java b/src/main/org/apache/tools/ant/taskdefs/condition/Http.java index 12b531cb9..8f1f37d7e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Http.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Http.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.condition; diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/IsFalse.java b/src/main/org/apache/tools/ant/taskdefs/condition/IsFalse.java index ffafd4279..a8928a278 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/IsFalse.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/IsFalse.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.condition; diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/IsReference.java b/src/main/org/apache/tools/ant/taskdefs/condition/IsReference.java index 9243cc2c7..94411bf2e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/IsReference.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/IsReference.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.condition; diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/IsSet.java b/src/main/org/apache/tools/ant/taskdefs/condition/IsSet.java index 206795e78..7b9f3d9e7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/IsSet.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/IsSet.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.condition; diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/IsTrue.java b/src/main/org/apache/tools/ant/taskdefs/condition/IsTrue.java index 5f531acdf..a68cca3fd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/IsTrue.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/IsTrue.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.condition; diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Not.java b/src/main/org/apache/tools/ant/taskdefs/condition/Not.java index 12026105e..c8950bcbb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Not.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Not.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.condition; diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Or.java b/src/main/org/apache/tools/ant/taskdefs/condition/Or.java index 88755dd6f..bdeaf79d1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Or.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Or.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.condition; diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java index 9bce538fd..188ef71e9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.condition; diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java b/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java index 89ca757d2..1ab1d6176 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.condition; diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/TypeFound.java b/src/main/org/apache/tools/ant/taskdefs/condition/TypeFound.java index e18d5f39a..d5ab8d5e4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/TypeFound.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/TypeFound.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.condition; diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/CVSEntry.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/CVSEntry.java index 2233423d0..9ca70f86e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/CVSEntry.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/CVSEntry.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.cvslib; diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java index cab9a6fe2..a2a00263d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.cvslib; diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java index fa6771cc0..d59c064bd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.cvslib; diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java index a6bc5497b..20ca4e2c9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.cvslib; diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java index 28576bac0..1590998f5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.cvslib; diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagEntry.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagEntry.java index 21e417846..fefd573e6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagEntry.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagEntry.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.cvslib; diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsUser.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsUser.java index f5e9e67c6..655211243 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsUser.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsUser.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.cvslib; diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsVersion.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsVersion.java index 090673dfc..ad531f417 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsVersion.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsVersion.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.cvslib; diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/RCSFile.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/RCSFile.java index 83b7547af..2ea4292fe 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/RCSFile.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/RCSFile.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.cvslib; diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingOutputStream.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingOutputStream.java index d19accd4f..8eb4d9925 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingOutputStream.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingOutputStream.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.cvslib; diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java index b66bbb4e8..3f40e56db 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.cvslib; diff --git a/src/main/org/apache/tools/ant/taskdefs/email/EmailAddress.java b/src/main/org/apache/tools/ant/taskdefs/email/EmailAddress.java index bf6e54442..3b691eaed 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/EmailAddress.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/EmailAddress.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.email; diff --git a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java index 49fd460d9..ea849dafb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.email; diff --git a/src/main/org/apache/tools/ant/taskdefs/email/Mailer.java b/src/main/org/apache/tools/ant/taskdefs/email/Mailer.java index 6afc34252..8b8ea9e8f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/Mailer.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/Mailer.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.email; diff --git a/src/main/org/apache/tools/ant/taskdefs/email/Message.java b/src/main/org/apache/tools/ant/taskdefs/email/Message.java index 4de405374..cd1fd5338 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/Message.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/Message.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.email; diff --git a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java index 4f7b4782e..e389e1798 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.email; diff --git a/src/main/org/apache/tools/ant/taskdefs/email/PlainMailer.java b/src/main/org/apache/tools/ant/taskdefs/email/PlainMailer.java index c2c62183e..0a3ee4d04 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/PlainMailer.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/PlainMailer.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.email; diff --git a/src/main/org/apache/tools/ant/taskdefs/email/UUMailer.java b/src/main/org/apache/tools/ant/taskdefs/email/UUMailer.java index a0149939e..20daa96a0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/UUMailer.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/UUMailer.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.email; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java index 31084f5f5..7b967e295 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java b/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java index 290510867..02a697431 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java index dd62e85c3..52393ff2f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; @@ -381,12 +381,12 @@ public class EchoProperties extends Task { /** * JDK 1.2 allows for the safer method * <tt>Properties.store(OutputStream, String)</tt>, which throws an - * <tt>IOException</tt> on an output error. + * <tt>IOException</tt> on an output error. * *@param props the properties to record *@param os record the properties to this output stream *@param header prepend this header to the property output - *@exception IOException on an I/O error during a write. + *@exception IOException on an I/O error during a write. */ protected void jdkSaveProperties(Properties props, OutputStream os, String header) throws IOException { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java b/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java index 8911320c4..e63630838 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java index e60746aa5..654c4c3ed 100755 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java b/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java index 442c10172..7773e75de 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java index ed6e67768..3c2f0461d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java index 5ef3da02b..6797e912b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java b/src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java index 865045fde..55e4c8e27 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* * Task to rename files based on extension. This task has the following diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java index d20e0256d..d8a0c40a4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java b/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java index a13ba84d6..a26a342d8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Script.java b/src/main/org/apache/tools/ant/taskdefs/optional/Script.java index 3d7b7a206..5ea5ff671 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Script.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Script.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; @@ -32,7 +32,7 @@ public class Script extends Task { private String language; private File src; private String text; - + /** * Do the work. * @@ -49,7 +49,7 @@ public class Script extends Task { if (text != null) { runner.addText(text); } - + runner.addBeans(getProject().getProperties()); runner.addBeans(getProject().getUserProperties()); runner.addBeans(getProject().getTargets()); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java b/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java index 2e5b2addd..56bf101b6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Test.java b/src/main/org/apache/tools/ant/taskdefs/optional/Test.java index 8b5d2bca7..5ba0442e9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Test.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Test.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java index dfd36c416..cf43e7742 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; @@ -164,7 +164,7 @@ public class TraXLiaison implements XSLTLiaison2, ErrorListener, XSLTLoggerAware * @return the configured source instance matching the stylesheet. * @throws Exception if there is a problem creating the source. */ - private Source getSource(InputStream is, File infile) + private Source getSource(InputStream is, File infile) throws ParserConfigurationException, SAXException { // todo: is this comment still relevant ?? // FIXME: need to use a SAXSource as the source for the transform @@ -194,7 +194,7 @@ public class TraXLiaison implements XSLTLiaison2, ErrorListener, XSLTLoggerAware * Read in templates from the stylesheet */ private void readTemplates() - throws IOException, TransformerConfigurationException, + throws IOException, TransformerConfigurationException, ParserConfigurationException, SAXException { // Use a stream so that you can close it yourself quickly diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java index a9c63ce21..13104694c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/XalanLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/XalanLiaison.java index 9a179ebcb..9eca02381 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/XalanLiaison.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/XalanLiaison.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/XslpLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/XslpLiaison.java index edce34e30..9536cada2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/XslpLiaison.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/XslpLiaison.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java index 5a9ad0649..618f31229 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ccm; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckin.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckin.java index 60ca72347..4226567e6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckin.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckin.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ccm; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.java index eeb2e89a3..e750e93df 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ccm; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckout.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckout.java index f87222511..b481dd6c3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckout.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckout.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ccm; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java index fb403eb3a..a54026d89 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ccm; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java index 5d34183b5..45490c7f8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ccm; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java index 0bd2a095b..46d3bb226 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ccm; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java index f4605bf29..d18950c42 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.clearcase; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java index fdf22a79e..d59449b3a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.clearcase; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCLock.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCLock.java index dcdf1e05f..24b587ac5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCLock.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCLock.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.clearcase; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkattr.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkattr.java index b670c402d..63042a19c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkattr.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkattr.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.clearcase; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkbl.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkbl.java index 57b606175..e48f62568 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkbl.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkbl.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.clearcase; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkdir.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkdir.java index 185e92bfc..b03d55089 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkdir.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkdir.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.clearcase; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkelem.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkelem.java index cdc6b8845..e6ed7892f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkelem.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkelem.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.clearcase; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklabel.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklabel.java index 4afabbc2a..59e0869ab 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklabel.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklabel.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.clearcase; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklbtype.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklbtype.java index 7213a3f3f..2b49247ba 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklbtype.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklbtype.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.clearcase; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCRmtype.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCRmtype.java index b6ac836ad..865439bae 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCRmtype.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCRmtype.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.clearcase; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java index d6930853d..09b662ede 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.clearcase; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.java index 93a12f8e1..ba0222a4f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.clearcase; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java index 13772d7e3..ea46929f9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.clearcase; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java index 0dc8d5246..2921015f4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.clearcase; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java index 72af09327..d4a59dd5d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.depend; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java index 58495383d..75df37179 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.depend; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java index feaf2980d..7a49c904d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.depend; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java index ebe4c6b8f..2d2b52edf 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.depend; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java index 44f0d9832..430f46183 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.depend; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java index 677049da8..c433d2af1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.depend; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java index 2a501a3bc..74e182fcf 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.depend; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ClassCPInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ClassCPInfo.java index 5588bbc31..de2247e57 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ClassCPInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ClassCPInfo.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.depend.constantpool; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantCPInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantCPInfo.java index 5b52cf6d7..16d1ace35 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantCPInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantCPInfo.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.depend.constantpool; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java index d3a5111f4..50d791743 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.depend.constantpool; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java index 32d3f8ada..b294e8901 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.depend.constantpool; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/DoubleCPInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/DoubleCPInfo.java index 54ca5e618..5f17ea1a8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/DoubleCPInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/DoubleCPInfo.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.depend.constantpool; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FieldRefCPInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FieldRefCPInfo.java index 0fcaae6f8..f9f06d8f2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FieldRefCPInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FieldRefCPInfo.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.depend.constantpool; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FloatCPInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FloatCPInfo.java index b6a867808..283b4ffff 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FloatCPInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FloatCPInfo.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.depend.constantpool; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/IntegerCPInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/IntegerCPInfo.java index c075854c8..f3a973596 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/IntegerCPInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/IntegerCPInfo.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.depend.constantpool; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InterfaceMethodRefCPInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InterfaceMethodRefCPInfo.java index daa848a1a..ea994b13d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InterfaceMethodRefCPInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InterfaceMethodRefCPInfo.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.depend.constantpool; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/LongCPInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/LongCPInfo.java index 73953836c..2153fe8c0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/LongCPInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/LongCPInfo.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.depend.constantpool; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodRefCPInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodRefCPInfo.java index 96662f528..f164f151e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodRefCPInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodRefCPInfo.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.depend.constantpool; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/NameAndTypeCPInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/NameAndTypeCPInfo.java index c26e2d268..5afade5cf 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/NameAndTypeCPInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/NameAndTypeCPInfo.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.depend.constantpool; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/StringCPInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/StringCPInfo.java index 00942e3e1..bf5bf69a8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/StringCPInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/StringCPInfo.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.depend.constantpool; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/Utf8CPInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/Utf8CPInfo.java index 18eda0205..368007b7f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/Utf8CPInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/Utf8CPInfo.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.depend.constantpool; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java index 338880e2a..d5d7d65b3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetBaseMatchingTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetBaseMatchingTask.java index b573eb7d8..bc08c80fb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetBaseMatchingTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetBaseMatchingTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.dotnet; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java index 42b3944c5..ea129a146 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetDefine.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetDefine.java index dee29f757..0c26a8ff3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetDefine.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetDefine.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.dotnet; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetResource.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetResource.java index be78d8952..e6f8d69f7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetResource.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetResource.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.dotnet; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java index 4ed89acb4..63f2deb1c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* * build notes @@ -52,7 +52,7 @@ import org.apache.tools.ant.types.FileSet; * </b> and <b>excludes="broken.il"</b> can be used to control the files pulled * in. You can also use nested <src> filesets to refer to source. * <p> - * + * * @author Steve Loughran * @ant.task name="ilasm" category="dotnet" */ diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java index ecc81c4f2..1c13f9216 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.dotnet; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java index 8c3bec3ca..aac3c8d80 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.dotnet; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/JSharp.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/JSharp.java index 36b48deda..f7522f65f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/JSharp.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/JSharp.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.dotnet; @@ -55,7 +55,7 @@ public class JSharp extends DotnetCompile { setExecutable("vjc"); } - + public void setBaseAddress(String baseAddress) { this.baseAddress = baseAddress; } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java index 876ccf08b..7a6ee7562 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* * build notes diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/VisualBasicCompile.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/VisualBasicCompile.java index 1205a9245..bf8216a35 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/VisualBasicCompile.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/VisualBasicCompile.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.dotnet; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java index b791db429..0b90a4f99 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.dotnet; @@ -37,7 +37,7 @@ import org.apache.tools.ant.Task; * See "Creating an XML Web Service Proxy", "wsdl.exe" docs in * the framework SDK documentation - * @author Steve Loughran + * @author Steve Loughran * @version 0.5 * @ant.task category="dotnet" * @since Ant 1.5 diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java index 92f3de2aa..c98a2cf42 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java index 107fc4ea5..1891a11da 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java index 2e3740247..2e2ef49bc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ejb; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java index 5ce7e3460..afbcea102 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ejb; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java index 8ff10813d..b841e6679 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ejb; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java index 2932d61c4..9a1070604 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ejb; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java index 0de2c4048..c8e4e8a90 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ejb; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java index d85c94440..d5be4b0e3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ejb; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java index ad555fb64..d8c6bc4e0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ejb; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java index a6fdd6376..710367f95 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ejb; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java index a84a60360..3fa2c2dce 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ejb; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java index 83196c6da..6dd9653df 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ejb; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java index 197273986..7c25279f6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ejb; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java index 779684755..6f898e804 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ejb; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java index 521c61ff0..ccc88654c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ejb; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java index c8fdb3cc0..9a54bd38a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ejb; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java index 5a4c06aa1..275ffd799 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ejb; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java index 5cab21885..bc2976bb6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ejb; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java index 8308ba6ca..3a19e4d78 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ejb; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java index 24e5405b3..6ed425c55 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ejb; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java index 11c160d1f..37e712b6f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ejb; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatability.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatability.java index e714cc443..ac50b5e93 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatability.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatability.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.extension; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatibility.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatibility.java index 3af258d4f..ec21a98d6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatibility.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatibility.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.extension; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/DeweyDecimal.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/DeweyDecimal.java index 59401bb61..c1e734f1b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/DeweyDecimal.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/DeweyDecimal.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.extension; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java index 293d55dc7..e7907d63f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.extension; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionAdapter.java index a962682d9..acf3efc8e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionAdapter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.extension; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionResolver.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionResolver.java index 913e0a13b..d0c6e1613 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionResolver.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionResolver.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.extension; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java index af2c34e97..d2ebd81eb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.extension; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java index f04641592..e193fb8ae 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.extension; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtraAttribute.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtraAttribute.java index 58cc8791c..02cc00ece 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtraAttribute.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtraAttribute.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.extension; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibAvailableTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibAvailableTask.java index 57cd63331..c715e1f7d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibAvailableTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibAvailableTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.extension; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibDisplayTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibDisplayTask.java index c121a8f2a..428df2d17 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibDisplayTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibDisplayTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.extension; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java index 4357da9af..f4eb1cfd8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.extension; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java index ab7b5dbca..2f651a8a1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.extension; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java index f949ac5b0..1c0bbb191 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.extension; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibraryDisplayer.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibraryDisplayer.java index 781cfde52..6c9a552d9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibraryDisplayer.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibraryDisplayer.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.extension; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java index 295969890..bfe7a60c8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.extension; @@ -608,4 +608,4 @@ public final class Specification { impTitle, impVersion, impVendor, new String[]{section}); } -}
\ No newline at end of file +} diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.java index 864afb25a..05406c4ee 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.extension.resolvers; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.java index a66509d23..ce45e1594 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.extension.resolvers; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java index 734d9f1dc..9db6164bd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.extension.resolvers; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java index 739c9cfa2..e3763dbe2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.i18n; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java index e10f789ad..f1fa6f4e1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ide; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java index 68f2e323b..4a463f5b5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ide; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java index ab56930a8..a50bb4a2f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ide; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java index 65214c04a..3af88ffd3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ide; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java index 6ac0168dc..db8541011 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ide; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java index 1cd8d200c..f733af3d3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ide; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImportServlet.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImportServlet.java index 8e6e60003..2591fe382 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImportServlet.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImportServlet.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ide; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoad.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoad.java index 47cc46b25..3d714486b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoad.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoad.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ide; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadProjects.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadProjects.java index 7ef2185ba..8541bb01e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadProjects.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadProjects.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ide; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java index 16780abde..3949a8dce 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ide; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java index b91d7219c..cf8ebdb8d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ide; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJProjectDescription.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJProjectDescription.java index 4d48a8454..fe1c964f3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJProjectDescription.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJProjectDescription.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ide; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java index ccb1b1158..9e3d9fb2c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ide; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJTask.java index d485e1161..e6730b9e8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ide; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java index 439fb3962..ee5b2a774 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ide; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJUtil.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJUtil.java index cb71e886b..54978e45c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJUtil.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJUtil.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ide; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java index f8a6976c3..5de57731a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ide; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java b/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java index c14fe4bca..04ca0f13e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.image; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/AbstractHotDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/AbstractHotDeploymentTool.java index 50f9acb61..02cda33bd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/AbstractHotDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/AbstractHotDeploymentTool.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.j2ee; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.java index b00228824..e9f2a5453 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.j2ee; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/HotDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/HotDeploymentTool.java index 48f47cdb1..7f1e25aa3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/HotDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/HotDeploymentTool.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.j2ee; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java index 923280f86..6700e00d3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.j2ee; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.java b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.java index 75efeea6e..409bbb066 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.j2ee; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/WebLogicHotDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/WebLogicHotDeploymentTool.java index be17be26b..17970e00f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/WebLogicHotDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/WebLogicHotDeploymentTool.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.j2ee; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java index 67df7d1fe..cfbcdf23c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.javacc; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java index 040c50f6c..9ca6cb7d0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.javacc; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java index 4daef534a..5800d002d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.javacc; @@ -78,7 +78,7 @@ public class JavaCC extends Task { protected static final String[] ARCHIVE_LOCATIONS = new String[] { - "JavaCC.zip", + "JavaCC.zip", "bin/lib/JavaCC.zip", "bin/lib/javacc.jar", "javacc.jar", // used by jpackage for JavaCC 3.x @@ -91,13 +91,13 @@ public class JavaCC extends Task { 3, 3, }; - + protected static final String COM_PACKAGE = "COM.sun.labs."; protected static final String COM_JAVACC_CLASS = "javacc.Main"; protected static final String COM_JJTREE_CLASS = "jjtree.Main"; protected static final String COM_JJDOC_CLASS = "jjdoc.JJDocMain"; - protected static final String ORG_PACKAGE_3_0 = "org.netbeans.javacc."; + protected static final String ORG_PACKAGE_3_0 = "org.netbeans.javacc."; protected static final String ORG_PACKAGE_3_1 = "org.javacc."; protected static final String ORG_JAVACC_CLASS = "parser.Main"; protected static final String ORG_JJTREE_CLASS = COM_JJTREE_CLASS; @@ -466,8 +466,8 @@ public class JavaCC extends Task { */ protected static int getMajorVersionNumber(File home) throws BuildException { - - return + + return ARCHIVE_LOCATIONS_VS_MAJOR_VERSION[getArchiveLocationIndex(home)]; } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java index 6287f25cf..54187a3f0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.jdepend; @@ -616,7 +616,7 @@ public class JDependTask extends Task { // not necessary as JDepend would fail, but why loose // some time? if (!f.exists() || !f.isDirectory()) { - throw new BuildException("\"" + f.getPath() + throw new BuildException("\"" + f.getPath() + "\" does not represent a valid" + " directory. JDepend would" + " fail."); @@ -634,7 +634,7 @@ public class JDependTask extends Task { // not necessary as JDepend would fail, but why loose // some time? if (!f.exists() || !f.isDirectory()) { - throw new BuildException("\"" + f.getPath() + throw new BuildException("\"" + f.getPath() + "\" does not represent a valid" + " directory. JDepend would" + " fail."); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java index 26825b7a2..a0ecf7fde 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.jlink; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java index 12cc0a031..0587b266f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.jlink; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java index 68f560595..026740fe4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /** * jlink.java links together multiple .jar files Original code by Patrick diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java index c5d1b5785..436218b03 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.jsp; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java index e9a6673e4..24918b605 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.jsp; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspMangler.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspMangler.java index e1305753c..87379fe8b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspMangler.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspMangler.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.jsp; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java index d15e7241e..f60e0c9c1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.jsp; import java.io.File; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java index c0766316e..848b4affc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.jsp; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java index 91a870749..07b155b0e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.jsp.compilers; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java index 6c00b2a6d..efc0d95e5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.jsp.compilers; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapter.java index 6f65f39e0..783dc0541 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.jsp.compilers; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapterFactory.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapterFactory.java index 75d3e9fec..9a18e669e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapterFactory.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapterFactory.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.jsp.compilers; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java index e10a222ac..db41b3a5a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java index 7a8f7fef8..824c3060c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java index c69a683a1..24505cb48 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java index 281cf1bfa..65a0570ae 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java index d8c2c6d5a..3553cc40b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/Enumerations.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/Enumerations.java index 2221d06b3..cf1b4a3a8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/Enumerations.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/Enumerations.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java index bbd4e0f21..f7bfe7c72 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.java index e28a3d9f8..80123eb0b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java index 7dc43264d..59fb3bf67 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; @@ -648,9 +648,9 @@ public class JUnitTask extends Task { // if there is an error/failure and that it should halt, stop // everything otherwise just log a statement - boolean errorOccurredHere = + boolean errorOccurredHere = exitValue == JUnitTestRunner.ERRORS || wasKilled; - boolean failureOccurredHere = + boolean failureOccurredHere = exitValue != JUnitTestRunner.SUCCESS || wasKilled; if (errorOccurredHere || failureOccurredHere) { if ((errorOccurredHere && test.getHaltonerror()) @@ -703,7 +703,7 @@ public class JUnitTask extends Task { String s = (String) e.nextElement(); if (s.startsWith("CLASSPATH=")) { cmd.createClasspath(getProject()).createPath() - .append(new Path(getProject(), + .append(new Path(getProject(), s.substring(10 // "CLASSPATH=".length() ))); } @@ -1128,11 +1128,11 @@ public class JUnitTask extends Task { } /** - * Adds the actual timeout to the formatter. + * Adds the actual timeout to the formatter. * Only used from the logTimeout method. * @since Ant 1.6 */ - private void addTimeout(JUnitTest test, JUnitResultFormatter formatter, + private void addTimeout(JUnitTest test, JUnitResultFormatter formatter, OutputStream out) { formatter.setOutput(out); formatter.startTestSuite(test); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java index 52edefe45..2db19d9f3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java index 3fca8aa6f..068977462 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java index 309c4f9a7..f14b22c41 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java index ffccd45cb..24ad4320a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java index ae8badec8..5d8888e4c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLConstants.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLConstants.java index 342ad212a..3f9a401d4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLConstants.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLConstants.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java index dab8a5377..19388f982 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java index e508f9f7a..f5b9a3b81 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java index da49e5f6b..8448e60cb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.java index 7eab403f2..7ba6d36ef 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java index ecb09a102..f51610ea3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java index 156423bdc..63973a9f7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.metamata; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java index c95df1ece..a9b35c4fb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.metamata; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditParser.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditParser.java index a3be7ff5f..479284e4d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditParser.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditParser.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.metamata; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java index e59eaa25a..7bdd4295a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.metamata; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java index ba0fd8614..9b4292129 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.metamata; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java index 9b5f03986..36b2efa53 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.metamata; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java index ad8af968b..14a412627 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.metamata; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java index ea9ba91d2..4b3241bf0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.net; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java index 8bb5ced55..5e35c7230 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.net; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java index 1cae0f51c..b8dd53195 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.net; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java index fd515e715..8fc6cbab6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.net; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java index e3fc72343..d22ab56d0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.net; @@ -305,7 +305,7 @@ public class TelnetTask extends Task { Thread.sleep(250); } if (is.available() == 0) { - log("Read before running into timeout: " + log("Read before running into timeout: " + sb.toString(), Project.MSG_DEBUG); throw new BuildException( "Response timed-out waiting for \"" + s + '\"', diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/FStatP4OutputHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/FStatP4OutputHandler.java index e081359f0..d76111062 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/FStatP4OutputHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/FStatP4OutputHandler.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.perforce; import org.apache.tools.ant.BuildException; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java index f3030fee3..d161e6a6a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* * Portions of this software are based upon public domain software diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java index 36ede8d65..aa3b007d8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* * Portions of this software are based upon public domain software diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java index fb4214068..9a2069a4d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* * Portions of this software are based upon public domain software diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java index 35b8ea4f8..471248a6d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* * Portions of this software are based upon public domain software diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.java index dfff5f54e..44180a620 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.perforce; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.java index 4de5df1bc..1dab763be 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* * Portions of this software are based upon public domain software diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Fstat.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Fstat.java index d116b09aa..82ada0df9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Fstat.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Fstat.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* * Portions of this software are based upon public domain software diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Handler.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Handler.java index 3e63a9f19..3c3fad1dc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Handler.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Handler.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.perforce; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java index d6b756945..93c5196a1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.perforce; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.java index 14a367d7b..3d721d299 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* * Portions of this software are based upon public domain software diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Integrate.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Integrate.java index b76acc0fe..a8f567e2f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Integrate.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Integrate.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* * Portions of this software are based upon public domain software diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java index 27a8ab08a..fea141996 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* * Portions of this software are based upon public domain software diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Labelsync.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Labelsync.java index 325f18283..34c53f72d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Labelsync.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Labelsync.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* * Portions of this software are based upon public domain software diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4OutputHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4OutputHandler.java index b61a86c1f..5c966d599 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4OutputHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4OutputHandler.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.perforce; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4OutputStream.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4OutputStream.java index 0c49a792a..81c6d288d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4OutputStream.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4OutputStream.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.perforce; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java index e7dd9a41e..9e152e6cb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* * Portions of this software are based upon public domain software diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Resolve.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Resolve.java index a389ffbc6..6382712d6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Resolve.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Resolve.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* * Portions of this software are based upon public domain software diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java index fda300c2f..0810ffcc6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* * Portions of this software are based upon public domain software diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java index 95e1cbe9e..299a04f1d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* * Portions of this software are based upon public domain software diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java index 766424913..f649b75b4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* * Portions of this software are based upon public domain software diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.java index d6ba813e8..fe0a805b8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* * Portions of this software are based upon public domain software diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/package.html b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/package.html index a931be1c4..36778810b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/package.html +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/package.html @@ -1,7 +1,7 @@ <body> ANT Tasks for Perforce integration. -These tasks provide basic P4 capabilities to automated ANT-based build systems. <b>Note:</b> +These tasks provide basic P4 capabilities to automated ANT-based build systems. <b>Note:</b> the tasks in this package are linked against the Jakarta ORO 2.0 library which brings the power of Perl 5 regular expressions to Java. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java index ed08fc4e9..b6ba032d8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.pvcs; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/PvcsProject.java b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/PvcsProject.java index fba9f2020..45d5ba488 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/PvcsProject.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/PvcsProject.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.pvcs; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java b/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java index 956d192ba..cbff2c6a7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.scm; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java b/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java index 9830f2aaf..71cb1ac77 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.script; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDefBase.java b/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDefBase.java index 12a13192a..edea3569d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDefBase.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDefBase.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.script; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovBase.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovBase.java index 65a6d8ebe..a7479db29 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovBase.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovBase.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sitraka; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java index ddcedcce8..6116bdcce 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sitraka; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java index fb93df45b..b6075369e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sitraka; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java index 60bbca8d5..0a37b0798 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sitraka; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Filters.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Filters.java index 28c9ce8cf..a9c4704e0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Filters.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Filters.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sitraka; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java index e012d4aa9..570e2c79e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sitraka; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Socket.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Socket.java index 450965bf5..0a31e1d50 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Socket.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Socket.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sitraka; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/StringUtil.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/StringUtil.java index 93c1f4a85..6ad97536c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/StringUtil.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/StringUtil.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sitraka; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java index d84405d3c..d9aef1067 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sitraka; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java index 86bb3fc58..4376b2d82 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sitraka; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassFile.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassFile.java index 9c60334d3..e186dc577 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassFile.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassFile.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sitraka.bytecode; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java index 38b4bebda..1a0b54687 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sitraka.bytecode; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfo.java index 9d28c4199..5049d0f82 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfo.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sitraka.bytecode; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/Utils.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/Utils.java index 4f02126cb..46377ecf9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/Utils.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/Utils.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sitraka.bytecode; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/AttributeInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/AttributeInfo.java index 11fd9141e..1a3b9752d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/AttributeInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/AttributeInfo.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sitraka.bytecode.attributes; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java index 5ac6a7dae..4ce38c522 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sos; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckin.java b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckin.java index 9387eeb2f..376812198 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckin.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckin.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sos; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckout.java b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckout.java index 0f39b6c0e..8afd2e30c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckout.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckout.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sos; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCmd.java b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCmd.java index 55399c2f0..96bf641d3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCmd.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCmd.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sos; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSGet.java b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSGet.java index 848a26d6d..a047baefa 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSGet.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSGet.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sos; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSLabel.java b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSLabel.java index 51bbe3b11..f7566be18 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSLabel.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSLabel.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sos; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java b/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java index c44977fe2..0039d6a41 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sound; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java index 3bd108e00..baaa3c537 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sound; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashScreen.java b/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashScreen.java index d78816f84..ffa3de365 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashScreen.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashScreen.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.splash; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java index 9049e3ca0..33c79c0cc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.splash; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java index 26d5ec550..7439a934e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ssh; @@ -60,7 +60,7 @@ public abstract class AbstractSshMessage { * Reads the response, throws a BuildException if the response * indicates an error. */ - protected void waitForAck(InputStream in) + protected void waitForAck(InputStream in) throws IOException, BuildException { int b = in.read(); @@ -79,7 +79,7 @@ public abstract class AbstractSshMessage { sb.append((char) c); c = in.read(); } - + if (b == 1) { throw new BuildException("server indicated an error: " + sb.toString()); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java index 7dd3ac7c7..b9716e811 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ssh; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/LogListener.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/LogListener.java index a2674fbad..7fd25dfc2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/LogListener.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/LogListener.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ssh; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java index 59697af80..158b327ed 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ssh; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java index 651f59962..2ceacd81f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ssh; @@ -57,7 +57,7 @@ public class SSHExec extends SSHBase { private File outputFile = null; // like <exec> private boolean append = false; // like <exec> - private static final String TIMEOUT_MESSAGE = + private static final String TIMEOUT_MESSAGE = "Timeout period exceeded, connection dropped."; /** @@ -211,7 +211,7 @@ public class SSHExec extends SSHBase { if (getFailonerror()) { throw new BuildException(e); } else { - log("Caught exception: " + e.getMessage(), + log("Caught exception: " + e.getMessage(), Project.MSG_ERR); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java index 93badc9e1..b2b28663c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ssh; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java index 19140dd9e..72f74e917 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ssh; @@ -140,8 +140,8 @@ public class Scp extends SSHBase { Session session = null; try { session = openSession(); - ScpFromMessage message = - new ScpFromMessage(session, file, + ScpFromMessage message = + new ScpFromMessage(session, file, getProject().resolveFile(toPath), fromSshUri.endsWith("*")); log("Receiving file: " + file); @@ -188,7 +188,7 @@ public class Scp extends SSHBase { Session session = null; try { session = openSession(); - ScpToMessage message = + ScpToMessage message = new ScpToMessage(session, getProject().resolveFile(fromPath), file); message.setLogListener(this); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java index 455a90d91..99bd581d9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ssh; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java index e2960d610..3ffdd450f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ssh; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java index 195bc8506..12c3fa4d4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.starteam; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java index e21d3de73..4005b0819 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.starteam; @@ -192,7 +192,7 @@ public class StarTeamCheckout extends TreeBasedTask { public void setAsOfDate(String asOfDateParam) { _setAsOfDate(asOfDateParam); } - + /** * Date Format with which asOfDate parameter to be parsed; optional. * Must be a SimpleDateFormat compatible string. @@ -261,12 +261,12 @@ public class StarTeamCheckout extends TreeBasedTask { boolean lockStatusBad = false; if (null != getLabel()) { log("Neither locked nor unlocked may be true" - + " when checking out a labeled version.", + + " when checking out a labeled version.", Project.MSG_ERR); lockStatusBad = true; } else if (null != getAsOfDate()) { log("Neither locked nor unlocked may be true" - + " when checking out by date.", + + " when checking out by date.", Project.MSG_ERR); lockStatusBad = true; } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java index 1b86e596e..e918ea925 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.starteam; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java index 3d9fc2258..0e1a95cd2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.starteam; @@ -63,7 +63,7 @@ public class StarTeamList extends TreeBasedTask { public void setAsOfDate(String asOfDateParam) { _setAsOfDate(asOfDateParam); } - + /** * Date Format with which asOfDate parameter to be parsed; optional. * Must be a SimpleDateFormat compatible string. @@ -94,7 +94,7 @@ public class StarTeamList extends TreeBasedTask { // otherwise use current view if (labelID >= 0) { return new View(raw, ViewConfiguration.createFromLabel(labelID)); - } + } // if a date has been supplied use a view configured to the date. View view = getViewConfiguredByDate(raw); if (view != null) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.java index d2696c567..2e3fbd44c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.starteam; @@ -281,7 +281,7 @@ public abstract class StarTeamTask extends Task { } /** - * disconnects from the StarTeam server. Should be called from the + * disconnects from the StarTeam server. Should be called from the * finally clause of every StarTeamTask-based execute method. */ protected final void disconnectFromServer() { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java index a15682ef6..e3ee58a3e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.starteam; @@ -131,7 +131,7 @@ public abstract class TreeBasedTask extends StarTeamTask { * holder for the asofdate attribute */ private String asOfDate = null; - + /** * holder for the asofdateformat attribute */ @@ -309,7 +309,7 @@ public abstract class TreeBasedTask extends StarTeamTask { * non-public method callable only by derived classes that implement * setAsOfDate (so that derived tasks that do not accept this * parameter will fail if user attempts to use it. - * + * * @param asOfDate asOfDate entered by user. * @since Ant 1.6 */ @@ -318,12 +318,12 @@ public abstract class TreeBasedTask extends StarTeamTask { this.asOfDate = asOfDate; } } - + /** * non-public method callable only by derived classes that implement * setAsOfDateFormat (so that derived tasks that do not accept this * parameter will fail if user attempts to use it. - * + * * @param asOfDateFormat asOfDate format entered by user. * @since Ant 1.6 */ @@ -333,11 +333,11 @@ public abstract class TreeBasedTask extends StarTeamTask { } } - + /** * return the asOfDate entered by the user for internal use by derived * classes. - * + * * @return the asOfDate entered by the user * @since Ant 1.6 */ @@ -345,22 +345,22 @@ public abstract class TreeBasedTask extends StarTeamTask { return this.asOfDate; } - + /** * If an asofDate parameter has been supplied by the user return a * StarTeam view based on the configuration of the StarTeam view * specified the user as of the date specified in the parameter. * If no asofDate has been specified, return null. - * + * * This method is meant to be called from within implementations of the * <code>createSnapshotView</code> abstract method. - * + * * @param raw the raw view to be configured as of the supplied date - * + * * @return the view as configured. * @exception BuildException - * thrown if the date is not parsable by the default or + * thrown if the date is not parsable by the default or * supplied format patterns. * @since Ant 1.6 */ @@ -374,23 +374,23 @@ public abstract class TreeBasedTask extends StarTeamTask { fmt = new SimpleDateFormat(this.asOfDateFormat); try { asOfDate = fmt.parse(this.asOfDate); - } - catch (ParseException px) + } + catch (ParseException px) { - throw new BuildException("AsOfDate " - + this.asOfDate + throw new BuildException("AsOfDate " + + this.asOfDate + " not parsable by supplied format " - + this.asOfDateFormat); + + this.asOfDateFormat); } } else { try { asOfDate = DateUtils.parseIso8601DateTimeOrDate( - this.asOfDate); + this.asOfDate); } catch (ParseException px) { - throw new BuildException("AsOfDate " - + this.asOfDate + throw new BuildException("AsOfDate " + + this.asOfDate + " not parsable by default" - + " ISO8601 formats"); + + " ISO8601 formats"); } } return new View(raw, ViewConfiguration.createFromTime( @@ -401,7 +401,7 @@ public abstract class TreeBasedTask extends StarTeamTask { /** * return the label passed to the task by the user as a string - * + * * @return the label passed to the task by the user as a string */ protected String getLabel() { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java index 12f299826..1fafebd30 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chgrp.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chgrp.java index 255786fdf..2c5077653 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chgrp.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chgrp.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chown.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chown.java index f5c1546c6..1abe2aae4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chown.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chown.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java index 6c13d2b14..4c2e404ea 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* @@ -418,7 +418,7 @@ public class Symlink extends Task { * * This method use <code>Properties.store</code> * and thus report exceptions that occur while writing the file. - * + * * This is not jdk 1.1 compatible, but ant 1.6 is not anymore. * * @param properties The properties object to be written. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java index 19654c88b..8ef1cac10 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.vss; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSADD.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSADD.java index a0079a241..bb6646006 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSADD.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSADD.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.vss; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java index 86ed46dfb..3de197b3e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.vss; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java index 63304cdfd..85461a09a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.vss; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCP.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCP.java index 3f0fa81c7..63e44d907 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCP.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCP.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.vss; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCREATE.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCREATE.java index 441b875cf..e96199853 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCREATE.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCREATE.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.vss; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSConstants.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSConstants.java index 7ebb53ece..6c284ba60 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSConstants.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSConstants.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.vss; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java index 21155f42d..aef1ec467 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.vss; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java index d114fd848..d21378dd4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.vss; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java index ef00215dc..666812219 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.vss; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java b/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java index 44a858503..accbeea69 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.windows; diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java index 52609f5a9..8575f148c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.rmic; diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java b/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java index 8e7bf94b0..fea24d890 100644 --- a/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java +++ b/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.rmic; diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java b/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java index 1c69f6eaf..9688b0df1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.rmic; diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java b/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java index d4c96c83d..ed5e6e017 100644 --- a/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java +++ b/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.rmic; diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java b/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java index 70acbb968..00c49530a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java +++ b/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.rmic; diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java b/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java index 5b742891b..2f303ca29 100644 --- a/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java +++ b/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.rmic; diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java b/src/main/org/apache/tools/ant/types/AbstractFileSet.java index 3fa6ca67c..32196888f 100644 --- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java +++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/AntFilterReader.java b/src/main/org/apache/tools/ant/types/AntFilterReader.java index b8be88c2d..0ba7c3923 100644 --- a/src/main/org/apache/tools/ant/types/AntFilterReader.java +++ b/src/main/org/apache/tools/ant/types/AntFilterReader.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/Assertions.java b/src/main/org/apache/tools/ant/types/Assertions.java index 85d0bc6b5..8f641fcb5 100644 --- a/src/main/org/apache/tools/ant/types/Assertions.java +++ b/src/main/org/apache/tools/ant/types/Assertions.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/Commandline.java b/src/main/org/apache/tools/ant/types/Commandline.java index f9547325e..cdb13673a 100644 --- a/src/main/org/apache/tools/ant/types/Commandline.java +++ b/src/main/org/apache/tools/ant/types/Commandline.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/CommandlineJava.java b/src/main/org/apache/tools/ant/types/CommandlineJava.java index bf2f1b199..40ca442ae 100644 --- a/src/main/org/apache/tools/ant/types/CommandlineJava.java +++ b/src/main/org/apache/tools/ant/types/CommandlineJava.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; @@ -386,15 +386,15 @@ public class CommandlineJava implements Cloneable { clonedSysProperties.addSyspropertyset(ps); clonedSysProperties.addDefinitionsToList(listIterator); } - + //boot classpath if (haveBootclasspath(true)) { listIterator.add("-Xbootclasspath:" + bootclasspath.toString()); } else if (cloneBootclasspath()) { - listIterator.add("-Xbootclasspath:" + + listIterator.add("-Xbootclasspath:" + Path.systemBootClasspath.toString()); } - + //main classpath if (haveClasspath()) { listIterator.add("-classpath"); @@ -483,13 +483,13 @@ public class CommandlineJava implements Cloneable { * @deprecated please dont use this -it effectively creates the entire command. */ public int size() { - int size = getActualVMCommand().size() + javaCommand.size() + int size = getActualVMCommand().size() + javaCommand.size() + sysProperties.size(); // cloned system properties if (isCloneVm()) { size += System.getProperties().size(); } - + // classpath is "-classpath <classpath>" -> 2 args if (haveClasspath()) { size += 2; @@ -658,7 +658,7 @@ public class CommandlineJava implements Cloneable { return isCloneVm() && !vmVersion.startsWith("1.1") && Path.systemBootClasspath.size() > 0; } - + /** * Has the cloneVm attribute or the magic property build.clonevm been set? * diff --git a/src/main/org/apache/tools/ant/types/DTDLocation.java b/src/main/org/apache/tools/ant/types/DTDLocation.java index 31b317581..f1d17e5bd 100644 --- a/src/main/org/apache/tools/ant/types/DTDLocation.java +++ b/src/main/org/apache/tools/ant/types/DTDLocation.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/DataType.java b/src/main/org/apache/tools/ant/types/DataType.java index 06f180159..e50bf6f5c 100644 --- a/src/main/org/apache/tools/ant/types/DataType.java +++ b/src/main/org/apache/tools/ant/types/DataType.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/Description.java b/src/main/org/apache/tools/ant/types/Description.java index db00c1371..df92c48c6 100644 --- a/src/main/org/apache/tools/ant/types/Description.java +++ b/src/main/org/apache/tools/ant/types/Description.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/DirSet.java b/src/main/org/apache/tools/ant/types/DirSet.java index 67fa5362c..0ba9c61e2 100644 --- a/src/main/org/apache/tools/ant/types/DirSet.java +++ b/src/main/org/apache/tools/ant/types/DirSet.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java b/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java index ac4ed8599..68056e09c 100644 --- a/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java +++ b/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/Environment.java b/src/main/org/apache/tools/ant/types/Environment.java index 9acc7ad12..5338517c3 100644 --- a/src/main/org/apache/tools/ant/types/Environment.java +++ b/src/main/org/apache/tools/ant/types/Environment.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/FileList.java b/src/main/org/apache/tools/ant/types/FileList.java index 29ddf4e81..193727937 100644 --- a/src/main/org/apache/tools/ant/types/FileList.java +++ b/src/main/org/apache/tools/ant/types/FileList.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/FileSet.java b/src/main/org/apache/tools/ant/types/FileSet.java index 011da7521..c87cfec53 100644 --- a/src/main/org/apache/tools/ant/types/FileSet.java +++ b/src/main/org/apache/tools/ant/types/FileSet.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/FilterChain.java b/src/main/org/apache/tools/ant/types/FilterChain.java index 4c8cfcd10..789fc4396 100644 --- a/src/main/org/apache/tools/ant/types/FilterChain.java +++ b/src/main/org/apache/tools/ant/types/FilterChain.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/FilterSet.java b/src/main/org/apache/tools/ant/types/FilterSet.java index 2ace71799..a3870fda9 100644 --- a/src/main/org/apache/tools/ant/types/FilterSet.java +++ b/src/main/org/apache/tools/ant/types/FilterSet.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/FilterSetCollection.java b/src/main/org/apache/tools/ant/types/FilterSetCollection.java index 39998fd01..5fd8837c8 100644 --- a/src/main/org/apache/tools/ant/types/FilterSetCollection.java +++ b/src/main/org/apache/tools/ant/types/FilterSetCollection.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/FlexInteger.java b/src/main/org/apache/tools/ant/types/FlexInteger.java index 9f57c1aeb..2982ba372 100644 --- a/src/main/org/apache/tools/ant/types/FlexInteger.java +++ b/src/main/org/apache/tools/ant/types/FlexInteger.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/Mapper.java b/src/main/org/apache/tools/ant/types/Mapper.java index 56c49d21c..8184c941d 100644 --- a/src/main/org/apache/tools/ant/types/Mapper.java +++ b/src/main/org/apache/tools/ant/types/Mapper.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/Parameter.java b/src/main/org/apache/tools/ant/types/Parameter.java index c13a2a8cf..1682968cf 100644 --- a/src/main/org/apache/tools/ant/types/Parameter.java +++ b/src/main/org/apache/tools/ant/types/Parameter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/Parameterizable.java b/src/main/org/apache/tools/ant/types/Parameterizable.java index 35c722ada..7407008af 100644 --- a/src/main/org/apache/tools/ant/types/Parameterizable.java +++ b/src/main/org/apache/tools/ant/types/Parameterizable.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/Path.java b/src/main/org/apache/tools/ant/types/Path.java index c0166d996..512004281 100644 --- a/src/main/org/apache/tools/ant/types/Path.java +++ b/src/main/org/apache/tools/ant/types/Path.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; @@ -67,7 +67,7 @@ public class Path extends DataType implements Cloneable { new Path(null, System.getProperty("java.class.path")); - /** + /** * The system bootclassspath as a Path object. * * @since Ant 1.7 diff --git a/src/main/org/apache/tools/ant/types/PatternSet.java b/src/main/org/apache/tools/ant/types/PatternSet.java index bde7416bf..f42d86f49 100644 --- a/src/main/org/apache/tools/ant/types/PatternSet.java +++ b/src/main/org/apache/tools/ant/types/PatternSet.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/Permissions.java b/src/main/org/apache/tools/ant/types/Permissions.java index b68b66670..9a6d170a3 100644 --- a/src/main/org/apache/tools/ant/types/Permissions.java +++ b/src/main/org/apache/tools/ant/types/Permissions.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; @@ -29,21 +29,21 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.ExitException; /** - * This class implements a security manager meant for useage by tasks that run inside the + * This class implements a security manager meant for useage by tasks that run inside the * ant VM. An examples are the Java Task and JUnitTask. - * - * The basic functionality is that nothing (except for a base set of permissions) is allowed, unless + * + * The basic functionality is that nothing (except for a base set of permissions) is allowed, unless * the permission is granted either explicitly or implicitly. * If an permission is granted this can be overruled by explicitly revoking the permission. - * + * * It is not permissible to add permissions (either granted or revoked) while the Security Manager * is active (after calling setSecurityManager() but before calling restoreSecurityManager()). - * + * * @since Ant 1.6 * @author <a href="mailto:martijn@kruithof.xs4all.nl">Martijn Kruithof</a> */ public class Permissions { - + private List grantedPermissions = new LinkedList(); private List revokedPermissions = new LinkedList(); private java.security.Permissions granted = null; @@ -68,25 +68,25 @@ public class Permissions { } /** * Adds a permission to be granted. - * @param perm The Permissions.Permission to be granted. + * @param perm The Permissions.Permission to be granted. */ public void addConfiguredGrant(Permissions.Permission perm) { grantedPermissions.add(perm); - } + } - /** + /** * Adds a permission to be revoked. - * @param perm The Permissions.Permission to be revoked + * @param perm The Permissions.Permission to be revoked */ public void addConfiguredRevoke(Permissions.Permission perm) { revokedPermissions.add(perm); } - - /** + + /** * To be used by tasks wishing to use this security model before executing the part to be - * subject to these Permissions. Note that setting the SecurityManager too early may + * subject to these Permissions. Note that setting the SecurityManager too early may * prevent your part from starting, as for instance changing classloaders may be prohibited. - * The classloader for the new situation is supposed to be present. + * The classloader for the new situation is supposed to be present. */ public void setSecurityManager() throws BuildException{ origSm = System.getSecurityManager(); @@ -111,7 +111,7 @@ public class Permissions { if (p.getClassName() == null) { throw new BuildException("Granted permission " + p + " does not contain a class."); } else { - java.security.Permission perm = new UnresolvedPermission(p.getClassName(),p.getName(),p.getActions(),null); + java.security.Permission perm = new UnresolvedPermission(p.getClassName(),p.getName(),p.getActions(),null); granted.add(perm); } } @@ -146,13 +146,13 @@ public class Permissions { active = false; System.setSecurityManager(origSm); } - + /** * This inner class implements the actual SecurityManager that can be used by tasks - * supporting Permissions. + * supporting Permissions. */ private class MySM extends SecurityManager { - + /** * Exit is treated in a special way in order to be able to return the exit code towards tasks. * An ExitException is thrown instead of a simple SecurityException to indicate the exit @@ -163,16 +163,16 @@ public class Permissions { public void checkExit(int status) { java.security.Permission perm = new java.lang.RuntimePermission("exitVM",null); try { - checkPermission(perm); + checkPermission(perm); } catch (SecurityException e) { throw new ExitException(e.getMessage(), status); } } - + /** * The central point in checking permissions. * Overridden from java.lang.SecurityManager - * + * * @param perm The permission requested. */ public void checkPermission(java.security.Permission perm) { @@ -218,15 +218,15 @@ public class Permissions { private String name; private String actionString; private Set actions; - - /** + + /** * Sets the class, mandatory. - * @param aClass The class name of the permission. + * @param aClass The class name of the permission. */ public void setClass(String aClass) { className = aClass.trim(); } - + /** Get the class of the permission * @return The class name of the permission. */ @@ -234,25 +234,25 @@ public class Permissions { return className; } - /** + /** * Sets the name of the permission. * @param aName The name of the permission. - */ + */ public void setName(String aName) { name = aName.trim(); } - - /** + + /** * Get the name of the permission. * @return The name of the permission. */ public String getName() { return name; } - + /** * Sets the actions. - * @param actions The actions of the permission. + * @param actions The actions of the permission. */ public void setActions(String actions) { actionString = actions; @@ -260,25 +260,25 @@ public class Permissions { this.actions = parseActions(actions); } } - + /** * Gets the actions. - * @return The actions of the permission. + * @return The actions of the permission. */ public String getActions() { return actionString; } - + /** * Checks if the permission matches in case of a revoked permission. * @param perm The permission to check against. */ boolean matches(java.security.Permission perm) { - + if (!className.equals(perm.getClass().getName())) { return false; } - + if (name != null) { if (name.endsWith("*")) { if (!perm.getName().startsWith(name.substring(0, name.length() - 1))) { @@ -290,7 +290,7 @@ public class Permissions { } } } - + if (actions != null) { Set as = parseActions(perm.getActions()); int size = as.size(); @@ -300,11 +300,11 @@ public class Permissions { return false; } } - + return true; } - - /** + + /** * Parses the actions into a set of separate strings. * @param actions The actions to be parsed. */ @@ -326,5 +326,5 @@ public class Permissions { public String toString() { return ("Permission: " + className + " (\"" + name + "\", \"" + actions + "\")"); } - } -}
\ No newline at end of file + } +} diff --git a/src/main/org/apache/tools/ant/types/PropertySet.java b/src/main/org/apache/tools/ant/types/PropertySet.java index f1247f091..8acd95ed7 100644 --- a/src/main/org/apache/tools/ant/types/PropertySet.java +++ b/src/main/org/apache/tools/ant/types/PropertySet.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; @@ -157,7 +157,7 @@ public class PropertySet extends DataType { public Properties getProperties() { Vector names = null; Project prj = getProject(); - Hashtable props = + Hashtable props = prj == null ? System.getProperties() : prj.getProperties(); if (getDynamic() || cachedNames == null) { diff --git a/src/main/org/apache/tools/ant/types/Reference.java b/src/main/org/apache/tools/ant/types/Reference.java index cbb32c593..a713250ae 100644 --- a/src/main/org/apache/tools/ant/types/Reference.java +++ b/src/main/org/apache/tools/ant/types/Reference.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/RegularExpression.java b/src/main/org/apache/tools/ant/types/RegularExpression.java index 45c82f7d2..76b8450a8 100644 --- a/src/main/org/apache/tools/ant/types/RegularExpression.java +++ b/src/main/org/apache/tools/ant/types/RegularExpression.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/Resource.java b/src/main/org/apache/tools/ant/types/Resource.java index 77d2a38fe..6c976297e 100644 --- a/src/main/org/apache/tools/ant/types/Resource.java +++ b/src/main/org/apache/tools/ant/types/Resource.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/ResourceFactory.java b/src/main/org/apache/tools/ant/types/ResourceFactory.java index e21f86745..9d3f9556e 100644 --- a/src/main/org/apache/tools/ant/types/ResourceFactory.java +++ b/src/main/org/apache/tools/ant/types/ResourceFactory.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/ResourceLocation.java b/src/main/org/apache/tools/ant/types/ResourceLocation.java index b9b6a10c3..88f28dc28 100644 --- a/src/main/org/apache/tools/ant/types/ResourceLocation.java +++ b/src/main/org/apache/tools/ant/types/ResourceLocation.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/Substitution.java b/src/main/org/apache/tools/ant/types/Substitution.java index 64b19eb94..a75893121 100644 --- a/src/main/org/apache/tools/ant/types/Substitution.java +++ b/src/main/org/apache/tools/ant/types/Substitution.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/XMLCatalog.java b/src/main/org/apache/tools/ant/types/XMLCatalog.java index 25426f373..6377b60dc 100644 --- a/src/main/org/apache/tools/ant/types/XMLCatalog.java +++ b/src/main/org/apache/tools/ant/types/XMLCatalog.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/ZipFileSet.java b/src/main/org/apache/tools/ant/types/ZipFileSet.java index 1227f0a6b..82a17f597 100644 --- a/src/main/org/apache/tools/ant/types/ZipFileSet.java +++ b/src/main/org/apache/tools/ant/types/ZipFileSet.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/ZipScanner.java b/src/main/org/apache/tools/ant/types/ZipScanner.java index 041ce17cf..3f11aa86c 100644 --- a/src/main/org/apache/tools/ant/types/ZipScanner.java +++ b/src/main/org/apache/tools/ant/types/ZipScanner.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java b/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java index 540b57ef9..e9b4d3f5d 100644 --- a/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java +++ b/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.optional; diff --git a/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java b/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java index 904865025..c36811548 100644 --- a/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java +++ b/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.optional.depend; diff --git a/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java b/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java index eb37d5e9d..f49ad3361 100644 --- a/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java +++ b/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.optional.depend; diff --git a/src/main/org/apache/tools/ant/types/optional/image/Arc.java b/src/main/org/apache/tools/ant/types/optional/image/Arc.java index e8d3b73cd..6a5672cce 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/Arc.java +++ b/src/main/org/apache/tools/ant/types/optional/image/Arc.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.optional.image; diff --git a/src/main/org/apache/tools/ant/types/optional/image/BasicShape.java b/src/main/org/apache/tools/ant/types/optional/image/BasicShape.java index a5f1f4937..fb9cdd869 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/BasicShape.java +++ b/src/main/org/apache/tools/ant/types/optional/image/BasicShape.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.optional.image; diff --git a/src/main/org/apache/tools/ant/types/optional/image/ColorMapper.java b/src/main/org/apache/tools/ant/types/optional/image/ColorMapper.java index df9840596..225308f42 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/ColorMapper.java +++ b/src/main/org/apache/tools/ant/types/optional/image/ColorMapper.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.optional.image; diff --git a/src/main/org/apache/tools/ant/types/optional/image/Draw.java b/src/main/org/apache/tools/ant/types/optional/image/Draw.java index f43bd3c82..692ef6f69 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/Draw.java +++ b/src/main/org/apache/tools/ant/types/optional/image/Draw.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.optional.image; diff --git a/src/main/org/apache/tools/ant/types/optional/image/DrawOperation.java b/src/main/org/apache/tools/ant/types/optional/image/DrawOperation.java index a801f5531..13d9ff49b 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/DrawOperation.java +++ b/src/main/org/apache/tools/ant/types/optional/image/DrawOperation.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.optional.image; diff --git a/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java b/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java index 7ee2f04d1..958504648 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java +++ b/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.optional.image; diff --git a/src/main/org/apache/tools/ant/types/optional/image/ImageOperation.java b/src/main/org/apache/tools/ant/types/optional/image/ImageOperation.java index fd7c24991..a5ed2dbd7 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/ImageOperation.java +++ b/src/main/org/apache/tools/ant/types/optional/image/ImageOperation.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.optional.image; diff --git a/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java b/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java index a886e2127..5932f708a 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java +++ b/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.optional.image; diff --git a/src/main/org/apache/tools/ant/types/optional/image/Rotate.java b/src/main/org/apache/tools/ant/types/optional/image/Rotate.java index 237fdef12..be51c2035 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/Rotate.java +++ b/src/main/org/apache/tools/ant/types/optional/image/Rotate.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.optional.image; diff --git a/src/main/org/apache/tools/ant/types/optional/image/Scale.java b/src/main/org/apache/tools/ant/types/optional/image/Scale.java index 2621b98d0..ff61b7327 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/Scale.java +++ b/src/main/org/apache/tools/ant/types/optional/image/Scale.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.optional.image; diff --git a/src/main/org/apache/tools/ant/types/optional/image/Text.java b/src/main/org/apache/tools/ant/types/optional/image/Text.java index c97abc440..d5016ffb4 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/Text.java +++ b/src/main/org/apache/tools/ant/types/optional/image/Text.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.optional.image; diff --git a/src/main/org/apache/tools/ant/types/optional/image/TransformOperation.java b/src/main/org/apache/tools/ant/types/optional/image/TransformOperation.java index 19852b9e2..94ec673de 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/TransformOperation.java +++ b/src/main/org/apache/tools/ant/types/optional/image/TransformOperation.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.optional.image; import javax.media.jai.PlanarImage; diff --git a/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java b/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java index 785682b55..8c951bf54 100644 --- a/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java +++ b/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.resolver; diff --git a/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java b/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java index 37e97c7ae..6e0ce44f0 100644 --- a/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java +++ b/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.resolver; diff --git a/src/main/org/apache/tools/ant/types/selectors/AndSelector.java b/src/main/org/apache/tools/ant/types/selectors/AndSelector.java index 746fc189c..8b49b97c5 100644 --- a/src/main/org/apache/tools/ant/types/selectors/AndSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/AndSelector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/BaseExtendSelector.java b/src/main/org/apache/tools/ant/types/selectors/BaseExtendSelector.java index e11f6cbce..eb14722c5 100644 --- a/src/main/org/apache/tools/ant/types/selectors/BaseExtendSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/BaseExtendSelector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java b/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java index 8209ccc08..29150765f 100644 --- a/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java b/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java index e3c35dba7..6c491a06d 100644 --- a/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java +++ b/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; @@ -310,4 +310,4 @@ public abstract class BaseSelectorContainer extends BaseSelector appendSelector(selector); } -}
\ No newline at end of file +} diff --git a/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java b/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java index a8d2b76d3..4f91f1879 100644 --- a/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java b/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java index 18d457ed3..dc7a2f3a0 100644 --- a/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/DateSelector.java b/src/main/org/apache/tools/ant/types/selectors/DateSelector.java index c7ca9fe66..eb6013584 100644 --- a/src/main/org/apache/tools/ant/types/selectors/DateSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/DateSelector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/DependSelector.java b/src/main/org/apache/tools/ant/types/selectors/DependSelector.java index 2420c83b3..587807da3 100644 --- a/src/main/org/apache/tools/ant/types/selectors/DependSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/DependSelector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java b/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java index 9d9079e1d..071d79bf7 100644 --- a/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java b/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java index 65b84e297..5dba8a4ce 100644 --- a/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/ExtendFileSelector.java b/src/main/org/apache/tools/ant/types/selectors/ExtendFileSelector.java index b50cbbb4b..61f6f85dd 100644 --- a/src/main/org/apache/tools/ant/types/selectors/ExtendFileSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/ExtendFileSelector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java b/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java index 0bd69a8db..80c0015eb 100644 --- a/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/FileSelector.java b/src/main/org/apache/tools/ant/types/selectors/FileSelector.java index 119c4453a..a55329ef9 100644 --- a/src/main/org/apache/tools/ant/types/selectors/FileSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/FileSelector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java b/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java index 355b73cc3..12e6eed0d 100644 --- a/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/MajoritySelector.java b/src/main/org/apache/tools/ant/types/selectors/MajoritySelector.java index 9a5781860..c47f4dc25 100644 --- a/src/main/org/apache/tools/ant/types/selectors/MajoritySelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/MajoritySelector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java b/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java index fd794a8db..20a484e26 100644 --- a/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/NoneSelector.java b/src/main/org/apache/tools/ant/types/selectors/NoneSelector.java index 6087cf391..70b461bf0 100644 --- a/src/main/org/apache/tools/ant/types/selectors/NoneSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/NoneSelector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/NotSelector.java b/src/main/org/apache/tools/ant/types/selectors/NotSelector.java index dd8341546..69de9c84c 100644 --- a/src/main/org/apache/tools/ant/types/selectors/NotSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/NotSelector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/OrSelector.java b/src/main/org/apache/tools/ant/types/selectors/OrSelector.java index 8d763091b..d6a53ff2e 100644 --- a/src/main/org/apache/tools/ant/types/selectors/OrSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/OrSelector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java b/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java index 42194b2ed..6a7fb08e9 100644 --- a/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java b/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java index 7289ba44e..d5084f050 100644 --- a/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java b/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java index d3a73c740..910ae0c2e 100644 --- a/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java +++ b/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectorScanner.java b/src/main/org/apache/tools/ant/types/selectors/SelectorScanner.java index f3bbd6eef..b8266f329 100644 --- a/src/main/org/apache/tools/ant/types/selectors/SelectorScanner.java +++ b/src/main/org/apache/tools/ant/types/selectors/SelectorScanner.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java b/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java index 6bd4e0bc5..c495df90c 100644 --- a/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java +++ b/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java b/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java index d2fce3c83..b7e7a06b9 100644 --- a/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java b/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java index 9e0c6d60e..aac3ba762 100644 --- a/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Algorithm.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Algorithm.java index b788389ae..ce822343f 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Algorithm.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Algorithm.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors.modifiedselector; diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Cache.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Cache.java index 8699c4c02..f297d9cc0 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Cache.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Cache.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors.modifiedselector; diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java index 40da747fe..d060ff5fe 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors.modifiedselector; diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.java index dd37fa430..59050f702 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors.modifiedselector; diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java index b73533280..b335f28b4 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors.modifiedselector; diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java index 1b98c50c5..c4204720a 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors.modifiedselector; diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java index 7cbe855c9..508a87e4b 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors.modifiedselector; diff --git a/src/main/org/apache/tools/ant/util/ClasspathUtils.java b/src/main/org/apache/tools/ant/util/ClasspathUtils.java index 7799bb328..43399961c 100644 --- a/src/main/org/apache/tools/ant/util/ClasspathUtils.java +++ b/src/main/org/apache/tools/ant/util/ClasspathUtils.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/CollectionUtils.java b/src/main/org/apache/tools/ant/util/CollectionUtils.java index 47938ce1f..762f410be 100644 --- a/src/main/org/apache/tools/ant/util/CollectionUtils.java +++ b/src/main/org/apache/tools/ant/util/CollectionUtils.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; @@ -33,7 +33,7 @@ import java.util.Vector; public class CollectionUtils { /** - * Please use Vector.equals() or List.equals() + * Please use Vector.equals() or List.equals() * * @since Ant 1.5 * @deprecated diff --git a/src/main/org/apache/tools/ant/util/DOMElementWriter.java b/src/main/org/apache/tools/ant/util/DOMElementWriter.java index a207e504b..e8e819f64 100644 --- a/src/main/org/apache/tools/ant/util/DOMElementWriter.java +++ b/src/main/org/apache/tools/ant/util/DOMElementWriter.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/DateUtils.java b/src/main/org/apache/tools/ant/util/DateUtils.java index 364dc73de..d2b641658 100644 --- a/src/main/org/apache/tools/ant/util/DateUtils.java +++ b/src/main/org/apache/tools/ant/util/DateUtils.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; @@ -224,13 +224,13 @@ public final class DateUtils { * <code>yyyy-MM-dd'T'HH:mm:ss</code> * * @param datestr string to be parsed - * + * * @return a java.util.Date object as parsed by the format. * @exception ParseException if the supplied string cannot be parsed by * this pattern. * @since Ant 1.6 */ - public static Date parseIso8601DateTime(String datestr) + public static Date parseIso8601DateTime(String datestr) throws ParseException { return new SimpleDateFormat(ISO8601_DATETIME_PATTERN).parse(datestr); } @@ -240,7 +240,7 @@ public final class DateUtils { * <code>yyyy-MM-dd</code> * * @param datestr string to be parsed - * + * * @return a java.util.Date object as parsed by the format. * @exception ParseException if the supplied string cannot be parsed by * this pattern. @@ -255,13 +255,13 @@ public final class DateUtils { * or ISO8601_DATE formats. * * @param datestr string to be parsed - * + * * @return a java.util.Date object as parsed by the formats. * @exception ParseException if the supplied string cannot be parsed by * either of these patterns. * @since Ant 1.6 */ - public static Date parseIso8601DateTimeOrDate(String datestr) + public static Date parseIso8601DateTimeOrDate(String datestr) throws ParseException { try { return parseIso8601DateTime(datestr); diff --git a/src/main/org/apache/tools/ant/util/FileNameMapper.java b/src/main/org/apache/tools/ant/util/FileNameMapper.java index 0afae88cf..607650e5e 100644 --- a/src/main/org/apache/tools/ant/util/FileNameMapper.java +++ b/src/main/org/apache/tools/ant/util/FileNameMapper.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java index 2a0c49cf7..f17255798 100644 --- a/src/main/org/apache/tools/ant/util/FileUtils.java +++ b/src/main/org/apache/tools/ant/util/FileUtils.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; @@ -911,7 +911,7 @@ public class FileUtils { * This is useful since the JVM by default internally converts VMS paths * to Unix style. * The returned String is always an absolute path. - * + * * @param f The <code>File</code> to get the VMS path for. * @return The absolute VMS path to <code>f</code>. */ @@ -923,7 +923,7 @@ public class FileUtils { boolean isAbsolute = path.charAt(0) == File.separatorChar; // treat directories specified using .DIR syntax as files boolean isDirectory = f.isDirectory() && - !name.regionMatches(true, name.length() - 4, ".DIR", 0, 4); + !name.regionMatches(true, name.length() - 4, ".DIR", 0, 4); String device = null; StringBuffer directory = null; diff --git a/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java b/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java index 505e7a570..8157b5ffe 100644 --- a/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java +++ b/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/GlobPatternMapper.java b/src/main/org/apache/tools/ant/util/GlobPatternMapper.java index bfdff0c0e..c2a68d8ce 100644 --- a/src/main/org/apache/tools/ant/util/GlobPatternMapper.java +++ b/src/main/org/apache/tools/ant/util/GlobPatternMapper.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/IdentityMapper.java b/src/main/org/apache/tools/ant/util/IdentityMapper.java index 7697404a0..00ca083fd 100644 --- a/src/main/org/apache/tools/ant/util/IdentityMapper.java +++ b/src/main/org/apache/tools/ant/util/IdentityMapper.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/JAXPUtils.java b/src/main/org/apache/tools/ant/util/JAXPUtils.java index 4635084c5..0c72ed10e 100644 --- a/src/main/org/apache/tools/ant/util/JAXPUtils.java +++ b/src/main/org/apache/tools/ant/util/JAXPUtils.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; @@ -231,8 +231,8 @@ public class JAXPUtils { * * @since Ant 1.6 */ - private static synchronized - DocumentBuilderFactory getDocumentBuilderFactory() + private static synchronized + DocumentBuilderFactory getDocumentBuilderFactory() throws BuildException { if (builderFactory == null) { try { diff --git a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java index f20fae3e5..b2f5c2be4 100644 --- a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java +++ b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/KeepAliveInputStream.java b/src/main/org/apache/tools/ant/util/KeepAliveInputStream.java index b17db6c9a..b0922e68b 100644 --- a/src/main/org/apache/tools/ant/util/KeepAliveInputStream.java +++ b/src/main/org/apache/tools/ant/util/KeepAliveInputStream.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; @@ -21,7 +21,7 @@ import java.io.IOException; import java.io.InputStream; /** - * Class that can be used to wrap <tt>System.in</tt> + * Class that can be used to wrap <tt>System.in</tt> * without getting anxious about any client closing the stream. * * <p> diff --git a/src/main/org/apache/tools/ant/util/KeepAliveOutputStream.java b/src/main/org/apache/tools/ant/util/KeepAliveOutputStream.java index 0b323dc13..554d806b4 100644 --- a/src/main/org/apache/tools/ant/util/KeepAliveOutputStream.java +++ b/src/main/org/apache/tools/ant/util/KeepAliveOutputStream.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/LazyFileOutputStream.java b/src/main/org/apache/tools/ant/util/LazyFileOutputStream.java index e355e8b30..1f67667b9 100644 --- a/src/main/org/apache/tools/ant/util/LazyFileOutputStream.java +++ b/src/main/org/apache/tools/ant/util/LazyFileOutputStream.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; @@ -94,7 +94,7 @@ public class LazyFileOutputStream extends OutputStream { write(b, 0, b.length); } - public synchronized void write(byte[] b, int offset, int len) + public synchronized void write(byte[] b, int offset, int len) throws IOException { ensureOpened(); fos.write(b, offset, len); diff --git a/src/main/org/apache/tools/ant/util/LazyHashtable.java b/src/main/org/apache/tools/ant/util/LazyHashtable.java index a495225ed..368717f44 100644 --- a/src/main/org/apache/tools/ant/util/LazyHashtable.java +++ b/src/main/org/apache/tools/ant/util/LazyHashtable.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/LineTokenizer.java b/src/main/org/apache/tools/ant/util/LineTokenizer.java index f5aec680f..1122bd490 100644 --- a/src/main/org/apache/tools/ant/util/LineTokenizer.java +++ b/src/main/org/apache/tools/ant/util/LineTokenizer.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/LoaderUtils.java b/src/main/org/apache/tools/ant/util/LoaderUtils.java index 2c9af4376..aac8cd441 100644 --- a/src/main/org/apache/tools/ant/util/LoaderUtils.java +++ b/src/main/org/apache/tools/ant/util/LoaderUtils.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/MergingMapper.java b/src/main/org/apache/tools/ant/util/MergingMapper.java index 212eb1cbb..54710fcd2 100644 --- a/src/main/org/apache/tools/ant/util/MergingMapper.java +++ b/src/main/org/apache/tools/ant/util/MergingMapper.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/PackageNameMapper.java b/src/main/org/apache/tools/ant/util/PackageNameMapper.java index 3fe9a6e80..547874ac6 100644 --- a/src/main/org/apache/tools/ant/util/PackageNameMapper.java +++ b/src/main/org/apache/tools/ant/util/PackageNameMapper.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java b/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java index 4dfe3e3ee..14516120f 100644 --- a/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java +++ b/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/ResourceUtils.java b/src/main/org/apache/tools/ant/util/ResourceUtils.java index 9083968df..d8cad6e0c 100644 --- a/src/main/org/apache/tools/ant/util/ResourceUtils.java +++ b/src/main/org/apache/tools/ant/util/ResourceUtils.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; @@ -109,8 +109,8 @@ public class ResourceUtils { + " doesn\'t exist.", Project.MSG_VERBOSE); vresult.addElement(source[counter]); added = true; - } else if (!atarget.isDirectory() && - SelectorUtils.isOutOfDate(source[counter], + } else if (!atarget.isDirectory() && + SelectorUtils.isOutOfDate(source[counter], atarget, (int) granularity)) { logTo.log(source[counter].getName() + " added as " diff --git a/src/main/org/apache/tools/ant/util/ScriptRunner.java b/src/main/org/apache/tools/ant/util/ScriptRunner.java index ae4370756..b342cfbbf 100644 --- a/src/main/org/apache/tools/ant/util/ScriptRunner.java +++ b/src/main/org/apache/tools/ant/util/ScriptRunner.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/SourceFileScanner.java b/src/main/org/apache/tools/ant/util/SourceFileScanner.java index 8edf89dc1..ecf16ebef 100644 --- a/src/main/org/apache/tools/ant/util/SourceFileScanner.java +++ b/src/main/org/apache/tools/ant/util/SourceFileScanner.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/StringUtils.java b/src/main/org/apache/tools/ant/util/StringUtils.java index f83d67947..91249fbce 100644 --- a/src/main/org/apache/tools/ant/util/StringUtils.java +++ b/src/main/org/apache/tools/ant/util/StringUtils.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/TaskLogger.java b/src/main/org/apache/tools/ant/util/TaskLogger.java index 8a0884f9d..d1e95ceaf 100644 --- a/src/main/org/apache/tools/ant/util/TaskLogger.java +++ b/src/main/org/apache/tools/ant/util/TaskLogger.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/TeeOutputStream.java b/src/main/org/apache/tools/ant/util/TeeOutputStream.java index 1159044f6..4a3c2f574 100644 --- a/src/main/org/apache/tools/ant/util/TeeOutputStream.java +++ b/src/main/org/apache/tools/ant/util/TeeOutputStream.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/TimeoutObserver.java b/src/main/org/apache/tools/ant/util/TimeoutObserver.java index df1a68f37..060f4498b 100644 --- a/src/main/org/apache/tools/ant/util/TimeoutObserver.java +++ b/src/main/org/apache/tools/ant/util/TimeoutObserver.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/Tokenizer.java b/src/main/org/apache/tools/ant/util/Tokenizer.java index dbf4d6700..55a8ad0df 100644 --- a/src/main/org/apache/tools/ant/util/Tokenizer.java +++ b/src/main/org/apache/tools/ant/util/Tokenizer.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/UnPackageNameMapper.java b/src/main/org/apache/tools/ant/util/UnPackageNameMapper.java index d2d4440fb..f3ca657c5 100644 --- a/src/main/org/apache/tools/ant/util/UnPackageNameMapper.java +++ b/src/main/org/apache/tools/ant/util/UnPackageNameMapper.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/Watchdog.java b/src/main/org/apache/tools/ant/util/Watchdog.java index 5bb112a4d..4b061d14b 100644 --- a/src/main/org/apache/tools/ant/util/Watchdog.java +++ b/src/main/org/apache/tools/ant/util/Watchdog.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/WeakishReference.java b/src/main/org/apache/tools/ant/util/WeakishReference.java index 75d1fdf35..d7948661f 100644 --- a/src/main/org/apache/tools/ant/util/WeakishReference.java +++ b/src/main/org/apache/tools/ant/util/WeakishReference.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/XMLFragment.java b/src/main/org/apache/tools/ant/util/XMLFragment.java index 3d035d9e0..834d7e4da 100644 --- a/src/main/org/apache/tools/ant/util/XMLFragment.java +++ b/src/main/org/apache/tools/ant/util/XMLFragment.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java b/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java index 57806d184..2d15b5d31 100644 --- a/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java +++ b/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.depend; import java.io.File; diff --git a/src/main/org/apache/tools/ant/util/depend/DependencyAnalyzer.java b/src/main/org/apache/tools/ant/util/depend/DependencyAnalyzer.java index be813ccdd..d0cf1c6d9 100644 --- a/src/main/org/apache/tools/ant/util/depend/DependencyAnalyzer.java +++ b/src/main/org/apache/tools/ant/util/depend/DependencyAnalyzer.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.depend; import java.io.File; diff --git a/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java b/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java index 19f77518a..720d9ad7c 100644 --- a/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java +++ b/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.depend.bcel; import java.io.File; diff --git a/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java b/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java index b021793bc..a89721836 100644 --- a/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java +++ b/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.depend.bcel; diff --git a/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java b/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java index df33729da..4779d4981 100644 --- a/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java +++ b/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.depend.bcel; import java.io.File; diff --git a/src/main/org/apache/tools/ant/util/facade/FacadeTaskHelper.java b/src/main/org/apache/tools/ant/util/facade/FacadeTaskHelper.java index 0897fe4d8..504ad26b5 100644 --- a/src/main/org/apache/tools/ant/util/facade/FacadeTaskHelper.java +++ b/src/main/org/apache/tools/ant/util/facade/FacadeTaskHelper.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.facade; diff --git a/src/main/org/apache/tools/ant/util/facade/ImplementationSpecificArgument.java b/src/main/org/apache/tools/ant/util/facade/ImplementationSpecificArgument.java index 97799b28f..ea02b8a72 100644 --- a/src/main/org/apache/tools/ant/util/facade/ImplementationSpecificArgument.java +++ b/src/main/org/apache/tools/ant/util/facade/ImplementationSpecificArgument.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.facade; diff --git a/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java b/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java index 096489018..9541709dd 100644 --- a/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java +++ b/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.optional; diff --git a/src/main/org/apache/tools/ant/util/optional/WeakishReference12.java b/src/main/org/apache/tools/ant/util/optional/WeakishReference12.java index ffffb4edf..c327bd3b1 100644 --- a/src/main/org/apache/tools/ant/util/optional/WeakishReference12.java +++ b/src/main/org/apache/tools/ant/util/optional/WeakishReference12.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.optional; diff --git a/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java b/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java index b54b83398..c544b65f0 100644 --- a/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java +++ b/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.regexp; diff --git a/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java b/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java index 42d823953..38475cafd 100644 --- a/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java +++ b/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.regexp; diff --git a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java b/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java index 84ce5cdb0..edd8d95e3 100644 --- a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java +++ b/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.regexp; diff --git a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java b/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java index 995013a9e..c88eb4ead 100644 --- a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java +++ b/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.regexp; diff --git a/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java b/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java index 2077c9730..a4206d599 100644 --- a/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java +++ b/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.regexp; diff --git a/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java b/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java index 1a2850887..f64fd7ddc 100644 --- a/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java +++ b/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.regexp; diff --git a/src/main/org/apache/tools/ant/util/regexp/Regexp.java b/src/main/org/apache/tools/ant/util/regexp/Regexp.java index b2f744a46..6b2460e3d 100644 --- a/src/main/org/apache/tools/ant/util/regexp/Regexp.java +++ b/src/main/org/apache/tools/ant/util/regexp/Regexp.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.regexp; diff --git a/src/main/org/apache/tools/ant/util/regexp/RegexpFactory.java b/src/main/org/apache/tools/ant/util/regexp/RegexpFactory.java index 70a7dc502..486e25803 100644 --- a/src/main/org/apache/tools/ant/util/regexp/RegexpFactory.java +++ b/src/main/org/apache/tools/ant/util/regexp/RegexpFactory.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.regexp; diff --git a/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java b/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java index 5dda2f93a..050fed647 100644 --- a/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java +++ b/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.regexp; diff --git a/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java b/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java index e8e4c03d8..8ec27d546 100644 --- a/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java +++ b/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.regexp; diff --git a/src/main/org/apache/tools/ant/util/regexp/RegexpUtil.java b/src/main/org/apache/tools/ant/util/regexp/RegexpUtil.java index 32ef088b1..c0ba1ea7b 100644 --- a/src/main/org/apache/tools/ant/util/regexp/RegexpUtil.java +++ b/src/main/org/apache/tools/ant/util/regexp/RegexpUtil.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.regexp; diff --git a/src/main/org/apache/tools/bzip2/BZip2Constants.java b/src/main/org/apache/tools/bzip2/BZip2Constants.java index a2846ee52..19b914195 100644 --- a/src/main/org/apache/tools/bzip2/BZip2Constants.java +++ b/src/main/org/apache/tools/bzip2/BZip2Constants.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* diff --git a/src/main/org/apache/tools/bzip2/CBZip2InputStream.java b/src/main/org/apache/tools/bzip2/CBZip2InputStream.java index ddc7c91fd..cbb39499a 100644 --- a/src/main/org/apache/tools/bzip2/CBZip2InputStream.java +++ b/src/main/org/apache/tools/bzip2/CBZip2InputStream.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* diff --git a/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java b/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java index 574d81cd7..51b883a4d 100644 --- a/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java +++ b/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* diff --git a/src/main/org/apache/tools/bzip2/CRC.java b/src/main/org/apache/tools/bzip2/CRC.java index 86bd80bda..b32228f23 100644 --- a/src/main/org/apache/tools/bzip2/CRC.java +++ b/src/main/org/apache/tools/bzip2/CRC.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* diff --git a/src/main/org/apache/tools/mail/ErrorInQuitException.java b/src/main/org/apache/tools/mail/ErrorInQuitException.java index bccc0e160..4fbd139f5 100644 --- a/src/main/org/apache/tools/mail/ErrorInQuitException.java +++ b/src/main/org/apache/tools/mail/ErrorInQuitException.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.mail; diff --git a/src/main/org/apache/tools/mail/MailMessage.java b/src/main/org/apache/tools/mail/MailMessage.java index 37279e77d..ce0c5c41c 100644 --- a/src/main/org/apache/tools/mail/MailMessage.java +++ b/src/main/org/apache/tools/mail/MailMessage.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* diff --git a/src/main/org/apache/tools/mail/SmtpResponseReader.java b/src/main/org/apache/tools/mail/SmtpResponseReader.java index 106dba570..d76e11c90 100644 --- a/src/main/org/apache/tools/mail/SmtpResponseReader.java +++ b/src/main/org/apache/tools/mail/SmtpResponseReader.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.mail; diff --git a/src/main/org/apache/tools/tar/TarBuffer.java b/src/main/org/apache/tools/tar/TarBuffer.java index 16a36ffb4..077f9879e 100644 --- a/src/main/org/apache/tools/tar/TarBuffer.java +++ b/src/main/org/apache/tools/tar/TarBuffer.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* diff --git a/src/main/org/apache/tools/tar/TarConstants.java b/src/main/org/apache/tools/tar/TarConstants.java index af45e440c..4163638d5 100644 --- a/src/main/org/apache/tools/tar/TarConstants.java +++ b/src/main/org/apache/tools/tar/TarConstants.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* diff --git a/src/main/org/apache/tools/tar/TarEntry.java b/src/main/org/apache/tools/tar/TarEntry.java index eb0e06304..c66164c60 100644 --- a/src/main/org/apache/tools/tar/TarEntry.java +++ b/src/main/org/apache/tools/tar/TarEntry.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* diff --git a/src/main/org/apache/tools/tar/TarInputStream.java b/src/main/org/apache/tools/tar/TarInputStream.java index 0a60ce6a1..1357302e4 100644 --- a/src/main/org/apache/tools/tar/TarInputStream.java +++ b/src/main/org/apache/tools/tar/TarInputStream.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* diff --git a/src/main/org/apache/tools/tar/TarOutputStream.java b/src/main/org/apache/tools/tar/TarOutputStream.java index 80d009b29..1867288bb 100644 --- a/src/main/org/apache/tools/tar/TarOutputStream.java +++ b/src/main/org/apache/tools/tar/TarOutputStream.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* diff --git a/src/main/org/apache/tools/tar/TarUtils.java b/src/main/org/apache/tools/tar/TarUtils.java index 1ee7883bc..429bfa9b4 100644 --- a/src/main/org/apache/tools/tar/TarUtils.java +++ b/src/main/org/apache/tools/tar/TarUtils.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* diff --git a/src/main/org/apache/tools/zip/AsiExtraField.java b/src/main/org/apache/tools/zip/AsiExtraField.java index c67900ae2..0d770a2ba 100644 --- a/src/main/org/apache/tools/zip/AsiExtraField.java +++ b/src/main/org/apache/tools/zip/AsiExtraField.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.zip; diff --git a/src/main/org/apache/tools/zip/ExtraFieldUtils.java b/src/main/org/apache/tools/zip/ExtraFieldUtils.java index 165ec0413..fbf0df4e9 100644 --- a/src/main/org/apache/tools/zip/ExtraFieldUtils.java +++ b/src/main/org/apache/tools/zip/ExtraFieldUtils.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.zip; diff --git a/src/main/org/apache/tools/zip/UnixStat.java b/src/main/org/apache/tools/zip/UnixStat.java index 8cb8ec942..39dce3999 100644 --- a/src/main/org/apache/tools/zip/UnixStat.java +++ b/src/main/org/apache/tools/zip/UnixStat.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.zip; diff --git a/src/main/org/apache/tools/zip/UnrecognizedExtraField.java b/src/main/org/apache/tools/zip/UnrecognizedExtraField.java index 753dd7b8f..386ad8f07 100644 --- a/src/main/org/apache/tools/zip/UnrecognizedExtraField.java +++ b/src/main/org/apache/tools/zip/UnrecognizedExtraField.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.zip; diff --git a/src/main/org/apache/tools/zip/ZipEntry.java b/src/main/org/apache/tools/zip/ZipEntry.java index 31b4dfae6..7bf2ebe9a 100644 --- a/src/main/org/apache/tools/zip/ZipEntry.java +++ b/src/main/org/apache/tools/zip/ZipEntry.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.zip; diff --git a/src/main/org/apache/tools/zip/ZipExtraField.java b/src/main/org/apache/tools/zip/ZipExtraField.java index 4f066161d..9dfe7478f 100644 --- a/src/main/org/apache/tools/zip/ZipExtraField.java +++ b/src/main/org/apache/tools/zip/ZipExtraField.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.zip; diff --git a/src/main/org/apache/tools/zip/ZipFile.java b/src/main/org/apache/tools/zip/ZipFile.java index dab87689f..eb92fece2 100644 --- a/src/main/org/apache/tools/zip/ZipFile.java +++ b/src/main/org/apache/tools/zip/ZipFile.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.zip; diff --git a/src/main/org/apache/tools/zip/ZipLong.java b/src/main/org/apache/tools/zip/ZipLong.java index 5c13032fd..60589b3e1 100644 --- a/src/main/org/apache/tools/zip/ZipLong.java +++ b/src/main/org/apache/tools/zip/ZipLong.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.zip; diff --git a/src/main/org/apache/tools/zip/ZipOutputStream.java b/src/main/org/apache/tools/zip/ZipOutputStream.java index b9d9446e3..e5dd1060c 100644 --- a/src/main/org/apache/tools/zip/ZipOutputStream.java +++ b/src/main/org/apache/tools/zip/ZipOutputStream.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.zip; @@ -127,7 +127,7 @@ public class ZipOutputStream extends FilterOutputStream { * @since 1.15 */ private long localDataStart = 0; - + /** * Start of central directory. * @@ -175,7 +175,7 @@ public class ZipOutputStream extends FilterOutputStream { private String encoding = null; /** - * Deflater object for output + * Deflater object for output * * <p>This attribute is only protected to provide a level of API * backwards compatibility. This class used to extend {@link @@ -185,7 +185,7 @@ public class ZipOutputStream extends FilterOutputStream { * @since 1.14 */ protected Deflater def = new Deflater(Deflater.DEFAULT_COMPRESSION, true); - + /** * Deflater buffer * @@ -197,7 +197,7 @@ public class ZipOutputStream extends FilterOutputStream { * @since 1.14 */ protected byte[] buf = new byte[512]; - + /** * Optional random access output * @@ -237,7 +237,7 @@ public class ZipOutputStream extends FilterOutputStream { public ZipOutputStream(File file) throws IOException { super(null); - try { + try { raf = new RandomAccessFile(file, "rw"); raf.setLength(0); } catch (IOException e) { @@ -406,7 +406,7 @@ public class ZipOutputStream extends FilterOutputStream { + " method when not writing to a file"); } entry.setComprSize(entry.getSize()); - } + } if (entry.getMethod() == DEFLATED && hasCompressionLevelChanged) { def.setLevel(level); @@ -481,15 +481,15 @@ public class ZipOutputStream extends FilterOutputStream { } /** - * Closes this output stream and releases any system resources - * associated with the stream. + * Closes this output stream and releases any system resources + * associated with the stream. * * @exception IOException if an I/O error occurs. * @since 1.14 */ public void close() throws IOException { finish(); - + if (raf != null) { raf.close(); } @@ -499,8 +499,8 @@ public class ZipOutputStream extends FilterOutputStream { } /** - * Flushes this output stream and forces any buffered output bytes - * to be written out to the stream. + * Flushes this output stream and forces any buffered output bytes + * to be written out to the stream. * * @exception IOException if an I/O error occurs. * @since 1.14 @@ -543,7 +543,7 @@ public class ZipOutputStream extends FilterOutputStream { * Writes next block of compressed data to the output stream. * * @since 1.14 - */ + */ protected final void deflate() throws IOException { int len = def.deflate(buf, 0, buf.length); if (len > 0) { @@ -817,13 +817,13 @@ public class ZipOutputStream extends FilterOutputStream { protected final void writeOut(byte [] data) throws IOException { writeOut(data, 0, data.length); } - + /** * Write bytes to output or random access file * * @since 1.14 */ - protected final void writeOut(byte [] data, int offset, int length) + protected final void writeOut(byte [] data, int offset, int length) throws IOException { if (raf != null) { raf.write(data, offset, length); diff --git a/src/main/org/apache/tools/zip/ZipShort.java b/src/main/org/apache/tools/zip/ZipShort.java index cc43ddcf9..a8807071e 100644 --- a/src/main/org/apache/tools/zip/ZipShort.java +++ b/src/main/org/apache/tools/zip/ZipShort.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.zip; diff --git a/src/testcases/org/apache/tools/ant/AntClassLoaderTest.java b/src/testcases/org/apache/tools/ant/AntClassLoaderTest.java index 2d3098231..b0dca7501 100644 --- a/src/testcases/org/apache/tools/ant/AntClassLoaderTest.java +++ b/src/testcases/org/apache/tools/ant/AntClassLoaderTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; @@ -22,7 +22,7 @@ import junit.framework.TestCase; /** * Test case for ant class loader * - * @author Conor MacNeill</a> + * @author Conor MacNeill</a> */ public class AntClassLoaderTest extends TestCase { @@ -47,7 +47,7 @@ public class AntClassLoaderTest extends TestCase { } catch (ClassNotFoundException e) { // ignore expected } - + loader.cleanup(); try { // we don't expect to find this @@ -58,7 +58,7 @@ public class AntClassLoaderTest extends TestCase { } catch (NullPointerException e) { fail("loader should not fail even if cleaned up"); } - + // tell the build it is finished p.fireBuildFinished(null); try { diff --git a/src/testcases/org/apache/tools/ant/BuildFileTest.java b/src/testcases/org/apache/tools/ant/BuildFileTest.java index 110b800ba..22c99d689 100644 --- a/src/testcases/org/apache/tools/ant/BuildFileTest.java +++ b/src/testcases/org/apache/tools/ant/BuildFileTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; @@ -71,7 +71,7 @@ public abstract class BuildFileTest extends TestCase { String realLog = getLog(); assertEquals(log, realLog); } - + /** * Assert that the given substring is in the log messages */ @@ -82,7 +82,7 @@ public abstract class BuildFileTest extends TestCase { + realLog + "\"", realLog.indexOf(substring) >= 0); } - + /** * Assert that the given message has been logged with a priority * >= INFO when running the given target. @@ -377,12 +377,12 @@ public abstract class BuildFileTest extends TestCase { */ private static class AntOutputStream extends java.io.OutputStream { private StringBuffer buffer; - + public AntOutputStream( StringBuffer buffer ) { this.buffer = buffer; } - - public void write(int b) { + + public void write(int b) { buffer.append((char)b); } } diff --git a/src/testcases/org/apache/tools/ant/CaseTest.java b/src/testcases/org/apache/tools/ant/CaseTest.java index 08b2ab105..096ec74d2 100644 --- a/src/testcases/org/apache/tools/ant/CaseTest.java +++ b/src/testcases/org/apache/tools/ant/CaseTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java b/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java index 8d98cf508..3efda4963 100644 --- a/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java +++ b/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; @@ -63,7 +63,7 @@ public class DirectoryScannerTest extends BuildFileTest { ds.setBasedir(new File(getProject().getBaseDir(), "tmp")); ds.setIncludes(new String[] {"alpha/"}); ds.scan(); - compareFiles(ds, new String[] {"alpha/beta/beta.xml", + compareFiles(ds, new String[] {"alpha/beta/beta.xml", "alpha/beta/gamma/gamma.xml"}, new String[] {"alpha", "alpha/beta", "alpha/beta/gamma"}); } @@ -72,9 +72,9 @@ public class DirectoryScannerTest extends BuildFileTest { DirectoryScanner ds = new DirectoryScanner(); ds.setBasedir(new File(getProject().getBaseDir(), "tmp")); ds.scan(); - compareFiles(ds, new String[] {"alpha/beta/beta.xml", + compareFiles(ds, new String[] {"alpha/beta/beta.xml", "alpha/beta/gamma/gamma.xml"}, - new String[] {"", "alpha", "alpha/beta", + new String[] {"", "alpha", "alpha/beta", "alpha/beta/gamma"}); } @@ -111,7 +111,7 @@ public class DirectoryScannerTest extends BuildFileTest { if (!supportsSymlinks) { return; } - + getProject().executeTarget("symlink-setup"); DirectoryScanner ds = new DirectoryScanner(); ds.setBasedir(new File(getProject().getBaseDir(), "tmp")); @@ -125,7 +125,7 @@ public class DirectoryScannerTest extends BuildFileTest { if (!supportsSymlinks) { return; } - + getProject().executeTarget("symlink-setup"); DirectoryScanner ds = new DirectoryScanner(); ds.setBasedir(new File(getProject().getBaseDir(), "tmp")); @@ -137,7 +137,7 @@ public class DirectoryScannerTest extends BuildFileTest { // father and child pattern test public void testOrderOfIncludePatternsIrrelevant() { - String [] expectedFiles = {"alpha/beta/beta.xml", + String [] expectedFiles = {"alpha/beta/beta.xml", "alpha/beta/gamma/gamma.xml"}; String [] expectedDirectories = {"alpha/beta", "alpha/beta/gamma" }; DirectoryScanner ds = new DirectoryScanner(); @@ -158,7 +158,7 @@ public class DirectoryScannerTest extends BuildFileTest { ds.setBasedir(new File(getProject().getBaseDir(), "tmp")); ds.setIncludes(new String[] {"alpha/", "ALPHA/"}); ds.scan(); - compareFiles(ds, new String[] {"alpha/beta/beta.xml", + compareFiles(ds, new String[] {"alpha/beta/beta.xml", "alpha/beta/gamma/gamma.xml"}, new String[] {"alpha", "alpha/beta", "alpha/beta/gamma"}); } @@ -169,7 +169,7 @@ public class DirectoryScannerTest extends BuildFileTest { ds.setIncludes(new String[] {"alpha/", "ALPHA/"}); ds.setCaseSensitive(false); ds.scan(); - compareFiles(ds, new String[] {"alpha/beta/beta.xml", + compareFiles(ds, new String[] {"alpha/beta/beta.xml", "alpha/beta/gamma/gamma.xml"}, new String[] {"alpha", "alpha/beta", "alpha/beta/gamma"}); } @@ -204,7 +204,7 @@ public class DirectoryScannerTest extends BuildFileTest { ds.setBasedir(new File(getProject().getBaseDir(), "tmp")); ds.setIncludes(new String[] {"alpha/", "ALPHA/beta/"}); ds.scan(); - compareFiles(ds, new String[] {"alpha/beta/beta.xml", + compareFiles(ds, new String[] {"alpha/beta/beta.xml", "alpha/beta/gamma/gamma.xml"}, new String[] {"alpha", "alpha/beta", "alpha/beta/gamma"}); } @@ -215,7 +215,7 @@ public class DirectoryScannerTest extends BuildFileTest { ds.setIncludes(new String[] {"alpha/", "ALPHA/beta/"}); ds.setCaseSensitive(false); ds.scan(); - compareFiles(ds, new String[] {"alpha/beta/beta.xml", + compareFiles(ds, new String[] {"alpha/beta/beta.xml", "alpha/beta/gamma/gamma.xml"}, new String[] {"alpha", "alpha/beta", "alpha/beta/gamma"}); } @@ -291,7 +291,7 @@ public class DirectoryScannerTest extends BuildFileTest { for (int i=0; i<included.length; i++) { if (included[i].equals("zip")) { haveZipPackage = true; - } else if (included[i].equals("ThisIsALink" + } else if (included[i].equals("ThisIsALink" + File.separator + "taskdefs")) { haveTaskdefsPackage = true; @@ -391,13 +391,13 @@ public class DirectoryScannerTest extends BuildFileTest { } - private void compareFiles(DirectoryScanner ds, String[] expectedFiles, + private void compareFiles(DirectoryScanner ds, String[] expectedFiles, String[] expectedDirectories) { String includedFiles[] = ds.getIncludedFiles(); String includedDirectories[] = ds.getIncludedDirectories(); - assertEquals("file present: ", expectedFiles.length, + assertEquals("file present: ", expectedFiles.length, includedFiles.length); - assertEquals("directories present: ", expectedDirectories.length, + assertEquals("directories present: ", expectedDirectories.length, includedDirectories.length); TreeSet files = new TreeSet(); diff --git a/src/testcases/org/apache/tools/ant/DummyTaskAbstract.java b/src/testcases/org/apache/tools/ant/DummyTaskAbstract.java index 925f790a3..649f4ea16 100644 --- a/src/testcases/org/apache/tools/ant/DummyTaskAbstract.java +++ b/src/testcases/org/apache/tools/ant/DummyTaskAbstract.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; @@ -26,6 +26,6 @@ public abstract class DummyTaskAbstract extends Task { public void execute() { } - + public abstract void abstractDummy(); } diff --git a/src/testcases/org/apache/tools/ant/DummyTaskInterface.java b/src/testcases/org/apache/tools/ant/DummyTaskInterface.java index 01f9bb185..830e1c684 100644 --- a/src/testcases/org/apache/tools/ant/DummyTaskInterface.java +++ b/src/testcases/org/apache/tools/ant/DummyTaskInterface.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/testcases/org/apache/tools/ant/DummyTaskOk.java b/src/testcases/org/apache/tools/ant/DummyTaskOk.java index 495145c46..5b678c82d 100644 --- a/src/testcases/org/apache/tools/ant/DummyTaskOk.java +++ b/src/testcases/org/apache/tools/ant/DummyTaskOk.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; @@ -26,5 +26,5 @@ public class DummyTaskOk extends Task { public void execute() { } - + } diff --git a/src/testcases/org/apache/tools/ant/DummyTaskOkNonTask.java b/src/testcases/org/apache/tools/ant/DummyTaskOkNonTask.java index d9e4e8452..f52ab28fb 100644 --- a/src/testcases/org/apache/tools/ant/DummyTaskOkNonTask.java +++ b/src/testcases/org/apache/tools/ant/DummyTaskOkNonTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; @@ -24,5 +24,5 @@ public class DummyTaskOkNonTask { public void execute() { } - + } diff --git a/src/testcases/org/apache/tools/ant/DummyTaskWithNonPublicExecute.java b/src/testcases/org/apache/tools/ant/DummyTaskWithNonPublicExecute.java index 794db189f..1a3f89a21 100644 --- a/src/testcases/org/apache/tools/ant/DummyTaskWithNonPublicExecute.java +++ b/src/testcases/org/apache/tools/ant/DummyTaskWithNonPublicExecute.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; @@ -24,5 +24,5 @@ public class DummyTaskWithNonPublicExecute { void execute() { } - + } diff --git a/src/testcases/org/apache/tools/ant/DummyTaskWithNonVoidExecute.java b/src/testcases/org/apache/tools/ant/DummyTaskWithNonVoidExecute.java index 0ef39630f..c2ca2fb27 100644 --- a/src/testcases/org/apache/tools/ant/DummyTaskWithNonVoidExecute.java +++ b/src/testcases/org/apache/tools/ant/DummyTaskWithNonVoidExecute.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; @@ -25,5 +25,5 @@ public class DummyTaskWithNonVoidExecute { public int execute() { return 0; } - + } diff --git a/src/testcases/org/apache/tools/ant/DummyTaskWithoutDefaultConstructor.java b/src/testcases/org/apache/tools/ant/DummyTaskWithoutDefaultConstructor.java index 9add36450..40cc1259a 100644 --- a/src/testcases/org/apache/tools/ant/DummyTaskWithoutDefaultConstructor.java +++ b/src/testcases/org/apache/tools/ant/DummyTaskWithoutDefaultConstructor.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; @@ -26,5 +26,5 @@ public class DummyTaskWithoutDefaultConstructor extends Task { public void execute() { } - + } diff --git a/src/testcases/org/apache/tools/ant/DummyTaskWithoutExecute.java b/src/testcases/org/apache/tools/ant/DummyTaskWithoutExecute.java index b699c8ed1..e7d3d50bc 100644 --- a/src/testcases/org/apache/tools/ant/DummyTaskWithoutExecute.java +++ b/src/testcases/org/apache/tools/ant/DummyTaskWithoutExecute.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; @@ -24,5 +24,5 @@ public class DummyTaskWithoutExecute { public void execute(String dummy) { } - + } diff --git a/src/testcases/org/apache/tools/ant/DummyTaskWithoutPublicConstructor.java b/src/testcases/org/apache/tools/ant/DummyTaskWithoutPublicConstructor.java index 24f1ce438..9ec424792 100644 --- a/src/testcases/org/apache/tools/ant/DummyTaskWithoutPublicConstructor.java +++ b/src/testcases/org/apache/tools/ant/DummyTaskWithoutPublicConstructor.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; @@ -26,5 +26,5 @@ public class DummyTaskWithoutPublicConstructor extends Task { public void execute() { } - + } diff --git a/src/testcases/org/apache/tools/ant/ImmutableTest.java b/src/testcases/org/apache/tools/ant/ImmutableTest.java index 536fa96d2..3c04af5ae 100644 --- a/src/testcases/org/apache/tools/ant/ImmutableTest.java +++ b/src/testcases/org/apache/tools/ant/ImmutableTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; @@ -22,22 +22,22 @@ import org.apache.tools.ant.BuildFileTest; /** * @author Erik Hatcher */ -public class ImmutableTest extends BuildFileTest { +public class ImmutableTest extends BuildFileTest { - public ImmutableTest(String name) { + public ImmutableTest(String name) { super(name); } - - public void setUp() { + + public void setUp() { configureProject("src/etc/testcases/core/immutable.xml"); } - + // override allowed on <available> - public void test1() { + public void test1() { executeTarget("test1"); assertEquals("override", project.getProperty("test")); } - + // ensure <tstamp>'s new prefix attribute is working public void test2() { executeTarget("test2"); diff --git a/src/testcases/org/apache/tools/ant/IncludeTest.java b/src/testcases/org/apache/tools/ant/IncludeTest.java index 2fe0636b2..1b33bbbb9 100644 --- a/src/testcases/org/apache/tools/ant/IncludeTest.java +++ b/src/testcases/org/apache/tools/ant/IncludeTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; @@ -24,33 +24,33 @@ import org.apache.tools.ant.BuildFileTest; * * @author Conor MacNeill */ -public class IncludeTest extends BuildFileTest { - - public IncludeTest(String name) { +public class IncludeTest extends BuildFileTest { + + public IncludeTest(String name) { super(name); - } - - public void test1() { + } + + public void test1() { configureProject("src/etc/testcases/core/include/basic/include.xml"); expectLog("test1", "from included entity"); } - - public void test2() { + + public void test2() { configureProject("src/etc/testcases/core/include/frag#ment/include.xml"); expectLog("test1", "from included entity"); } - - public void test3() { + + public void test3() { configureProject("src/etc/testcases/core/include/frag#ment/simple.xml"); expectLog("test1", "from simple buildfile"); } - - public void test4() { + + public void test4() { configureProject("src/etc/testcases/core/include/basic/relative.xml"); expectLog("test1", "from included entity"); } - - public void test5() { + + public void test5() { configureProject("src/etc/testcases/core/include/frag#ment/relative.xml"); expectLog("test1", "from included entity"); } @@ -60,7 +60,7 @@ public class IncludeTest extends BuildFileTest { configureProject("src/etc/testcases/core/include/including_file_parse_error/build.xml"); fail("should have caused a parser exception"); } catch (BuildException e) { - assertTrue(e.getLocation().toString() + assertTrue(e.getLocation().toString() + " should refer to build.xml", e.getLocation().toString().indexOf("build.xml:") > -1); } @@ -72,10 +72,10 @@ public class IncludeTest extends BuildFileTest { executeTarget("test"); fail("should have cause a build failure"); } catch (BuildException e) { - assertTrue(e.getMessage() + assertTrue(e.getMessage() + " should start with \'Warning: Could not find", e.getMessage().startsWith("Warning: Could not find file ")); - assertTrue(e.getLocation().toString() + assertTrue(e.getLocation().toString() + " should end with build.xml:14: ", e.getLocation().toString().endsWith("build.xml:14: ")); } @@ -86,7 +86,7 @@ public class IncludeTest extends BuildFileTest { configureProject("src/etc/testcases/core/include/included_file_parse_error/build.xml"); fail("should have caused a parser exception"); } catch (BuildException e) { - assertTrue(e.getLocation().toString() + assertTrue(e.getLocation().toString() + " should refer to included_file.xml", e.getLocation().toString() .indexOf("included_file.xml:") > -1); @@ -99,26 +99,26 @@ public class IncludeTest extends BuildFileTest { executeTarget("test"); fail("should have cause a build failure"); } catch (BuildException e) { - assertTrue(e.getMessage() + assertTrue(e.getMessage() + " should start with \'Warning: Could not find", e.getMessage().startsWith("Warning: Could not find file ")); - assertTrue(e.getLocation().toString() + assertTrue(e.getLocation().toString() + " should end with included_file.xml:2: ", e.getLocation().toString().endsWith("included_file.xml:2: ")); } } - public void testWithSpaceInclude() { + public void testWithSpaceInclude() { configureProject("src/etc/testcases/core/include/with space/include.xml"); expectLog("test1", "from included entity in 'with space'"); } - - public void testWithSpaceSimple() { + + public void testWithSpaceSimple() { configureProject("src/etc/testcases/core/include/with space/simple.xml"); expectLog("test1", "from simple buildfile in 'with space'"); } - - public void testWithSpaceRelative() { + + public void testWithSpaceRelative() { configureProject("src/etc/testcases/core/include/with space/relative.xml"); expectLog("test1", "from included entity in 'with space'"); } diff --git a/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java b/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java index efc988fbc..4083f78eb 100644 --- a/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java +++ b/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2001,2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; @@ -26,7 +26,7 @@ import org.apache.tools.ant.taskdefs.condition.Os; /** * JUnit 3 testcases for org.apache.tools.ant.IntrospectionHelper. * - * @author Stefan Bodewig + * @author Stefan Bodewig */ public class IntrospectionHelperTest extends TestCase { @@ -37,7 +37,7 @@ public class IntrospectionHelperTest extends TestCase { public IntrospectionHelperTest(String name) { super(name); } - + public void setUp() { p = new Project(); p.setBasedir(projectBasedir); @@ -65,14 +65,14 @@ public class IntrospectionHelperTest extends TestCase { IntrospectionHelper ih = IntrospectionHelper.getHelper(java.lang.String.class); assertTrue("String doesn\'t support addText", !ih.supportsCharacters()); ih = IntrospectionHelper.getHelper(getClass()); - assertTrue("IntrospectionHelperTest supports addText", + assertTrue("IntrospectionHelperTest supports addText", ih.supportsCharacters()); } public void addText(String text) { assertEquals("test", text); } - + public void testElementCreators() throws BuildException { IntrospectionHelper ih = IntrospectionHelper.getHelper(getClass()); try { @@ -150,7 +150,7 @@ public class IntrospectionHelperTest extends TestCase { assertTrue(be.getException() instanceof NullPointerException); } } - + public void testGetNestedElements() { Hashtable h = new Hashtable(); h.put("six", java.lang.String.class); @@ -209,7 +209,7 @@ public class IntrospectionHelperTest extends TestCase { public void addThirteen(StringBuffer sb) { sb.append("test"); } - + public void addFourteen(StringBuffer s) { throw new NullPointerException(); } diff --git a/src/testcases/org/apache/tools/ant/LoaderRefTest.java b/src/testcases/org/apache/tools/ant/LoaderRefTest.java index 4114149c1..be06e20bf 100644 --- a/src/testcases/org/apache/tools/ant/LoaderRefTest.java +++ b/src/testcases/org/apache/tools/ant/LoaderRefTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/testcases/org/apache/tools/ant/MockBuildListener.java b/src/testcases/org/apache/tools/ant/MockBuildListener.java index 58a3edb6c..4693f9e22 100644 --- a/src/testcases/org/apache/tools/ant/MockBuildListener.java +++ b/src/testcases/org/apache/tools/ant/MockBuildListener.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; @@ -22,21 +22,21 @@ import java.util.Vector; import junit.framework.Assert; public class MockBuildListener extends Assert implements BuildListener { - + private final Vector buffer = new Vector(); private final Project project; - + public MockBuildListener(final Project project) { this.project = project; } - + public void buildStarted(BuildEvent event) {} public void buildFinished(BuildEvent event) {} public void targetStarted(BuildEvent event) {} public void targetFinished(BuildEvent event) {} public void taskStarted(BuildEvent event) {} public void taskFinished(BuildEvent event) {} - + public void messageLogged(final BuildEvent actual) { if(actual.getPriority()==Project.MSG_DEBUG) return; @@ -48,15 +48,15 @@ public class MockBuildListener extends Assert implements BuildListener { assertEquals("unexpected messageLogged ", expected.getMessage(), actual.getMessage()); assertEquals("unexpected priority ", expected.getPriority(), actual.getPriority()); } - + public void assertEmpty() { assertTrue("MockBuildListener is not empty", buffer.isEmpty()); } - + public void addBuildEvent(final String message, final int priority) { final BuildEvent be = new BuildEvent(project); be.setMessage(message, priority); buffer.addElement(be); } - + } diff --git a/src/testcases/org/apache/tools/ant/ProjectTest.java b/src/testcases/org/apache/tools/ant/ProjectTest.java index b8fc38270..61619b362 100644 --- a/src/testcases/org/apache/tools/ant/ProjectTest.java +++ b/src/testcases/org/apache/tools/ant/ProjectTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; @@ -33,7 +33,7 @@ import junit.framework.TestSuite; /** * Very limited test class for Project. Waiting to be extended. * - * @author Stefan Bodewig + * @author Stefan Bodewig */ public class ProjectTest extends TestCase { @@ -53,12 +53,12 @@ public class ProjectTest extends TestCase { } public void testDataTypes() throws BuildException { - assertNull("dummy is not a known data type", + assertNull("dummy is not a known data type", p.createDataType("dummy")); Object o = p.createDataType("fileset"); assertNotNull("fileset is a known type", o); assertTrue("fileset creates FileSet", o instanceof FileSet); - assertTrue("PatternSet", + assertTrue("PatternSet", p.createDataType("patternset") instanceof PatternSet); assertTrue("Path", p.createDataType("path") instanceof Path); } @@ -70,30 +70,30 @@ public class ProjectTest extends TestCase { /* * Start with simple absolute file names. */ - assertEquals(File.separator, + assertEquals(File.separator, p.resolveFile("/", null).getPath()); - assertEquals(File.separator, + assertEquals(File.separator, p.resolveFile("\\", null).getPath()); /* * throw in drive letters */ String driveSpec = "C:"; - assertEquals(driveSpec + "\\", + assertEquals(driveSpec + "\\", p.resolveFile(driveSpec + "/", null).getPath()); - assertEquals(driveSpec + "\\", + assertEquals(driveSpec + "\\", p.resolveFile(driveSpec + "\\", null).getPath()); String driveSpecLower = "c:"; - assertEquals(driveSpec + "\\", + assertEquals(driveSpec + "\\", p.resolveFile(driveSpecLower + "/", null).getPath()); - assertEquals(driveSpec + "\\", + assertEquals(driveSpec + "\\", p.resolveFile(driveSpecLower + "\\", null).getPath()); /* * promised to eliminate consecutive slashes after drive letter. */ - assertEquals(driveSpec + "\\", + assertEquals(driveSpec + "\\", p.resolveFile(driveSpec + "/////", null).getPath()); - assertEquals(driveSpec + "\\", + assertEquals(driveSpec + "\\", p.resolveFile(driveSpec + "\\\\\\\\\\\\", null).getPath()); /* @@ -125,9 +125,9 @@ public class ProjectTest extends TestCase { path = root + path.substring(1); return path.replace('\\', File.separatorChar).replace('/', File.separatorChar); } - - private void assertTaskDefFails(final Class taskClass, + + private void assertTaskDefFails(final Class taskClass, final String message) { final String dummyName = "testTaskDefinitionDummy"; try { @@ -141,7 +141,7 @@ public class ProjectTest extends TestCase { assertTrue(!p.getTaskDefinitions().containsKey(dummyName)); } } - + public void testAddTaskDefinition() { p.addBuildListener(mbl); @@ -154,7 +154,7 @@ public class ProjectTest extends TestCase { assertTaskDefFails(DummyTaskPrivate.class, DummyTaskPrivate.class + " is not public"); try { - assertTaskDefFails(DummyTaskProtected.class, + assertTaskDefFails(DummyTaskProtected.class, DummyTaskProtected.class + " is not public"); } catch (AssertionFailedError e) { /* @@ -164,28 +164,28 @@ public class ProjectTest extends TestCase { * from time to time */ assertTrue(JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1)); - assertTaskDefFails(DummyTaskProtected.class, - "No public no-arg constructor in " + assertTaskDefFails(DummyTaskProtected.class, + "No public no-arg constructor in " + DummyTaskProtected.class); } - + assertTaskDefFails(DummyTaskPackage.class, DummyTaskPackage.class + " is not public"); - assertTaskDefFails(DummyTaskAbstract.class, DummyTaskAbstract.class + " is abstract"); + assertTaskDefFails(DummyTaskAbstract.class, DummyTaskAbstract.class + " is abstract"); assertTaskDefFails(DummyTaskInterface.class, DummyTaskInterface.class + " is abstract"); assertTaskDefFails(DummyTaskWithoutDefaultConstructor.class, "No public no-arg constructor in " + DummyTaskWithoutDefaultConstructor.class); assertTaskDefFails(DummyTaskWithoutPublicConstructor.class, "No public no-arg constructor in " + DummyTaskWithoutPublicConstructor.class); - + assertTaskDefFails(DummyTaskWithoutExecute.class, "No public execute() in " + DummyTaskWithoutExecute.class); assertTaskDefFails(DummyTaskWithNonPublicExecute.class, "No public execute() in " + DummyTaskWithNonPublicExecute.class); - + mbl.addBuildEvent("return type of execute() should be void but was \"int\" in " + DummyTaskWithNonVoidExecute.class, Project.MSG_WARN); p.addTaskDefinition("NonVoidExecute", DummyTaskWithNonVoidExecute.class); mbl.assertEmpty(); assertEquals(DummyTaskWithNonVoidExecute.class, p.getTaskDefinitions().get("NonVoidExecute")); } - + public void testInputHandler() { InputHandler ih = p.getInputHandler(); assertNotNull(ih); diff --git a/src/testcases/org/apache/tools/ant/PropertyExpansionTest.java b/src/testcases/org/apache/tools/ant/PropertyExpansionTest.java index d9184fcd0..89c481024 100644 --- a/src/testcases/org/apache/tools/ant/PropertyExpansionTest.java +++ b/src/testcases/org/apache/tools/ant/PropertyExpansionTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ @@ -50,15 +50,15 @@ public class PropertyExpansionTest extends BuildFileTest { assertExpandsTo("$$$","$$"); assertExpandsTo("$$$$-","$$-"); assertExpandsTo("",""); - assertExpandsTo("Class$$subclass","Class$subclass"); + assertExpandsTo("Class$$subclass","Class$subclass"); } - + /** * new things we want */ public void testDollarPassthru() { - assertExpandsTo("$-","$-"); - assertExpandsTo("Class$subclass","Class$subclass"); + assertExpandsTo("$-","$-"); + assertExpandsTo("Class$subclass","Class$subclass"); assertExpandsTo("$$$-","$$-"); assertExpandsTo("$$$$$","$$$"); assertExpandsTo("${unassigned.property}","${unassigned.property}"); @@ -66,12 +66,12 @@ public class PropertyExpansionTest extends BuildFileTest { assertExpandsTo("$}}","$}}"); } - + /** * old things we dont want; not a test no more */ public void oldtestQuirkyLegacyBehavior() { - assertExpandsTo("Class$subclass","Classsubclass"); + assertExpandsTo("Class$subclass","Classsubclass"); assertExpandsTo("$$$-","$-"); assertExpandsTo("a$b","ab"); assertExpandsTo("$}}","}}"); diff --git a/src/testcases/org/apache/tools/ant/TaskContainerTest.java b/src/testcases/org/apache/tools/ant/TaskContainerTest.java index af435614f..d27bb53b6 100644 --- a/src/testcases/org/apache/tools/ant/TaskContainerTest.java +++ b/src/testcases/org/apache/tools/ant/TaskContainerTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/testcases/org/apache/tools/ant/TopLevelTaskTest.java b/src/testcases/org/apache/tools/ant/TopLevelTaskTest.java index f64019f5b..003060537 100644 --- a/src/testcases/org/apache/tools/ant/TopLevelTaskTest.java +++ b/src/testcases/org/apache/tools/ant/TopLevelTaskTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant; diff --git a/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java b/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java index 5186bee98..0e742ab2f 100644 --- a/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java +++ b/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/testcases/org/apache/tools/ant/filters/DynamicFilterTest.java b/src/testcases/org/apache/tools/ant/filters/DynamicFilterTest.java index 1d4c0dc20..18ff9caf3 100644 --- a/src/testcases/org/apache/tools/ant/filters/DynamicFilterTest.java +++ b/src/testcases/org/apache/tools/ant/filters/DynamicFilterTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/testcases/org/apache/tools/ant/filters/EscapeUnicodeTest.java b/src/testcases/org/apache/tools/ant/filters/EscapeUnicodeTest.java index 96efce6d3..222cc9bcd 100644 --- a/src/testcases/org/apache/tools/ant/filters/EscapeUnicodeTest.java +++ b/src/testcases/org/apache/tools/ant/filters/EscapeUnicodeTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; @@ -31,14 +31,14 @@ public class EscapeUnicodeTest extends BuildFileTest { super(name); } - public void setUp() { + public void setUp() { configureProject("src/etc/testcases/filters/build.xml"); } - - public void tearDown() { + + public void tearDown() { executeTarget("cleanup"); } - + public void testEscapeUnicode() throws IOException { executeTarget("testEscapeUnicode"); File expected = getProject().resolveFile("expected/escapeunicode.test"); diff --git a/src/testcases/org/apache/tools/ant/filters/HeadTailTest.java b/src/testcases/org/apache/tools/ant/filters/HeadTailTest.java index a0595e0eb..0a114a98e 100644 --- a/src/testcases/org/apache/tools/ant/filters/HeadTailTest.java +++ b/src/testcases/org/apache/tools/ant/filters/HeadTailTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/testcases/org/apache/tools/ant/filters/LineContainsTest.java b/src/testcases/org/apache/tools/ant/filters/LineContainsTest.java index 15663fc09..842897dfe 100644 --- a/src/testcases/org/apache/tools/ant/filters/LineContainsTest.java +++ b/src/testcases/org/apache/tools/ant/filters/LineContainsTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; @@ -32,20 +32,20 @@ public class LineContainsTest extends BuildFileTest { super(name); } - public void setUp() { + public void setUp() { configureProject("src/etc/testcases/filters/build.xml"); } - - public void tearDown() { + + public void tearDown() { executeTarget("cleanup"); } - - public void testLineContains() throws IOException { + + public void testLineContains() throws IOException { executeTarget("testLineContains"); File expected = getProject().resolveFile("expected/linecontains.test"); File result = getProject().resolveFile("result/linecontains.test"); FileUtils fu = FileUtils.newFileUtils(); assertTrue(fu.contentEquals(expected, result)); } - + } diff --git a/src/testcases/org/apache/tools/ant/filters/NoNewLineTest.java b/src/testcases/org/apache/tools/ant/filters/NoNewLineTest.java index 780124935..520673c1c 100644 --- a/src/testcases/org/apache/tools/ant/filters/NoNewLineTest.java +++ b/src/testcases/org/apache/tools/ant/filters/NoNewLineTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/testcases/org/apache/tools/ant/filters/ReplaceTokensTest.java b/src/testcases/org/apache/tools/ant/filters/ReplaceTokensTest.java index cea96ca06..3c389a285 100644 --- a/src/testcases/org/apache/tools/ant/filters/ReplaceTokensTest.java +++ b/src/testcases/org/apache/tools/ant/filters/ReplaceTokensTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; @@ -32,20 +32,20 @@ public class ReplaceTokensTest extends BuildFileTest { super(name); } - public void setUp() { + public void setUp() { configureProject("src/etc/testcases/filters/build.xml"); } - - public void tearDown() { + + public void tearDown() { executeTarget("cleanup"); } - - public void testReplaceTokens() throws IOException { + + public void testReplaceTokens() throws IOException { executeTarget("testReplaceTokens"); File expected = getProject().resolveFile("expected/replacetokens.test"); File result = getProject().resolveFile("result/replacetokens.test"); FileUtils fu = FileUtils.newFileUtils(); assertTrue(fu.contentEquals(expected, result)); } - + } diff --git a/src/testcases/org/apache/tools/ant/filters/StripJavaCommentsTest.java b/src/testcases/org/apache/tools/ant/filters/StripJavaCommentsTest.java index 4111998aa..606bdc788 100644 --- a/src/testcases/org/apache/tools/ant/filters/StripJavaCommentsTest.java +++ b/src/testcases/org/apache/tools/ant/filters/StripJavaCommentsTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; diff --git a/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java b/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java index 1a3621044..2e7ed3d33 100644 --- a/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java +++ b/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.filters; @@ -115,7 +115,7 @@ public class TokenFilterTest extends BuildFileTest { return; executeTarget("dollermatch"); } - + public void testTrimFile() throws IOException { String contents = getFileString( "trimfile", "result/trimfile"); diff --git a/src/testcases/org/apache/tools/ant/taskdefs/AbstractCvsTaskTest.java b/src/testcases/org/apache/tools/ant/taskdefs/AbstractCvsTaskTest.java index 8b31ae31f..f19b4252b 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/AbstractCvsTaskTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/AbstractCvsTaskTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,10 +12,10 @@ * 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.tools.ant.taskdefs; - + import java.io.File; import org.apache.tools.ant.BuildFileTest; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/AntLikeTasksAtTopLevelTest.java b/src/testcases/org/apache/tools/ant/taskdefs/AntLikeTasksAtTopLevelTest.java index 70d9e5fdb..64616e4ee 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/AntLikeTasksAtTopLevelTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/AntLikeTasksAtTopLevelTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -27,7 +27,7 @@ public class AntLikeTasksAtTopLevelTest extends BuildFileTest { public AntLikeTasksAtTopLevelTest(String name) { super(name); } - + public void testAnt() { try { configureProject("src/etc/testcases/taskdefs/toplevelant.xml"); diff --git a/src/testcases/org/apache/tools/ant/taskdefs/AntStructureTest.java b/src/testcases/org/apache/tools/ant/taskdefs/AntStructureTest.java index 3ddbb7376..c9c069b1b 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/AntStructureTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/AntStructureTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,26 +12,26 @@ * 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.tools.ant.taskdefs; import org.apache.tools.ant.BuildFileTest; /** - * @author Nico Seessle <nico@seessle.de> + * @author Nico Seessle <nico@seessle.de> */ -public class AntStructureTest extends BuildFileTest { - - public AntStructureTest(String name) { +public class AntStructureTest extends BuildFileTest { + + public AntStructureTest(String name) { super(name); - } - - public void setUp() { + } + + public void setUp() { configureProject("src/etc/testcases/taskdefs/antstructure.xml"); } - - public void test1() { + + public void test1() { expectBuildException("test1", "required argument not specified"); } } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/AntTest.java b/src/testcases/org/apache/tools/ant/taskdefs/AntTest.java index b70fd8898..b90665d16 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/AntTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/AntTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -276,7 +276,7 @@ public class AntTest extends BuildFileTest { public void testTopLevelTarget() { expectLog("topleveltarget", "Hello world"); } - + public void testMultiplePropertyFileChildren() { PropertyChecker pcBar = new PropertyChecker("bar", new String[] {null, "Bar"}); @@ -477,7 +477,7 @@ public class AntTest extends BuildFileTest { + " target " + event.getTarget().getName()); } - + if (error == null) { try { assertEquals(expectedValues[calls++], diff --git a/src/testcases/org/apache/tools/ant/taskdefs/AntlibTest.java b/src/testcases/org/apache/tools/ant/taskdefs/AntlibTest.java index edc5fc1c0..9ad8ffedc 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/AntlibTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/AntlibTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -36,7 +36,7 @@ public class AntlibTest extends BuildFileTest { public void testAntlibFile() { expectLog("antlib.file", "MyTask called"); } - + /** * Confirms that all matching resources will be used, so that you * can collect several antlibs in one Definer call. diff --git a/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java b/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java index 671f3729a..407a96f6f 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java b/src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java index f548b8954..72fdb399d 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/BZip2Test.java b/src/testcases/org/apache/tools/ant/taskdefs/BZip2Test.java index 4df8e1283..e53e3e344 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/BZip2Test.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/BZip2Test.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/BasenameTest.java b/src/testcases/org/apache/tools/ant/taskdefs/BasenameTest.java index cc97f3782..c94505fdd 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/BasenameTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/BasenameTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -21,61 +21,61 @@ import java.io.File; import org.apache.tools.ant.BuildFileTest; /** - * @author Diane Holt <holtdl@apache.org> + * @author Diane Holt <holtdl@apache.org> */ -public class BasenameTest extends BuildFileTest { - - public BasenameTest(String name) { +public class BasenameTest extends BuildFileTest { + + public BasenameTest(String name) { super(name); - } - - public void setUp() { + } + + public void setUp() { configureProject("src/etc/testcases/taskdefs/basename.xml"); } - public void test1() { + public void test1() { expectBuildException("test1", "required attribute missing"); } - public void test2() { + public void test2() { expectBuildException("test2", "required attribute missing"); } - public void test3() { + public void test3() { expectBuildException("test3", "required attribute missing"); } - public void test4() { + public void test4() { executeTarget("test4"); String checkprop = project.getProperty("file.w.suf"); assertEquals("foo.txt", checkprop); } - - public void test5() { + + public void test5() { executeTarget("test5"); String checkprop = project.getProperty("file.wo.suf"); assertEquals("foo", checkprop); } - - public void testMultipleDots() { + + public void testMultipleDots() { executeTarget("testMultipleDots"); String checkprop = project.getProperty("file.wo.suf"); assertEquals("foo.bar", checkprop); } - - public void testNoDots() { + + public void testNoDots() { executeTarget("testNoDots"); String checkprop = project.getProperty("file.wo.suf"); assertEquals("foo.bar", checkprop); } - public void testValueEqualsSuffixWithDot() { + public void testValueEqualsSuffixWithDot() { executeTarget("testValueEqualsSuffixWithDot"); String checkprop = project.getProperty("file.wo.suf"); assertEquals("", checkprop); } - public void testValueEqualsSuffixWithoutDot() { + public void testValueEqualsSuffixWithoutDot() { executeTarget("testValueEqualsSuffixWithoutDot"); String checkprop = project.getProperty("file.wo.suf"); assertEquals("", checkprop); diff --git a/src/testcases/org/apache/tools/ant/taskdefs/CVSPassTest.java b/src/testcases/org/apache/tools/ant/taskdefs/CVSPassTest.java index cd613bb3d..c06e1a70f 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/CVSPassTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/CVSPassTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -26,7 +26,7 @@ import org.apache.tools.ant.BuildFileTest; * * @author <a href="mailto:jeff@custommonkey.org">Jeff Martin</a> */ -public class CVSPassTest extends BuildFileTest { +public class CVSPassTest extends BuildFileTest { private final String EOL = System.getProperty("line.separator"); private final String JAKARTA_URL = ":pserver:anoncvs@jakarta.apache.org:/home/cvspublic Ay=0=h<Z"; @@ -34,17 +34,17 @@ public class CVSPassTest extends BuildFileTest { ":pserver:anoncvs@xml.apache.org:/home/cvspublic Ay=0=h<Z"; private final String TIGRIS_URL = ":pserver:guest@cvs.tigris.org:/cvs AIbdZ,"; - - - public CVSPassTest(String name) { + + + public CVSPassTest(String name) { super(name); } - public void setUp() { + public void setUp() { configureProject("src/etc/testcases/taskdefs/cvspass.xml"); } - public void testNoCVSRoot() { + public void testNoCVSRoot() { try{ executeTarget("test1"); fail("BuildException not thrown"); @@ -53,7 +53,7 @@ public class CVSPassTest extends BuildFileTest { } } - public void testNoPassword() { + public void testNoPassword() { try{ executeTarget("test2"); fail("BuildException not thrown"); @@ -66,7 +66,7 @@ public class CVSPassTest extends BuildFileTest { executeTarget("cleanup"); } - public void testPassFile() throws Exception { + public void testPassFile() throws Exception { executeTarget("test3"); File f = new File(getProjectDir(), "testpassfile.tmp"); @@ -76,7 +76,7 @@ public class CVSPassTest extends BuildFileTest { } - public void testPassFileDuplicateEntry() throws Exception { + public void testPassFileDuplicateEntry() throws Exception { executeTarget("test4"); File f = new File(getProjectDir(), "testpassfile.tmp"); @@ -88,7 +88,7 @@ public class CVSPassTest extends BuildFileTest { readFile(f)); } - public void testPassFileMultipleEntry() throws Exception { + public void testPassFileMultipleEntry() throws Exception { executeTarget("test5"); File f = new File(getProjectDir(), "testpassfile.tmp"); @@ -102,8 +102,8 @@ public class CVSPassTest extends BuildFileTest { } private String readFile(File f) throws Exception { - BufferedReader reader = null; - + BufferedReader reader = null; + try { reader = new BufferedReader(new FileReader(f)); diff --git a/src/testcases/org/apache/tools/ant/taskdefs/CallTargetTest.java b/src/testcases/org/apache/tools/ant/taskdefs/CallTargetTest.java index f9911e5db..372e4898d 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/CallTargetTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/CallTargetTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -55,7 +55,7 @@ public class CallTargetTest extends BuildFileTest { project.executeTargets(v); assertLogContaining("multi is SETmulti is SET"); } - + public void tearDown() { project.executeTarget("cleanup"); } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java index 6227953eb..c5c51b261 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -34,7 +34,7 @@ public class ChecksumTest extends BuildFileTest { super(name); } - public void setUp() { + public void setUp() { configureProject("src/etc/testcases/taskdefs/checksum.xml"); } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ConcatTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ConcatTest.java index 0abc071cf..f10d6349f 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/ConcatTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/ConcatTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -31,7 +31,7 @@ import java.io.Reader; * * @author <a href="mailto:derek@activate.net">Derek Slager</a> */ -public class ConcatTest +public class ConcatTest extends BuildFileTest { /** @@ -146,7 +146,7 @@ public class ConcatTest final long newSize = file2.length(); assertEquals(origSize, newSize); - + } public void testAppend() { test3(); @@ -160,7 +160,7 @@ public class ConcatTest final long newSize = file2.length(); assertEquals(origSize*2, newSize); - + } public void testFilter() { @@ -207,7 +207,7 @@ public class ConcatTest executeTarget("testmultireader"); assertTrue(getLog().indexOf("Bye") > -1); assertTrue(getLog().indexOf("Hello") == -1); - } + } /** * Check if fixlastline works */ @@ -218,7 +218,7 @@ public class ConcatTest "testfixlastline", "concat.line4", "end of line" + System.getProperty("line.separator") + "This has"); - } + } /** * Check if fixlastline works with eol @@ -229,7 +229,7 @@ public class ConcatTest expectFileContains( "testfixlastlineeol", "concat.linecr", "end of line\rThis has"); - } + } // ------------------------------------------------------ // Helper methods - should be in BuildFileTest @@ -246,16 +246,16 @@ public class ConcatTest finally { try {r.close();} catch (Throwable ignore) {} } - + } - + private String getFileString(String target, String filename) throws IOException { executeTarget(target); return getFileString(filename); } - + private void expectFileContains( String target, String filename, String contains) throws IOException diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ConditionTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ConditionTest.java index 1f90d6752..c6704fd2b 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/ConditionTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/ConditionTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -53,179 +53,179 @@ public class ConditionTest extends BuildFileTest { } public void testBasic() { - expectPropertySet("basic","basic"); + expectPropertySet("basic","basic"); } public void testConditionIncomplete() { - expectSpecificBuildException("condition-incomplete", + expectSpecificBuildException("condition-incomplete", "property attribute has been omitted", - "The property attribute is required."); + "The property attribute is required."); } - + public void testConditionEmpty() { - expectSpecificBuildException("condition-empty", + expectSpecificBuildException("condition-empty", "no conditions", - "You must nest a condition into <condition>"); - } + "You must nest a condition into <condition>"); + } public void testShortcut() { - expectPropertySet("shortcut","shortcut","set"); + expectPropertySet("shortcut","shortcut","set"); } - + public void testUnset() { - expectPropertyUnset("dontset","dontset"); + expectPropertyUnset("dontset","dontset"); } - + public void testSetValue() { - expectPropertySet("setvalue","setvalue","woowoo"); + expectPropertySet("setvalue","setvalue","woowoo"); } - + public void testNegation() { - expectPropertySet("negation","negation"); + expectPropertySet("negation","negation"); } - + public void testNegationFalse() { - expectPropertyUnset("negationfalse","negationfalse"); + expectPropertyUnset("negationfalse","negationfalse"); } - + public void testNegationIncomplete() { - expectSpecificBuildException("negationincomplete", + expectSpecificBuildException("negationincomplete", "no conditions in <not>", - "You must nest a condition into <not>"); + "You must nest a condition into <not>"); } - + public void testAnd() { - expectPropertySet("and","and"); - } - + expectPropertySet("and","and"); + } + public void testAndFails() { - expectPropertyUnset("andfails","andfails"); - } - + expectPropertyUnset("andfails","andfails"); + } + public void testAndIncomplete() { - expectPropertyUnset("andincomplete","andincomplete"); - } + expectPropertyUnset("andincomplete","andincomplete"); + } public void testAndempty() { - expectPropertySet("andempty","andempty"); - } - + expectPropertySet("andempty","andempty"); + } + public void testOr() { - expectPropertySet("or","or"); + expectPropertySet("or","or"); } public void testOrincomplete() { - expectPropertySet("or","or"); - } - + expectPropertySet("or","or"); + } + public void testOrFails() { - expectPropertyUnset("orfails","orfails"); - } - + expectPropertyUnset("orfails","orfails"); + } + public void testOrboth() { - expectPropertySet("orboth","orboth"); - } + expectPropertySet("orboth","orboth"); + } public void testFilesmatchIdentical() { - expectPropertySet("filesmatch-identical","filesmatch-identical"); - } - - + expectPropertySet("filesmatch-identical","filesmatch-identical"); + } + + public void testFilesmatchIncomplete() { - expectSpecificBuildException("filesmatch-incomplete", + expectSpecificBuildException("filesmatch-incomplete", "Missing file2 attribute", - "both file1 and file2 are required in filesmatch"); + "both file1 and file2 are required in filesmatch"); } - + public void testFilesmatchOddsizes() { - expectPropertyUnset("filesmatch-oddsizes","filesmatch-oddsizes"); - } - + expectPropertyUnset("filesmatch-oddsizes","filesmatch-oddsizes"); + } + public void testFilesmatchExistence() { - expectPropertyUnset("filesmatch-existence", "filesmatch-existence"); - } + expectPropertyUnset("filesmatch-existence", "filesmatch-existence"); + } public void testFilesmatchDifferent() { - expectPropertyUnset("filesmatch-different","filesmatch-different"); - } - + expectPropertyUnset("filesmatch-different","filesmatch-different"); + } + public void testFilesmatchMatch() { - expectPropertySet("filesmatch-match","filesmatch-match"); - } - + expectPropertySet("filesmatch-match","filesmatch-match"); + } + public void testFilesmatchDifferentSizes() { expectPropertyUnset("filesmatch-different-sizes", - "filesmatch-different-sizes"); - } + "filesmatch-different-sizes"); + } public void testFilesmatchDifferentOnemissing() { expectPropertyUnset("filesmatch-different-onemissing", - "filesmatch-different-onemissing"); - } - + "filesmatch-different-onemissing"); + } + public void testContains() { - expectPropertySet("contains","contains"); - } - - + expectPropertySet("contains","contains"); + } + + public void testContainsDoesnt() { - expectPropertyUnset("contains-doesnt","contains-doesnt"); - } + expectPropertyUnset("contains-doesnt","contains-doesnt"); + } public void testContainsAnycase() { - expectPropertySet("contains-anycase","contains-anycase"); - } + expectPropertySet("contains-anycase","contains-anycase"); + } + - public void testContainsIncomplete1() { - expectSpecificBuildException("contains-incomplete1", + expectSpecificBuildException("contains-incomplete1", "Missing contains attribute", - "both string and substring are required in contains"); - } - + "both string and substring are required in contains"); + } + public void testContainsIncomplete2() { - expectSpecificBuildException("contains-incomplete2", + expectSpecificBuildException("contains-incomplete2", "Missing contains attribute", - "both string and substring are required in contains"); - } - + "both string and substring are required in contains"); + } + public void testIstrue() { - expectPropertySet("istrue","istrue"); - } + expectPropertySet("istrue","istrue"); + } public void testIstrueNot() { - expectPropertyUnset("istrue-not","istrue-not"); - } - + expectPropertyUnset("istrue-not","istrue-not"); + } + public void testIstrueFalse() { - expectPropertyUnset("istrue-false","istrue-false"); - } + expectPropertyUnset("istrue-false","istrue-false"); + } + - public void testIstrueIncomplete1() { - expectSpecificBuildException("istrue-incomplete", + expectSpecificBuildException("istrue-incomplete", "Missing attribute", - "Nothing to test for truth"); - } + "Nothing to test for truth"); + } public void testIsfalseTrue() { - expectPropertyUnset("isfalse-true","isfalse-true"); - } + expectPropertyUnset("isfalse-true","isfalse-true"); + } public void testIsfalseNot() { - expectPropertySet("isfalse-not","isfalse-not"); - } - + expectPropertySet("isfalse-not","isfalse-not"); + } + public void testIsfalseFalse() { - expectPropertySet("isfalse-false","isfalse-false"); - } + expectPropertySet("isfalse-false","isfalse-false"); + } + - public void testIsfalseIncomplete1() { - expectSpecificBuildException("isfalse-incomplete", + expectSpecificBuildException("isfalse-incomplete", "Missing attribute", - "Nothing to test for falsehood"); - } - + "Nothing to test for falsehood"); + } + } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java b/src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java index 1e2d5bf38..76172088b 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -98,7 +98,7 @@ public class CopyTest extends BuildFileTest { executeTarget("infinitetest"); assertTrue(getOutput().indexOf("loop in tokens") != -1); } - + public void testFilterSet() throws IOException { executeTarget("testFilterSet"); FileUtils fileUtils = FileUtils.newFileUtils(); @@ -133,8 +133,8 @@ public class CopyTest extends BuildFileTest { } public void testMissingFileIgnore() { - expectLogContaining("testMissingFileIgnore", - "Warning: Could not find file "); + expectLogContaining("testMissingFileIgnore", + "Warning: Could not find file "); } public void testMissingFileBail() { @@ -144,7 +144,7 @@ public class CopyTest extends BuildFileTest { } public void testMissingDirIgnore() { - expectLogContaining("testMissingDirIgnore", "Warning: "); + expectLogContaining("testMissingDirIgnore", "Warning: "); } public void testMissingDirBail() { diff --git a/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java b/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java index eab7be200..01d614960 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -21,49 +21,49 @@ import java.io.File; import org.apache.tools.ant.BuildFileTest; /** - * @author Nico Seessle <nico@seessle.de> + * @author Nico Seessle <nico@seessle.de> */ -public class CopydirTest extends BuildFileTest { - - public CopydirTest(String name) { +public class CopydirTest extends BuildFileTest { + + public CopydirTest(String name) { super(name); - } - - public void setUp() { + } + + public void setUp() { configureProject("src/etc/testcases/taskdefs/copydir.xml"); } - + public void tearDown() { executeTarget("cleanup"); } - - public void test1() { + + public void test1() { expectBuildException("test1", "required argument not specified"); } - public void test2() { + public void test2() { expectBuildException("test2", "required argument not specified"); } - public void test3() { + public void test3() { expectBuildException("test3", "required argument not specified"); } - public void test4() { + public void test4() { expectLog("test4", "DEPRECATED - The copydir task is deprecated. Use copy instead.Warning: src == dest"); } - - public void test5() { + + public void test5() { executeTarget("test5"); java.io.File f = new java.io.File(getProjectDir(), "../taskdefs.tmp"); - if (!f.exists() || !f.isDirectory()) { + if (!f.exists() || !f.isDirectory()) { fail("Copy failed"); } // We keep this, so we have something to delete in later tests :-) } - public void test6() { + public void test6() { expectBuildException("test6", "target is file"); } - + } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java b/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java index bb13cf2cb..27ece669a 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -21,46 +21,46 @@ import java.io.File; import org.apache.tools.ant.BuildFileTest; /** - * @author Nico Seessle <nico@seessle.de> + * @author Nico Seessle <nico@seessle.de> */ -public class CopyfileTest extends BuildFileTest { - - public void test6() { +public class CopyfileTest extends BuildFileTest { + + public void test6() { expectBuildException("test6", "target is directory"); } - public CopyfileTest(String name) { + public CopyfileTest(String name) { super(name); - } - - public void setUp() { + } + + public void setUp() { configureProject("src/etc/testcases/taskdefs/copyfile.xml"); } - + public void tearDown() { executeTarget("cleanup"); } - - public void test1() { + + public void test1() { expectBuildException("test1", "required argument not specified"); } - public void test2() { + public void test2() { expectBuildException("test2", "required argument not specified"); } - public void test3() { + public void test3() { expectBuildException("test3", "required argument not specified"); } - public void test4() { + public void test4() { expectLog("test4", "DEPRECATED - The copyfile task is deprecated. Use copy instead.Warning: src == dest"); } - public void test5() { + public void test5() { executeTarget("test5"); java.io.File f = new java.io.File(getProjectDir(), "copyfile.tmp"); - if (f.exists()) { + if (f.exists()) { f.delete(); } else { fail("Copy failed"); diff --git a/src/testcases/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java b/src/testcases/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java index 66221cd2b..6df585b2d 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/DeleteTest.java b/src/testcases/org/apache/tools/ant/taskdefs/DeleteTest.java index 294d686f5..57cde3fe1 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/DeleteTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/DeleteTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -20,31 +20,31 @@ package org.apache.tools.ant.taskdefs; import org.apache.tools.ant.BuildFileTest; /** - * @author Nico Seessle <nico@seessle.de> + * @author Nico Seessle <nico@seessle.de> */ -public class DeleteTest extends BuildFileTest { - - public DeleteTest(String name) { +public class DeleteTest extends BuildFileTest { + + public DeleteTest(String name) { super(name); - } - - public void setUp() { + } + + public void setUp() { configureProject("src/etc/testcases/taskdefs/delete.xml"); } public void tearDown() { executeTarget("cleanup"); } - - public void test1() { + + public void test1() { expectBuildException("test1", "required argument not specified"); } - public void test2() { + public void test2() { executeTarget("test2"); } - public void test4() { + public void test4() { executeTarget("test4"); } } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/DeltreeTest.java b/src/testcases/org/apache/tools/ant/taskdefs/DeltreeTest.java index faea62ff0..a6b0d4fb1 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/DeltreeTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/DeltreeTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -20,23 +20,23 @@ package org.apache.tools.ant.taskdefs; import org.apache.tools.ant.BuildFileTest; /** - * @author Nico Seessle <nico@seessle.de> + * @author Nico Seessle <nico@seessle.de> */ -public class DeltreeTest extends BuildFileTest { - - public DeltreeTest(String name) { +public class DeltreeTest extends BuildFileTest { + + public DeltreeTest(String name) { super(name); - } - - public void setUp() { + } + + public void setUp() { configureProject("src/etc/testcases/taskdefs/deltree.xml"); } - public void test1() { + public void test1() { expectBuildException("test1", "required argument not specified"); } - public void test2() { + public void test2() { // We try to delete the directory created in CopydirTest executeTarget("test2"); } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/DemuxOutputTask.java b/src/testcases/org/apache/tools/ant/taskdefs/DemuxOutputTask.java index e83f5b0d0..f7d997395 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/DemuxOutputTask.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/DemuxOutputTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/DependSetTest.java b/src/testcases/org/apache/tools/ant/taskdefs/DependSetTest.java index 0dc44ed14..245b3e7ce 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/DependSetTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/DependSetTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -24,17 +24,17 @@ import org.apache.tools.ant.BuildFileTest; * * @author <a href="mailto:cstrong@arielpartners.com">Craeg Strong</a> */ -public class DependSetTest extends BuildFileTest { - - public DependSetTest(String name) { +public class DependSetTest extends BuildFileTest { + + public DependSetTest(String name) { super(name); } - public void setUp() { + public void setUp() { configureProject("src/etc/testcases/taskdefs/dependset.xml"); } - public void test1() { + public void test1() { expectBuildException("test1","At least one <srcfileset> or <srcfilelist> element must be set"); } @@ -42,19 +42,19 @@ public class DependSetTest extends BuildFileTest { executeTarget("cleanup"); } - public void test2() { + public void test2() { expectBuildException("test2","At least one <targetfileset> or <targetfilelist> element must be set"); } - public void test3() { + public void test3() { expectBuildException("test1","At least one <srcfileset> or <srcfilelist> element must be set"); } - public void test4() { + public void test4() { executeTarget("test4"); } - public void test5() { + public void test5() { executeTarget("test5"); java.io.File f = new java.io.File(getProjectDir(), "older.tmp"); if (f.exists()) { diff --git a/src/testcases/org/apache/tools/ant/taskdefs/DirnameTest.java b/src/testcases/org/apache/tools/ant/taskdefs/DirnameTest.java index df9d58949..e13125e7e 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/DirnameTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/DirnameTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -21,47 +21,47 @@ import java.io.File; import org.apache.tools.ant.BuildFileTest; /** - * @author Diane Holt <holtdl@apache.org> + * @author Diane Holt <holtdl@apache.org> */ -public class DirnameTest extends BuildFileTest { - - public DirnameTest(String name) { +public class DirnameTest extends BuildFileTest { + + public DirnameTest(String name) { super(name); - } - - public void setUp() { + } + + public void setUp() { configureProject("src/etc/testcases/taskdefs/dirname.xml"); } - public void test1() { + public void test1() { expectBuildException("test1", "required attribute missing"); } - public void test2() { + public void test2() { expectBuildException("test2", "required attribute missing"); } - public void test3() { + public void test3() { expectBuildException("test3", "required attribute missing"); } - public void test4() { + public void test4() { executeTarget("test4"); String filesep = System.getProperty("file.separator"); String expected = filesep + "usr" + filesep + "local"; String checkprop = project.getProperty("local.dir"); - if (!checkprop.equals(expected)) { + if (!checkprop.equals(expected)) { fail("dirname failed"); } } - - public void test5() { + + public void test5() { executeTarget("test5"); String expected = project.getProperty("basedir"); String checkprop = project.getProperty("base.dir"); - if (!checkprop.equals(expected)) { + if (!checkprop.equals(expected)) { fail("dirname failed"); } } - + } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/DynamicTask.java b/src/testcases/org/apache/tools/ant/taskdefs/DynamicTask.java index 19b9a4421..292c23fba 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/DynamicTask.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/DynamicTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/DynamicTest.java b/src/testcases/org/apache/tools/ant/taskdefs/DynamicTest.java index 247b3dc75..879845bac 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/DynamicTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/DynamicTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,20 +12,20 @@ * 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.tools.ant.taskdefs; import org.apache.tools.ant.BuildFileTest; -public class DynamicTest extends BuildFileTest { - - public DynamicTest(String name) { +public class DynamicTest extends BuildFileTest { + + public DynamicTest(String name) { super(name); } - - public void setUp() { + + public void setUp() { configureProject("src/etc/testcases/taskdefs/dynamictask.xml"); } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/EchoTest.java b/src/testcases/org/apache/tools/ant/taskdefs/EchoTest.java index fdeca76ba..20d9610e7 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/EchoTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/EchoTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -20,29 +20,29 @@ package org.apache.tools.ant.taskdefs; import org.apache.tools.ant.BuildFileTest; /** - * @author Nico Seessle <nico@seessle.de> + * @author Nico Seessle <nico@seessle.de> */ -public class EchoTest extends BuildFileTest { - - public EchoTest(String name) { +public class EchoTest extends BuildFileTest { + + public EchoTest(String name) { super(name); - } - - public void setUp() { + } + + public void setUp() { configureProject("src/etc/testcases/taskdefs/echo.xml"); } - + // Output an empty String - public void test1() { + public void test1() { expectLog("test1", ""); } // Output 'OUTPUT OF ECHO' - public void test2() { + public void test2() { expectLog("test2", "OUTPUT OF ECHO"); } - - public void test3() { + + public void test3() { expectLog("test3", "\n"+ " This \n"+ " is\n"+ diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ExecTaskTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ExecTaskTest.java index b9d963f87..8450d019e 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/ExecTaskTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/ExecTaskTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ExecuteJavaTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ExecuteJavaTest.java index 96c4fc172..3d48a6ed2 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/ExecuteJavaTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/ExecuteJavaTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -39,7 +39,7 @@ public class ExecuteJavaTest extends TestCase { private final static int CLOCK_ERROR=200; private final static int TIME_OUT_TEST=TIME_OUT-CLOCK_ERROR; - + private ExecuteJava ej; private Project project; @@ -79,10 +79,10 @@ public class ExecuteJavaTest extends TestCase { assertTrue("process should have been killed", ej.killedProcess()); assertTrue("elapse time of "+elapsed - +" ms is less than timeout value of "+TIME_OUT_TEST+" ms", + +" ms is less than timeout value of "+TIME_OUT_TEST+" ms", elapsed >= TIME_OUT_TEST); assertTrue("elapse time of "+elapsed - +" ms is greater than run value of "+(TIME_OUT*2)+" ms", + +" ms is greater than run value of "+(TIME_OUT*2)+" ms", elapsed < TIME_OUT*2); } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java index 7c16a2ace..ad17bc79b 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -36,7 +36,7 @@ public class ExecuteWatchdogTest extends TestCase { private final static int CLOCK_ERROR=200; private final static int TIME_OUT_TEST=TIME_OUT-CLOCK_ERROR; - + private ExecuteWatchdog watchdog; public ExecuteWatchdogTest(String name) { @@ -87,7 +87,7 @@ public class ExecuteWatchdogTest extends TestCase { } return buf.toString(); } - + private int waitForEnd(Process p) throws Exception { int retcode = p.waitFor(); if (retcode != 0){ diff --git a/src/testcases/org/apache/tools/ant/taskdefs/FailTest.java b/src/testcases/org/apache/tools/ant/taskdefs/FailTest.java index a51a24a9a..dd510f7b0 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/FailTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/FailTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -21,37 +21,37 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.BuildFileTest; /** - * @author Nico Seessle <nico@seessle.de> - * @author Stefan Bodewig + * @author Nico Seessle <nico@seessle.de> + * @author Stefan Bodewig */ -public class FailTest extends BuildFileTest { - - public FailTest(String name) { +public class FailTest extends BuildFileTest { + + public FailTest(String name) { super(name); - } - - public void setUp() { + } + + public void setUp() { configureProject("src/etc/testcases/taskdefs/fail.xml"); } - public void test1() { + public void test1() { expectBuildExceptionContaining("test1", "it is required to fail :-)", "No message"); } - public void test2() { - expectSpecificBuildException("test2", + public void test2() { + expectSpecificBuildException("test2", "it is required to fail :-)", "test2"); } - - public void testText() { + + public void testText() { expectSpecificBuildException("testText", "it is required to fail :-)", "testText"); } - + public void testIf() { try { executeTarget("testIf"); @@ -63,7 +63,7 @@ public class FailTest extends BuildFileTest { } public void testUnless() { - expectBuildException("testUnless", + expectBuildException("testUnless", "testUnless must fail unless foo has been set"); project.setProperty("foo", ""); try { diff --git a/src/testcases/org/apache/tools/ant/taskdefs/FilterTest.java b/src/testcases/org/apache/tools/ant/taskdefs/FilterTest.java index 7bd5ebdc9..65711ba33 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/FilterTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/FilterTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -25,44 +25,44 @@ import java.io.IOException; import org.apache.tools.ant.BuildFileTest; /** - * @author Nico Seessle <nico@seessle.de> + * @author Nico Seessle <nico@seessle.de> */ -public class FilterTest extends BuildFileTest { - - public FilterTest(String name) { +public class FilterTest extends BuildFileTest { + + public FilterTest(String name) { super(name); - } - - public void setUp() { + } + + public void setUp() { configureProject("src/etc/testcases/taskdefs/filter.xml"); } public void tearDown() { executeTarget("cleanup"); } - - public void test1() { + + public void test1() { expectBuildException("test1", "required argument missing"); } - public void test2() { + public void test2() { expectBuildException("test2", "required argument missing"); } - public void test3() { + public void test3() { expectBuildException("test3", "required argument missing"); } - - public void test4() { + + public void test4() { executeTarget("test4"); } - + public void test5() { executeTarget("test5"); assertEquals("2000", getFilteredFile("5", "filtered.tmp")); } - + public void test6() { executeTarget("test6"); @@ -81,15 +81,15 @@ public class FilterTest extends BuildFileTest { assertEquals("<%@ include file=\"root/some/include.jsp\"%>", getFilteredFile("8", "taskdefs.tmp/filter2.txt")); } - + public void test9() { executeTarget("test9"); assertEquals("included", getFilteredFile("9", "taskdefs.tmp/filter3.txt")); } - + private String getFilteredFile(String testNumber, String filteredFile) { - + String line = null; File f = new File(getProjectDir(), filteredFile); if (!f.exists()) { diff --git a/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java b/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java index 14eb6cbb3..7c30ded9d 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -34,69 +34,69 @@ public class FixCrLfTest extends BuildFileTest { super(name); } - public void setUp() { + public void setUp() { configureProject("src/etc/testcases/taskdefs/fixcrlf/build.xml"); } - - public void tearDown() { + + public void tearDown() { executeTarget("cleanup"); } - - public void test1() throws IOException { + + public void test1() throws IOException { executeTarget("test1"); assertEqualContent(new File("src/etc/testcases/taskdefs/fixcrlf/expected/Junk1.java"), new File("src/etc/testcases/taskdefs/fixcrlf/result/Junk1.java")); } - - public void test2() throws IOException { + + public void test2() throws IOException { executeTarget("test2"); assertEqualContent(new File("src/etc/testcases/taskdefs/fixcrlf/expected/Junk2.java"), new File("src/etc/testcases/taskdefs/fixcrlf/result/Junk2.java")); } - - public void test3() throws IOException { + + public void test3() throws IOException { executeTarget("test3"); assertEqualContent(new File("src/etc/testcases/taskdefs/fixcrlf/expected/Junk3.java"), new File("src/etc/testcases/taskdefs/fixcrlf/result/Junk3.java")); } - - public void test4() throws IOException { + + public void test4() throws IOException { executeTarget("test4"); assertEqualContent(new File("src/etc/testcases/taskdefs/fixcrlf/expected/Junk4.java"), new File("src/etc/testcases/taskdefs/fixcrlf/result/Junk4.java")); } - - public void test5() throws IOException { + + public void test5() throws IOException { executeTarget("test5"); assertEqualContent(new File("src/etc/testcases/taskdefs/fixcrlf/expected/Junk5.java"), new File("src/etc/testcases/taskdefs/fixcrlf/result/Junk5.java")); } - - public void test6() throws IOException { + + public void test6() throws IOException { executeTarget("test6"); assertEqualContent(new File("src/etc/testcases/taskdefs/fixcrlf/expected/Junk6.java"), new File("src/etc/testcases/taskdefs/fixcrlf/result/Junk6.java")); } - - public void test7() throws IOException { + + public void test7() throws IOException { executeTarget("test7"); assertEqualContent(new File("src/etc/testcases/taskdefs/fixcrlf/expected/Junk7.java"), new File("src/etc/testcases/taskdefs/fixcrlf/result/Junk7.java")); } - - public void test8() throws IOException { + + public void test8() throws IOException { executeTarget("test8"); assertEqualContent(new File("src/etc/testcases/taskdefs/fixcrlf/expected/Junk8.java"), new File("src/etc/testcases/taskdefs/fixcrlf/result/Junk8.java")); } - - public void test9() throws IOException { + + public void test9() throws IOException { executeTarget("test9"); assertEqualContent(new File("src/etc/testcases/taskdefs/fixcrlf/expected/Junk9.java"), new File("src/etc/testcases/taskdefs/fixcrlf/result/Junk9.java")); } - - public void testMacLines() throws IOException { + + public void testMacLines() throws IOException { executeTarget("testMacLines"); assertEqualContent(new File("src/etc/testcases/taskdefs/fixcrlf/expected/Mac2Unix"), new File("src/etc/testcases/taskdefs/fixcrlf/result/Mac2Unix")); @@ -104,7 +104,7 @@ public class FixCrLfTest extends BuildFileTest { public void testNoOverwrite() throws IOException { executeTarget("test1"); - File result = + File result = new File("src/etc/testcases/taskdefs/fixcrlf/result/Junk1.java"); long modTime = result.lastModified(); @@ -119,19 +119,19 @@ public class FixCrLfTest extends BuildFileTest { fail(ie.getMessage()); } // end of try-catch - /* + /* * make sure we get a new Project instance or the target won't get run * a second time. */ configureProject("src/etc/testcases/taskdefs/fixcrlf/build.xml"); executeTarget("test1"); - result = + result = new File("src/etc/testcases/taskdefs/fixcrlf/result/Junk1.java"); assertEquals(modTime, result.lastModified()); } - public void testEncoding() throws IOException { + public void testEncoding() throws IOException { if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1)) { // UTF16 is not supported in JDK 1.1 return; @@ -140,13 +140,13 @@ public class FixCrLfTest extends BuildFileTest { assertEqualContent(new File("src/etc/testcases/taskdefs/fixcrlf/expected/input.lf.utf16"), new File("src/etc/testcases/taskdefs/fixcrlf/result/input.crlf.utf16")); } - - public void testLongLines() throws IOException { + + public void testLongLines() throws IOException { executeTarget("testLongLines"); assertEqualContent(new File("src/etc/testcases/taskdefs/fixcrlf/expected/longlines.lf"), new File("src/etc/testcases/taskdefs/fixcrlf/result/longlines.crlf")); } - + public void testCrCrLfSequenceUnix() throws IOException { executeTarget("testCrCrLfSequence-unix"); assertEqualContent(new File("src/etc/testcases/taskdefs/fixcrlf/expected/crcrlf.unix"), @@ -183,11 +183,11 @@ public class FixCrLfTest extends BuildFileTest { * Will fail with an exception if the parent directories do not * get created. */ - public void testCreateParentDirs() { + public void testCreateParentDirs() { executeTarget("createParentDirs"); } - public void assertEqualContent(File expect, File result) + public void assertEqualContent(File expect, File result) throws AssertionFailedError, IOException { if (!result.exists()) { fail("Expected file "+result+" doesn\'t exist"); diff --git a/src/testcases/org/apache/tools/ant/taskdefs/GUnzipTest.java b/src/testcases/org/apache/tools/ant/taskdefs/GUnzipTest.java index 1f7c16fe9..daf95bc12 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/GUnzipTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/GUnzipTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,26 +12,26 @@ * 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.tools.ant.taskdefs; - + import java.io.File; import org.apache.tools.ant.BuildFileTest; import org.apache.tools.ant.util.FileUtils; /** - * @author Nico Seessle <nico@seessle.de> + * @author Nico Seessle <nico@seessle.de> * @author Stefan Bodewig * @version $Revision$ */ -public class GUnzipTest extends BuildFileTest { - - public GUnzipTest(String name) { +public class GUnzipTest extends BuildFileTest { + + public GUnzipTest(String name) { super(name); - } - - public void setUp() { + } + + public void setUp() { configureProject("src/etc/testcases/taskdefs/gunzip.xml"); } @@ -39,11 +39,11 @@ public class GUnzipTest extends BuildFileTest { executeTarget("cleanup"); } - public void test1() { + public void test1() { expectBuildException("test1", "required argument missing"); } - public void test2() { + public void test2() { expectBuildException("test2", "attribute src invalid"); } @@ -53,12 +53,12 @@ public class GUnzipTest extends BuildFileTest { assertTrue(fileUtils.contentEquals(project.resolveFile("../asf-logo.gif"), project.resolveFile("asf-logo.gif"))); } - + public void testTestGzipTask() throws java.io.IOException { FileUtils fileUtils = FileUtils.newFileUtils(); executeTarget("testGzipTask"); assertTrue(fileUtils.contentEquals(project.resolveFile("../asf-logo.gif"), project.resolveFile("asf-logo.gif"))); } - + } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/GetTest.java b/src/testcases/org/apache/tools/ant/taskdefs/GetTest.java index 201185818..94f7776d6 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/GetTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/GetTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -21,47 +21,47 @@ import java.io.File; import org.apache.tools.ant.BuildFileTest; /** - * @author Nico Seessle <nico@seessle.de> + * @author Nico Seessle <nico@seessle.de> */ -public class GetTest extends BuildFileTest { - - public GetTest(String name) { +public class GetTest extends BuildFileTest { + + public GetTest(String name) { super(name); - } - - public void setUp() { + } + + public void setUp() { configureProject("src/etc/testcases/taskdefs/get.xml"); } - public void test1() { + public void test1() { expectBuildException("test1", "required argument missing"); } - public void test2() { + public void test2() { expectBuildException("test2", "required argument missing"); } - public void test3() { + public void test3() { expectBuildException("test3", "required argument missing"); } - public void test4() { + public void test4() { expectBuildException("test4", "src invalid"); } - public void test5() { + public void test5() { expectBuildException("test5", "dest invalid (or no http-server on local machine)"); } - public void test6() { + public void test6() { executeTarget("test6"); java.io.File f = new File(getProjectDir(), "get.tmp"); - if (!f.exists()) { + if (!f.exists()) { fail("get failed"); } else { f.delete(); } - + } - + } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java b/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java index 93f63418e..3eb5c1193 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,40 +12,40 @@ * 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.tools.ant.taskdefs; import java.io.File; import org.apache.tools.ant.BuildFileTest; - + /** - * @author Nico Seessle <nico@seessle.de> + * @author Nico Seessle <nico@seessle.de> */ -public class GzipTest extends BuildFileTest { - - public GzipTest(String name) { +public class GzipTest extends BuildFileTest { + + public GzipTest(String name) { super(name); - } - - public void setUp() { + } + + public void setUp() { configureProject("src/etc/testcases/taskdefs/gzip.xml"); } - public void test1() { + public void test1() { expectBuildException("test1", "required argument missing"); } - public void test2() { + public void test2() { expectBuildException("test2", "required argument missing"); } - public void test3() { + public void test3() { expectBuildException("test3", "required argument missing"); } - public void test4() { + public void test4() { expectBuildException("test4", "zipfile must not point to a directory"); } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ImportTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ImportTest.java index 6e621ae4c..7810bbf54 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/ImportTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/ImportTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -69,7 +69,7 @@ public class ImportTest extends BuildFileTest { expectPropertySet("do-import", "foo", "bar"); assertNotNull(getProject().getReference("baz")); } - + public void testImportInTargetNotAllowed() { configureProject( "src/etc/testcases/taskdefs/import/subdir/importintarget.xml"); diff --git a/src/testcases/org/apache/tools/ant/taskdefs/InitializeClassTest.java b/src/testcases/org/apache/tools/ant/taskdefs/InitializeClassTest.java index cea16202e..c109cce08 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/InitializeClassTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/InitializeClassTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/InputTest.java b/src/testcases/org/apache/tools/ant/taskdefs/InputTest.java index 9eba58490..a0eda4022 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/InputTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/InputTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java b/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java index a195abf07..07df49002 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -61,7 +61,7 @@ public class JarTest extends BuildFileTest { } catch (IOException e) { } } - + executeTarget("cleanup"); } @@ -140,7 +140,7 @@ public class JarTest extends BuildFileTest { jarModifiedDate < jarFile.lastModified()); } - public void testManifestStaysIntact() + public void testManifestStaysIntact() throws IOException, ManifestException { executeTarget("testManifestStaysIntact"); @@ -236,7 +236,7 @@ public class JarTest extends BuildFileTest { boolean foundSub = false; boolean foundSubFoo = false; boolean foundFoo = false; - + String line = r.readLine(); while (line != null) { if (line.equals("foo")) { diff --git a/src/testcases/org/apache/tools/ant/taskdefs/JavaTest.java b/src/testcases/org/apache/tools/ant/taskdefs/JavaTest.java index d25debede..c0168e487 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/JavaTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/JavaTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/JavacTest.java b/src/testcases/org/apache/tools/ant/taskdefs/JavacTest.java index 16b28f477..574966abe 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/JavacTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/JavacTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -61,17 +61,17 @@ public class JavacTest extends TestCase { javac.setFork(true); assertNotNull("normal fork", javac.getJavacExecutable()); - assertTrue("name should contain \"javac\"", + assertTrue("name should contain \"javac\"", javac.getJavacExecutable().indexOf("javac") > -1); project.setProperty("build.compiler", "extJavac"); javac.setFork(false); assertNotNull("fork via property", javac.getJavacExecutable()); - assertTrue("name should contain \"javac\"", + assertTrue("name should contain \"javac\"", javac.getJavacExecutable().indexOf("javac") > -1); project.setProperty("build.compiler", "whatever"); - assertNull("no fork and not extJavac means no executable", + assertNull("no fork and not extJavac means no executable", javac.getJavacExecutable()); String myJavac = "Slartibartfast"; @@ -100,13 +100,13 @@ public class JavacTest extends TestCase { arg.setCompiler("jikes"); args = javac.getCurrentCompilerArgs(); assertNotNull(args); - assertEquals("implementation is jikes but build.compiler is null", + assertEquals("implementation is jikes but build.compiler is null", 0, args.length); project.setProperty("build.compiler", "jvc"); args = javac.getCurrentCompilerArgs(); assertNotNull(args); - assertEquals("implementation is jikes but build.compiler is jvc", + assertEquals("implementation is jikes but build.compiler is jvc", 0, args.length); project.setProperty("build.compiler", "jikes"); @@ -145,11 +145,11 @@ public class JavacTest extends TestCase { // check defaults String compiler = javac.getCompiler(); assertNotNull(compiler); - assertTrue("default value", - "javac1.1".equals(compiler) - || "javac1.2".equals(compiler) - || "javac1.3".equals(compiler) - || "javac1.4".equals(compiler) + assertTrue("default value", + "javac1.1".equals(compiler) + || "javac1.2".equals(compiler) + || "javac1.3".equals(compiler) + || "javac1.4".equals(compiler) || "classic".equals(compiler)); javac.setFork(true); @@ -184,8 +184,8 @@ public class JavacTest extends TestCase { } public void testCompilerAdapter() { - if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1) - || JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_2) + if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1) + || JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_2) || JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_3)) { javac.setCompiler("javac1.1"); } else { @@ -193,11 +193,11 @@ public class JavacTest extends TestCase { } javac.setDepend(true); - CompilerAdapter adapter = + CompilerAdapter adapter = CompilerAdapterFactory.getCompiler(javac.getCompiler(), javac); - if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1) - || JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_2) + if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1) + || JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_2) || JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_3)) { assertTrue(adapter instanceof Javac12); } else { @@ -205,7 +205,7 @@ public class JavacTest extends TestCase { } javac.setFork(true); - adapter = + adapter = CompilerAdapterFactory.getCompiler(javac.getCompiler(), javac); assertTrue(adapter instanceof JavacExternal); } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/LoadFileTest.java b/src/testcases/org/apache/tools/ant/taskdefs/LoadFileTest.java index 4df8431f2..e89c5e2eb 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/LoadFileTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/LoadFileTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/LoadPropertiesTest.java b/src/testcases/org/apache/tools/ant/taskdefs/LoadPropertiesTest.java index f58cee9f8..9a5e03e62 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/LoadPropertiesTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/LoadPropertiesTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/MacroDefTest.java b/src/testcases/org/apache/tools/ant/taskdefs/MacroDefTest.java index 72d79c80b..6adcc580d 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/MacroDefTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/MacroDefTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -46,13 +46,13 @@ public class MacroDefTest extends BuildFileTest { "duplicate.attribute", "the attribute text has already been specified"); } - + public void testDuplicateElement() { expectBuildException( "duplicate.element", "the element text has already been specified"); } - + public void testUri() { expectLog("uri", "Hello World"); } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ManifestTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ManifestTest.java index 9256d3d09..318267dd3 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/ManifestTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/ManifestTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -27,8 +27,8 @@ import org.apache.tools.ant.BuildFileTest; import org.apache.tools.ant.Project; /** - * Testcase for the Manifest class used in the jar task. - * + * Testcase for the Manifest class used in the jar task. + * * @author Conor MacNeill */ public class ManifestTest extends BuildFileTest { @@ -37,11 +37,11 @@ public class ManifestTest extends BuildFileTest { = "src/etc/testcases/taskdefs/manifests/META-INF/MANIFEST.MF"; public static final String LONG_LINE - = "AReallyLongLineToTestLineBreakingInManifests-ACapabilityWhich" + + = "AReallyLongLineToTestLineBreakingInManifests-ACapabilityWhich" + "IsSureToLeadToHundredsOfQuestionsAboutWhyAntMungesManifests" + "OfCourseTheAnswerIsThatIsWhatTheSpecRequiresAndIfAnythingHas" + "AProblemWithThatItIsNotABugInAnt"; - + public ManifestTest(String name) { super(name); } @@ -55,7 +55,7 @@ public class ManifestTest extends BuildFileTest { } /** - * Empty manifest - is OK + * Empty manifest - is OK */ public void test1() throws ManifestException, IOException { executeTarget("test1"); @@ -63,7 +63,7 @@ public class ManifestTest extends BuildFileTest { String version = manifest.getManifestVersion(); assertEquals("Manifest was not created with correct version - ", "1.0", version); } - + /** * Simple Manifest with version 2.0 */ @@ -73,7 +73,7 @@ public class ManifestTest extends BuildFileTest { String version = manifest.getManifestVersion(); assertEquals("Manifest was not created with correct version - ", "2.0", version); } - + /** * Malformed manifest - no : on the line */ @@ -99,7 +99,7 @@ public class ManifestTest extends BuildFileTest { boolean hasWarning = output.indexOf("Manifest warning: \"Name\" attributes should not occur in the main section") != -1; assertEquals("Expected warning about Name in main section", true, hasWarning); } - + /** * New Section not starting with Name attribute. */ @@ -110,7 +110,7 @@ public class ManifestTest extends BuildFileTest { boolean hasWarning = output.indexOf("Manifest sections should start with a \"Name\" attribute") != -1; assertEquals("Expected warning about section not starting with Name: attribute", true, hasWarning); } - + /** * From attribute is illegal */ @@ -130,12 +130,12 @@ public class ManifestTest extends BuildFileTest { Manifest.Section mainSection = manifest.getMainSection(); String classpath = mainSection.getAttributeValue("class-path"); assertEquals("Class-Path attribute was not set correctly - ", "fubar", classpath); - + Manifest.Section testSection = manifest.getSection("Test"); String testAttr = testSection.getAttributeValue("TestAttr"); assertEquals("TestAttr attribute was not set correctly - ", "Test", testAttr); } - + /** * Inline manifest - Invalid since has a Name attribute in the section element */ @@ -143,7 +143,7 @@ public class ManifestTest extends BuildFileTest { expectBuildExceptionContaining("test9", "Construction is invalid - Name attribute should not be used", "Specify the section name using the \"name\" attribute of the <section> element"); } - + /** * Inline manifest - Invalid attribute without name */ @@ -151,7 +151,7 @@ public class ManifestTest extends BuildFileTest { expectBuildExceptionContaining("test10", "Attribute has no name", "Attributes must have name and value"); } - + /** * Inline manifest - Invalid attribute without value */ @@ -159,7 +159,7 @@ public class ManifestTest extends BuildFileTest { expectBuildExceptionContaining("test11", "Attribute has no value", "Attributes must have name and value"); } - + /** * Inline manifest - Invalid attribute without value */ @@ -167,7 +167,7 @@ public class ManifestTest extends BuildFileTest { expectBuildExceptionContaining("test12", "Section with no name", "Sections must have a name"); } - + /** * Inline manifest - Duplicate attribute */ @@ -175,7 +175,7 @@ public class ManifestTest extends BuildFileTest { expectBuildExceptionContaining("test13", "Duplicate Attribute", "The attribute \"Test\" may not occur more than once in the same section"); } - + /** * Inline manifest - OK since classpath entries can be duplicated. */ @@ -184,10 +184,10 @@ public class ManifestTest extends BuildFileTest { Manifest manifest = getManifest(EXPANDED_MANIFEST); Manifest.Section mainSection = manifest.getMainSection(); String classpath = mainSection.getAttributeValue("class-path"); - assertEquals("Class-Path attribute was not set correctly - ", + assertEquals("Class-Path attribute was not set correctly - ", "Test1 Test2 Test3 Test4", classpath); } - + /** * Tets long line wrapping */ @@ -199,10 +199,10 @@ public class ManifestTest extends BuildFileTest { Manifest manifest = getManifest(EXPANDED_MANIFEST); Manifest.Section mainSection = manifest.getMainSection(); String classpath = mainSection.getAttributeValue("class-path"); - assertEquals("Class-Path attribute was not set correctly - ", + assertEquals("Class-Path attribute was not set correctly - ", LONG_LINE, classpath); } - + /** * Tests ordering of sections */ @@ -215,7 +215,7 @@ public class ManifestTest extends BuildFileTest { String section2 = (String)e.nextElement(); assertEquals("First section name unexpected", "Test1", section1); assertEquals("Second section name unexpected", "Test2", section2); - + Manifest.Section section = manifest.getSection("Test1"); e = section.getAttributeKeys(); String attr1Key = (String)e.nextElement(); @@ -225,7 +225,7 @@ public class ManifestTest extends BuildFileTest { assertEquals("First attribute name unexpected", "TestAttr1", attr1); assertEquals("Second attribute name unexpected", "TestAttr2", attr2); } - + /** * Tests ordering of sections */ @@ -248,14 +248,14 @@ public class ManifestTest extends BuildFileTest { assertEquals("First attribute name unexpected", "TestAttr2", attr1); assertEquals("Second attribute name unexpected", "TestAttr1", attr2); } - + /** * file attribute for manifest task is required. */ public void testNoFile() { expectBuildException("testNoFile", "file is required"); } - + /** * replace changes Manifest-Version from 2.0 to 1.0 */ diff --git a/src/testcases/org/apache/tools/ant/taskdefs/MkdirTest.java b/src/testcases/org/apache/tools/ant/taskdefs/MkdirTest.java index 0ae879896..7adb5e3d1 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/MkdirTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/MkdirTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,26 +12,26 @@ * 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.tools.ant.taskdefs; import org.apache.tools.ant.BuildFileTest; /** - * @author Nico Seessle <nico@seessle.de> + * @author Nico Seessle <nico@seessle.de> */ -public class MkdirTest extends BuildFileTest { - - public MkdirTest(String name) { +public class MkdirTest extends BuildFileTest { + + public MkdirTest(String name) { super(name); } - public void setUp() { + public void setUp() { configureProject("src/etc/testcases/taskdefs/mkdir.xml"); } - public void test1() { + public void test1() { expectBuildException("test1", "required argument missing"); } @@ -39,10 +39,10 @@ public class MkdirTest extends BuildFileTest { expectBuildException("test2", "directory already exists as a file"); } - public void test3() { + public void test3() { executeTarget("test3"); java.io.File f = new java.io.File(getProjectDir(), "testdir.tmp"); - if (!f.exists() || !f.isDirectory()) { + if (!f.exists() || !f.isDirectory()) { fail("mkdir failed"); } else { f.delete(); diff --git a/src/testcases/org/apache/tools/ant/taskdefs/MoveTest.java b/src/testcases/org/apache/tools/ant/taskdefs/MoveTest.java index 1e641dc6c..5aff2e39a 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/MoveTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/MoveTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/MultiMapTest.java b/src/testcases/org/apache/tools/ant/taskdefs/MultiMapTest.java index dcdf4e464..02853be3a 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/MultiMapTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/MultiMapTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -27,36 +27,36 @@ import org.apache.tools.ant.util.FileNameMapper; /** * @author Peter Reilly */ -public class MultiMapTest extends BuildFileTest { - - public MultiMapTest(String name) { +public class MultiMapTest extends BuildFileTest { + + public MultiMapTest(String name) { super(name); - } - - public void setUp() { + } + + public void setUp() { configureProject("src/etc/testcases/taskdefs/multimap.xml"); } public void tearDown() { executeTarget("cleanup"); } - + public void testMultiCopy() { executeTarget("multicopy"); } - + public void testMultiMove() { executeTarget("multimove"); } - + public void testSingleCopy() { executeTarget("singlecopy"); } - + public void testSingleMove() { executeTarget("singlemove"); } - + public void testCopyWithEmpty() { executeTarget("copywithempty"); } @@ -64,7 +64,7 @@ public class MultiMapTest extends BuildFileTest { public void testMoveWithEmpty() { executeTarget("movewithempty"); } - + public static class TestMapper implements FileNameMapper { public TestMapper() {} public void setFrom(String from) {} diff --git a/src/testcases/org/apache/tools/ant/taskdefs/NiceTest.java b/src/testcases/org/apache/tools/ant/taskdefs/NiceTest.java index b60e7e32d..672b22a31 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/NiceTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/NiceTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ParallelTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ParallelTest.java index 9b71407f8..28fe639a8 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/ParallelTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/ParallelTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; import java.io.PrintStream; @@ -82,10 +82,10 @@ public class ParallelTest extends BuildFileTest { pos = countThreads(log, pos); } } - + /** - * the test result string should match the regex - * <code>^(\|\d+\/(+-)*)+\|$</code> for someting like + * the test result string should match the regex + * <code>^(\|\d+\/(+-)*)+\|$</code> for someting like * <code>|3/++--+-|5/+++++-----|</code> * *@returns -1 no more tests @@ -99,30 +99,30 @@ public class ParallelTest extends BuildFileTest { if ((firstPipe == -1) || (beginSlash == -1) || (lastPipe == -1)) { return -1; } - + int max = Integer.parseInt(s.substring(firstPipe + 1, beginSlash)); int current = 0; int pos = beginSlash + 1; while (pos < lastPipe) { switch (s.charAt(pos++)) { - case '+': + case '+': current++; break; case '-': current--; break; default: - throw new AssertionFailedError("Only expect '+-' in result count, found " + throw new AssertionFailedError("Only expect '+-' in result count, found " + s.charAt(--pos) + " at position " + pos); } if (current > max) { - throw new AssertionFailedError("Number of executing threads exceeded number allowed: " + throw new AssertionFailedError("Number of executing threads exceeded number allowed: " + current + " > " + max); } } return lastPipe; } - + /** tests the failure of a task within a parallel construction */ public void testFail() { @@ -150,6 +150,6 @@ public class ParallelTest extends BuildFileTest { System.setErr(err); } } - + } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/PreSetDefTest.java b/src/testcases/org/apache/tools/ant/taskdefs/PreSetDefTest.java index 8ae618963..430f06a00 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/PreSetDefTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/PreSetDefTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -70,7 +70,7 @@ public class PreSetDefTest extends BuildFileTest { public void testAntTypeTest() { expectLog("antTypeTest", ""); } - + /** * A test class to check default properties */ diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ProcessDestroyerTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ProcessDestroyerTest.java index 961f3973a..e3fcba6a9 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/ProcessDestroyerTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/ProcessDestroyerTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* @@ -38,13 +38,13 @@ public class ProcessDestroyerTest extends TestCase { public ProcessDestroyerTest(String arg0) { super(arg0); } - + public void testProcessDestroyer(){ if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1) || JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_2)) { return; } - + try { ProcessDestroyer processDestroyer = new ProcessDestroyer(); Process process = @@ -53,12 +53,12 @@ public class ProcessDestroyerTest extends TestCase { + System.getProperty("java.class.path") + " " + getClass().getName()); - + assertFalse("Not registered as shutdown hook", processDestroyer.isAddedAsShutdownHook()); processDestroyer.add(process); - + assertTrue("Registered as shutdown hook", processDestroyer.isAddedAsShutdownHook()); try { @@ -66,14 +66,14 @@ public class ProcessDestroyerTest extends TestCase { } finally { processDestroyer.remove(process); } - + assertFalse("Not registered as shutdown hook", processDestroyer.isAddedAsShutdownHook()); } catch (IOException e) { e.printStackTrace(); } } - + public static void main(String[] args){ new ProcessDestroyerTest("testProcessDestroyer").testProcessDestroyer(); try{ diff --git a/src/testcases/org/apache/tools/ant/taskdefs/PropertyTest.java b/src/testcases/org/apache/tools/ant/taskdefs/PropertyTest.java index 794eecb95..9429bd3ac 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/PropertyTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/PropertyTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -97,7 +97,7 @@ public class PropertyTest extends BuildFileTest { executeTarget("testCircularReference"); } catch (BuildException e) { assertEquals("Circular definition not detected - ", true, - e.getMessage().indexOf("was circularly defined") + e.getMessage().indexOf("was circularly defined") != -1); return; } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/RenameTest.java b/src/testcases/org/apache/tools/ant/taskdefs/RenameTest.java index ea2b763cf..b7bdaf11e 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/RenameTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/RenameTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,32 +12,32 @@ * 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.tools.ant.taskdefs; import org.apache.tools.ant.BuildFileTest; /** - * @author Nico Seessle <nico@seessle.de> + * @author Nico Seessle <nico@seessle.de> */ -public class RenameTest extends BuildFileTest { - - public RenameTest(String name) { +public class RenameTest extends BuildFileTest { + + public RenameTest(String name) { super(name); - } - - public void setUp() { + } + + public void setUp() { configureProject("src/etc/testcases/taskdefs/rename.xml"); } - public void test1() { + public void test1() { expectBuildException("test1", "required argument missing"); } - public void test2() { + public void test2() { expectBuildException("test2", "required argument missing"); } - public void test3() { + public void test3() { expectBuildException("test3", "required argument missing"); } /* @@ -51,5 +51,5 @@ public class RenameTest extends BuildFileTest { public void test6() { executeTarget("test6"); } - + } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ReplaceTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ReplaceTest.java index 7500f52c0..dabb07ecb 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/ReplaceTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/ReplaceTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2001,2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -24,48 +24,48 @@ import java.io.*; import junit.framework.AssertionFailedError; /** - * @author Nico Seessle <nico@seessle.de> + * @author Nico Seessle <nico@seessle.de> */ public class ReplaceTest extends BuildFileTest { private static final String TEST_PATH = "src/etc/testcases/taskdefs/replace/"; public ReplaceTest(String name) { super(name); - } - - public void setUp() { + } + + public void setUp() { configureProject("src/etc/testcases/taskdefs/replace.xml"); } - - public void test1() { + + public void test1() { expectBuildException("test1", "required argument not specified"); } - public void test2() { + public void test2() { expectBuildException("test2", "required argument not specified"); } - public void test3() { + public void test3() { expectBuildException("test3", "required argument not specified"); } - public void test4() { + public void test4() { expectBuildException("test4", "empty token not allowed"); } - public void test5() { + public void test5() { executeTarget("test5"); } - public void test6() { + public void test6() { expectBuildException("test6", "required argument not specified"); } - public void test7() { + public void test7() { expectBuildException("test7", "empty token not allowed"); } - public void test8() { + public void test8() { executeTarget("test8"); } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/RmicTest.java b/src/testcases/org/apache/tools/ant/taskdefs/RmicTest.java index ed2ed2c4e..ccfc539cb 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/RmicTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/RmicTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -64,13 +64,13 @@ public class RmicTest extends TestCase { arg.setCompiler("weblogic"); args = rmic.getCurrentCompilerArgs(); assertNotNull(args); - assertEquals("implementation is weblogic but build.rmic is null", + assertEquals("implementation is weblogic but build.rmic is null", 0, args.length); project.setProperty("build.rmic", "sun"); args = rmic.getCurrentCompilerArgs(); assertNotNull(args); - assertEquals("implementation is weblogic but build.rmic is sun", + assertEquals("implementation is weblogic but build.rmic is sun", 0, args.length); project.setProperty("build.rmic", "weblogic"); @@ -86,7 +86,7 @@ public class RmicTest extends TestCase { // check defaults String compiler = rmic.getCompiler(); assertNotNull(compiler); - assertTrue("default value", + assertTrue("default value", "sun".equals(compiler) || "kaffe".equals(compiler)); project.setNewProperty("build.rmic", "weblogic"); diff --git a/src/testcases/org/apache/tools/ant/taskdefs/SQLExecTest.java b/src/testcases/org/apache/tools/ant/taskdefs/SQLExecTest.java index b403cea5f..20223aa73 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/SQLExecTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/SQLExecTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/SignJarTest.java b/src/testcases/org/apache/tools/ant/taskdefs/SignJarTest.java index c84b082ca..cec513ccd 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/SignJarTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/SignJarTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/SleepTest.java b/src/testcases/org/apache/tools/ant/taskdefs/SleepTest.java index 6881d27e1..b24bec468 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/SleepTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/SleepTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java b/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java index 5e7f1fc2e..395b15348 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -121,4 +121,4 @@ public class StyleTest extends BuildFileTest { " but got " + content, content.indexOf(contains) > -1); } -}
\ No newline at end of file +} diff --git a/src/testcases/org/apache/tools/ant/taskdefs/SubAntTest.java b/src/testcases/org/apache/tools/ant/taskdefs/SubAntTest.java index d7a9300aa..73a205523 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/SubAntTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/SubAntTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/TStampTest.java b/src/testcases/org/apache/tools/ant/taskdefs/TStampTest.java index 9cc3ea66d..108a6b6b4 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/TStampTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/TStampTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/TarTest.java b/src/testcases/org/apache/tools/ant/taskdefs/TarTest.java index 301e235e6..ed7e98e9b 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/TarTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/TarTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/TaskdefTest.java b/src/testcases/org/apache/tools/ant/taskdefs/TaskdefTest.java index 3222c4c64..a67727f80 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/TaskdefTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/TaskdefTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -21,39 +21,39 @@ import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildFileTest; /** - * @author Nico Seessle <nico@seessle.de> + * @author Nico Seessle <nico@seessle.de> */ -public class TaskdefTest extends BuildFileTest { - - public TaskdefTest(String name) { +public class TaskdefTest extends BuildFileTest { + + public TaskdefTest(String name) { super(name); - } - - public void setUp() { + } + + public void setUp() { configureProject("src/etc/testcases/taskdefs/taskdef.xml"); } - - public void test1() { + + public void test1() { expectBuildException("test1", "required argument not specified"); } - public void test2() { + public void test2() { expectBuildException("test2", "required argument not specified"); } - public void test3() { + public void test3() { expectBuildException("test3", "required argument not specified"); } - public void test4() { + public void test4() { expectBuildException("test4", "classname specified doesn't exist"); } - public void test5() { + public void test5() { expectBuildException("test5", "No public execute() in " + Project.class); } - public void test5a() { + public void test5a() { executeTarget("test5a"); } @@ -72,11 +72,11 @@ public class TaskdefTest extends BuildFileTest { public void testOverride() { executeTarget("testOverride"); String log = getLog(); - assertTrue("override warning sent", + assertTrue("override warning sent", log.indexOf("Trying to override old definition of task copy") > -1); - assertTrue("task inside target worked", + assertTrue("task inside target worked", log.indexOf("In target") > -1); - assertTrue("task inside target worked", + assertTrue("task inside target worked", log.indexOf("In TaskContainer") > -1); } } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java b/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java index 2572fee3c..b39cd9864 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -22,12 +22,12 @@ import java.io.*; import org.apache.tools.ant.BuildFileTest; /** - * @author Nico Seessle <nico@seessle.de> + * @author Nico Seessle <nico@seessle.de> * * @deprecated use BuildFileTest instead. */ -public abstract class TaskdefsTest extends BuildFileTest { - +public abstract class TaskdefsTest extends BuildFileTest { + public TaskdefsTest(String name) { super(name); } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/TestProcess.java b/src/testcases/org/apache/tools/ant/taskdefs/TestProcess.java index 7973fed52..9a544ac12 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/TestProcess.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/TestProcess.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -34,7 +34,7 @@ public class TestProcess { System.out.println("shutting down TestProcess"); run = false; - + synchronized(this) { while (!done) @@ -42,7 +42,7 @@ public class TestProcess try { wait(); } catch (InterruptedException ie) {} } } - + System.out.println("TestProcess shut down"); } } @@ -52,7 +52,7 @@ public class TestProcess for (int i = 0; i < 5 && run; i++) { System.out.println(Thread.currentThread().getName()); - + try { Thread.sleep(2000); } catch (InterruptedException ie) {} } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/TimeProcess.java b/src/testcases/org/apache/tools/ant/taskdefs/TimeProcess.java index 77b3365e4..2408d2d7c 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/TimeProcess.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/TimeProcess.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/TouchTest.java b/src/testcases/org/apache/tools/ant/taskdefs/TouchTest.java index e7270bb3e..d1907af9d 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/TouchTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/TouchTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -31,11 +31,11 @@ public class TouchTest extends BuildFileTest { super(name); } - public void setUp() { + public void setUp() { configureProject("src/etc/testcases/taskdefs/touch.xml"); } - - public void tearDown() { + + public void tearDown() { executeTarget("cleanup"); } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/TypeAdapterTest.java b/src/testcases/org/apache/tools/ant/taskdefs/TypeAdapterTest.java index d97c36f3a..5744e08e8 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/TypeAdapterTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/TypeAdapterTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -29,16 +29,16 @@ import org.apache.tools.ant.TypeAdapter; /** * @author Peter Reilly */ -public class TypeAdapterTest extends BuildFileTest { - - public TypeAdapterTest(String name) { +public class TypeAdapterTest extends BuildFileTest { + + public TypeAdapterTest(String name) { super(name); - } - - public void setUp() { + } + + public void setUp() { configureProject("src/etc/testcases/taskdefs/typeadapter.xml"); } - + public void testTaskAdapter() { expectLogContaining("taskadapter", "MyExec called"); } @@ -70,13 +70,13 @@ public class TypeAdapterTest extends BuildFileTest { log("MyTask called"); } } - + public static class MyExec { private Project project; public void setProject(Project project) { this.project = project; } - + public void execute() { project.log("MyExec called"); } @@ -87,7 +87,7 @@ public class TypeAdapterTest extends BuildFileTest { public void setProject(Project project) { this.project = project; } - + public void run() { project.log("MyRunnable called"); } @@ -98,16 +98,16 @@ public class TypeAdapterTest extends BuildFileTest { { private String execMethodName = "run"; private Object proxy; - + public Method getExecuteMethod(Class proxyClass) { try { Method execMethod = proxyClass.getMethod( execMethodName, null); if (!Void.TYPE.equals(execMethod.getReturnType())) { String message = - "return type of " + execMethodName + "() should be " + "return type of " + execMethodName + "() should be " + "void but was \"" + execMethod.getReturnType() + - "\" in " + "\" in " + proxyClass; log(message, Project.MSG_WARN); } @@ -123,7 +123,7 @@ public class TypeAdapterTest extends BuildFileTest { public void checkProxyClass(Class proxyClass) { getExecuteMethod(proxyClass); } - + public void setProxy(Object o) { getExecuteMethod(o.getClass()); this.proxy = o; @@ -132,7 +132,7 @@ public class TypeAdapterTest extends BuildFileTest { public Object getProxy() { return proxy; } - + public void execute() { getProject().setProjectReference(proxy); Method executeMethod = getExecuteMethod(proxy.getClass()); diff --git a/src/testcases/org/apache/tools/ant/taskdefs/TypedefTest.java b/src/testcases/org/apache/tools/ant/taskdefs/TypedefTest.java index 9468b86f3..3e97e118d 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/TypedefTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/TypedefTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -24,30 +24,30 @@ import org.apache.tools.ant.BuildFileTest; * @author Stefan Bodewig * @version $Revision$ */ -public class TypedefTest extends BuildFileTest { - - public TypedefTest(String name) { +public class TypedefTest extends BuildFileTest { + + public TypedefTest(String name) { super(name); - } - - public void setUp() { + } + + public void setUp() { configureProject("src/etc/testcases/taskdefs/typedef.xml"); } - - public void testEmpty() { + + public void testEmpty() { expectBuildException("empty", "required argument not specified"); } - public void testNoName() { + public void testNoName() { expectBuildException("noName", "required argument not specified"); } - public void testNoClassname() { + public void testNoClassname() { expectBuildException("noClassname", "required argument not specified"); } - public void testClassNotFound() { - expectBuildException("classNotFound", + public void testClassNotFound() { + expectBuildException("classNotFound", "classname specified doesn't exist"); } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/UntarTest.java b/src/testcases/org/apache/tools/ant/taskdefs/UntarTest.java index 7dc61596a..5e4123b64 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/UntarTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/UntarTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -84,7 +84,7 @@ public class UntarTest extends BuildFileTest { } public void testEncoding() { - expectSpecificBuildException("encoding", + expectSpecificBuildException("encoding", "<untar> overrides setEncoding.", "The untar task doesn't support the " + "encoding attribute"); diff --git a/src/testcases/org/apache/tools/ant/taskdefs/UnzipTest.java b/src/testcases/org/apache/tools/ant/taskdefs/UnzipTest.java index 6eb12edb4..488ebc4c4 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/UnzipTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/UnzipTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2001,2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -20,32 +20,32 @@ import org.apache.tools.ant.BuildFileTest; import org.apache.tools.ant.util.FileUtils; /** - * @author Nico Seessle <nico@seessle.de> + * @author Nico Seessle <nico@seessle.de> * @author Stefan Bodewig */ -public class UnzipTest extends BuildFileTest { - - public UnzipTest(String name) { +public class UnzipTest extends BuildFileTest { + + public UnzipTest(String name) { super(name); - } - - public void setUp() { + } + + public void setUp() { configureProject("src/etc/testcases/taskdefs/unzip.xml"); } - + public void tearDown() { executeTarget("cleanup"); } - public void test1() { + public void test1() { expectBuildException("test1", "required argument not specified"); } - public void test2() { + public void test2() { expectBuildException("test2", "required argument not specified"); } - public void test3() { + public void test3() { expectBuildException("test3", "required argument not specified"); } @@ -56,21 +56,21 @@ public class UnzipTest extends BuildFileTest { assertTrue(fileUtils.contentEquals(project.resolveFile("../asf-logo.gif"), project.resolveFile("asf-logo.gif"))); } - + public void testTestZipTask() throws java.io.IOException { FileUtils fileUtils = FileUtils.newFileUtils(); executeTarget("testZipTask"); assertTrue(fileUtils.contentEquals(project.resolveFile("../asf-logo.gif"), project.resolveFile("asf-logo.gif"))); } - + public void testTestUncompressedZipTask() throws java.io.IOException { FileUtils fileUtils = FileUtils.newFileUtils(); executeTarget("testUncompressedZipTask"); assertTrue(fileUtils.contentEquals(project.resolveFile("../asf-logo.gif"), project.resolveFile("asf-logo.gif"))); } - + /* * PR 11100 */ diff --git a/src/testcases/org/apache/tools/ant/taskdefs/WarTest.java b/src/testcases/org/apache/tools/ant/taskdefs/WarTest.java index 4bd84e90f..e43eb5a56 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/WarTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/WarTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -23,13 +23,13 @@ import org.apache.tools.ant.BuildFileTest; /** * Testcase for the war task - * + * * @author Conor MacNeill */ public class WarTest extends BuildFileTest { public static final String TEST_BUILD_FILE = "src/etc/testcases/taskdefs/war.xml"; - + public WarTest(String name) { super(name); } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/WhichResourceTest.java b/src/testcases/org/apache/tools/ant/taskdefs/WhichResourceTest.java index b7f47da22..7f5eaa36b 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/WhichResourceTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/WhichResourceTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -22,7 +22,7 @@ import org.apache.tools.ant.BuildFileTest; public class WhichResourceTest extends BuildFileTest { public static final String TEST_BUILD_FILE = "src/etc/testcases/taskdefs/whichresource.xml"; - + public WhichResourceTest(String name) { super(name); } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/XmlPropertyTest.java b/src/testcases/org/apache/tools/ant/taskdefs/XmlPropertyTest.java index dd018e0af..d666d77d0 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/XmlPropertyTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/XmlPropertyTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/XmlnsTest.java b/src/testcases/org/apache/tools/ant/taskdefs/XmlnsTest.java index 66d14cee6..ff971c817 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/XmlnsTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/XmlnsTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -58,7 +58,7 @@ public class XmlnsTest extends BuildFileTest { public void testNsAttributes() { expectLog("ns.attributes", "hello world"); } - + public static class MyTask extends Task { public void execute() { log("MyTask called"); diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java index b5b848d2a..f4213d7b2 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs; @@ -119,7 +119,7 @@ public class ZipTest extends BuildFileTest { } // Bugzilla Report 19449 - public void testFilesOnlyDoesntCauseRecreate() + public void testFilesOnlyDoesntCauseRecreate() throws InterruptedException { executeTarget("testFilesOnlyDoesntCauseRecreateSetup"); long l = getProject().resolveFile("test3.zip").lastModified(); diff --git a/src/testcases/org/apache/tools/ant/taskdefs/condition/ContainsTest.java b/src/testcases/org/apache/tools/ant/taskdefs/condition/ContainsTest.java index e70f0c16d..bcf10702f 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/condition/ContainsTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/condition/ContainsTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.condition; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/condition/EqualsTest.java b/src/testcases/org/apache/tools/ant/taskdefs/condition/EqualsTest.java index b3345a8c5..2f72ed656 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/condition/EqualsTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/condition/EqualsTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.condition; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/condition/IsReferenceTest.java b/src/testcases/org/apache/tools/ant/taskdefs/condition/IsReferenceTest.java index b119219ae..9498500a6 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/condition/IsReferenceTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/condition/IsReferenceTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.condition; @@ -39,23 +39,23 @@ public class IsReferenceTest extends BuildFileTest { } public void testBasic() { - expectPropertySet("basic", "global-path"); + expectPropertySet("basic", "global-path"); assertPropertySet("target-path"); assertPropertyUnset("undefined"); } public void testNotEnoughArgs() { - expectSpecificBuildException("isreference-incomplete", + expectSpecificBuildException("isreference-incomplete", "refid attribute has been omitted", "No reference specified for isreference " + "condition"); } public void testType() { - expectPropertySet("type", "global-path"); + expectPropertySet("type", "global-path"); assertPropertyUnset("global-path-as-fileset"); assertPropertyUnset("global-path-as-foo"); - assertPropertySet("global-echo"); + assertPropertySet("global-echo"); } } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/condition/TypeFoundTest.java b/src/testcases/org/apache/tools/ant/taskdefs/condition/TypeFoundTest.java index 073a019e6..793d941ee 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/condition/TypeFoundTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/condition/TypeFoundTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.condition; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/dir1/B.java b/src/testcases/org/apache/tools/ant/taskdefs/dir1/B.java index 77536cc7a..b06c70064 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/dir1/B.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/dir1/B.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.dir1; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/dir2/A.java b/src/testcases/org/apache/tools/ant/taskdefs/dir2/A.java index 1bbefd581..04f33988f 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/dir2/A.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/dir2/A.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.dir2; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/email/EmailAddressTest.java b/src/testcases/org/apache/tools/ant/taskdefs/email/EmailAddressTest.java index 750fa17a9..a7bcc5dd5 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/email/EmailAddressTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/email/EmailAddressTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.email; @@ -24,14 +24,14 @@ import junit.framework.TestCase; * @since Ant 1.6 */ public class EmailAddressTest extends TestCase { - + public EmailAddressTest(String name) { super(name); - } - - public void setUp() { } - + + public void setUp() { + } + public void test1() { expectNameAddress( new EmailAddress("address (name)") ); } @@ -39,62 +39,62 @@ public class EmailAddressTest extends TestCase { public void test2() { expectNameAddress( new EmailAddress("(name) address") ); } - + public void test3() { expectNameAddress( new EmailAddress("name <address>") ); } - + public void test4() { expectNameAddress( new EmailAddress("<address> name") ); } - + public void test5() { expectNameAddress( new EmailAddress("<address> (name)") ); } - + public void test6() { expectNameAddress( new EmailAddress("(name) <address>") ); } - + public void test7() { expectNameAddress2( new EmailAddress("address (<name>)") ); } - + public void test8() { expectNameAddress2( new EmailAddress("(<name>) address") ); } - + public void test9() { expectNameAddress3( new EmailAddress("address") ); } - + public void testA() { expectNameAddress3( new EmailAddress("<address>") ); } - + public void testB() { expectNameAddress3( new EmailAddress(" <address> ") ); } - + public void testC() { expectNameAddress3( new EmailAddress("< address >") ); } - + public void testD() { expectNameAddress3( new EmailAddress(" < address > ") ); } - + private void expectNameAddress(EmailAddress e) { assertEquals( "name", e.getName() ); assertEquals( "address", e.getAddress() ); } - + // where the name contains <> private void expectNameAddress2(EmailAddress e) { assertEquals( "<name>", e.getName() ); assertEquals( "address", e.getAddress() ); } - + // where only an address is supplied private void expectNameAddress3(EmailAddress e) { assertTrue( "Expected null, found <" + e.getName() + ">", diff --git a/src/testcases/org/apache/tools/ant/taskdefs/email/EmailTaskTest.java b/src/testcases/org/apache/tools/ant/taskdefs/email/EmailTaskTest.java index fb0a895cd..c6b5fd85d 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/email/EmailTaskTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/email/EmailTaskTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.email; @@ -25,16 +25,16 @@ import org.apache.tools.ant.BuildFileTest; * @author <a href="mailto:levylambert@tiscali-dsl.de">Antoine Levy-Lambert</a> */ public class EmailTaskTest extends BuildFileTest { - + public EmailTaskTest(String name) { super(name); - } - - public void setUp() { + } + + public void setUp() { configureProject("src/etc/testcases/taskdefs/email/mail.xml"); } - public void test1() { + public void test1() { expectBuildException("test1", "SMTP auth only possible with MIME mail"); } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/ANTLRTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/ANTLRTest.java index 7861b2d0f..87b0d22e5 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/ANTLRTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/ANTLRTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; @@ -48,7 +48,7 @@ public class ANTLRTest extends BuildFileTest { public void tearDown() { executeTarget("cleanup"); } - + public void test1() { expectBuildException("test1", "required argument, target, missing"); } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/AbstractXSLTLiaisonTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/AbstractXSLTLiaisonTest.java index 889328bba..e118bac13 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/AbstractXSLTLiaisonTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/AbstractXSLTLiaisonTest.java @@ -1,6 +1,6 @@ package org.apache.tools.ant.taskdefs.optional; -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,7 +14,7 @@ package org.apache.tools.ant.taskdefs.optional; * 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. - * + * */ import junit.framework.TestCase; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/BeanShellScriptTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/BeanShellScriptTest.java index 05ba88f40..39d44ff9c 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/BeanShellScriptTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/BeanShellScriptTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/DotnetTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/DotnetTest.java index ced4e35e9..16c4e504d 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/DotnetTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/DotnetTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; @@ -36,7 +36,7 @@ public class DotnetTest extends BuildFileTest { /** - * Constructor + * Constructor * * @param name testname */ diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java index 61a8275ab..4e096bec3 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/JspcTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/JspcTest.java index ca6f5e821..e14a6e85d 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/JspcTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/JspcTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; @@ -114,11 +114,11 @@ public class JspcTest extends BuildFileTest { * what happens to 1nvalid-classname */ public void testInvalidClassname() throws Exception { - executeJspCompile("testInvalidClassname", + executeJspCompile("testInvalidClassname", "_1nvalid_0002dclassname_jsp.java"); } - + /** * A unit test for JUnit */ @@ -141,7 +141,7 @@ public class JspcTest extends BuildFileTest { /** * webapp test is currently broken, because it picks up - * on the missing_tld file, and bails. + * on the missing_tld file, and bails. */ /* public void testWebapp() throws Exception { diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java index 7bffca857..0b9b224d7 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/PvcsTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/PvcsTest.java index 08be0ee0b..ed7166d55 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/PvcsTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/PvcsTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; @@ -23,17 +23,17 @@ import org.apache.tools.ant.BuildFileTest; /** * @author Thomas Christensen <tchristensen@nordija.com> */ -public class PvcsTest extends BuildFileTest { - - public PvcsTest(String name) { +public class PvcsTest extends BuildFileTest { + + public PvcsTest(String name) { super(name); - } - - public void setUp() { + } + + public void setUp() { configureProject("src/etc/testcases/taskdefs/optional/pvcs.xml"); } - - public void test1() { + + public void test1() { expectBuildException("test1", "Required argument repository not specified"); } @@ -41,19 +41,19 @@ public class PvcsTest extends BuildFileTest { executeTarget("test2"); } - public void test3() { + public void test3() { executeTarget("test3"); } - public void test4() { + public void test4() { executeTarget("test4"); } - public void test5() { + public void test5() { executeTarget("test5"); } - public void test6() { + public void test6() { expectBuildException("test6", "Failed executing: /never/heard/of/a/directory/structure/like/this/pcli lvf -z -aw -pr//ct4serv2/pvcs/monitor /. Exception: /never/heard/of/a/directory/structure/like/this/pcli: not found"); } } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/ReplaceRegExpTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/ReplaceRegExpTest.java index acb02363c..206557a9f 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/ReplaceRegExpTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/ReplaceRegExpTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; @@ -27,7 +27,7 @@ import java.io.IOException; /** * JUnit Testcase for the optional replaceregexp task. * - * @author Stefan Bodewig + * @author Stefan Bodewig * @version $Revision$ */ public class ReplaceRegExpTest extends BuildFileTest { @@ -35,15 +35,15 @@ public class ReplaceRegExpTest extends BuildFileTest { public ReplaceRegExpTest(String name) { super(name); } - - public void setUp() { + + public void setUp() { configureProject(PROJECT_PATH + "/replaceregexp.xml"); } - - public void tearDown() { + + public void tearDown() { executeTarget("cleanup"); } - + public void testReplace() throws IOException { Properties original = new Properties(); FileInputStream propsFile = null; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/RhinoReferenceTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/RhinoReferenceTest.java index 3b11981b1..f7d2797e1 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/RhinoReferenceTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/RhinoReferenceTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java index 89528a183..e680ecc7a 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java index 05700bfad..4ecca1b32 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java @@ -8,7 +8,7 @@ import java.io.File; import junit.framework.AssertionFailedError; -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -22,14 +22,14 @@ import junit.framework.AssertionFailedError; * 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. - * + * */ /** * TraX XSLTLiaison testcase * @author <a href="mailto:sbailliez@apache.org">Stephane Bailliez</a> */ -public class TraXLiaisonTest extends AbstractXSLTLiaisonTest +public class TraXLiaisonTest extends AbstractXSLTLiaisonTest implements XSLTLogger { public TraXLiaisonTest(String name){ diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/WsdlToDotnetTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/WsdlToDotnetTest.java index beadb7dbf..dc58b1e47 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/WsdlToDotnetTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/WsdlToDotnetTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; @@ -36,7 +36,7 @@ public class WsdlToDotnetTest extends BuildFileTest { /** - * Constructor + * Constructor * * @param name testname */ @@ -61,7 +61,7 @@ public class WsdlToDotnetTest extends BuildFileTest { } - + /** * A unit test for JUnit */ @@ -88,7 +88,7 @@ public class WsdlToDotnetTest extends BuildFileTest { "expected failure", "is a directory"); } - + /** * A unit test for JUnit */ @@ -96,7 +96,7 @@ public class WsdlToDotnetTest extends BuildFileTest { expectBuildExceptionContaining("testBothSrc", "expected failure", "both a source file and a URL"); - } + } /** * A unit test for JUnit */ @@ -104,8 +104,8 @@ public class WsdlToDotnetTest extends BuildFileTest { expectBuildExceptionContaining("testSrcIsDir", "expected failure", "is a directory"); - } - + } + /** * A unit test for JUnit */ @@ -114,19 +114,19 @@ public class WsdlToDotnetTest extends BuildFileTest { "expected failure", "does not exist"); } - + /** * A unit test for JUnit */ public void testLocalWsdl() throws Exception { executeTarget("testLocalWsdl"); - } + } /** * A unit test for JUnit */ public void testLocalWsdlServer() throws Exception { executeTarget("testLocalWsdlServer"); - } + } /** * A unit test for JUnit */ @@ -134,20 +134,20 @@ public class WsdlToDotnetTest extends BuildFileTest { expectBuildExceptionContaining("testInvalidExtraOps", "expected failure", "WSDL returned: 1"); - } - + } + /** * A unit test for JUnit */ public void testLocalWsdlVB() throws Exception { executeTarget("testLocalWsdlVB"); - } + } /** * A unit test for JUnit */ public void testLocalWsdlServerVB() throws Exception { executeTarget("testLocalWsdlServerVB"); - } + } /** * A unit test for JUnit */ @@ -155,6 +155,6 @@ public class WsdlToDotnetTest extends BuildFileTest { expectBuildExceptionContaining("testInvalidExtraOpsVB", "expected failure", "WSDL returned: 1"); - } + } } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/XalanLiaisonTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/XalanLiaisonTest.java index ee6f70c87..642c73fe7 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/XalanLiaisonTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/XalanLiaisonTest.java @@ -1,6 +1,6 @@ package org.apache.tools.ant.taskdefs.optional; -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,7 +14,7 @@ package org.apache.tools.ant.taskdefs.optional; * 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. - * + * */ import org.apache.tools.ant.taskdefs.XSLTLiaison; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateCatalogTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateCatalogTest.java index 0d95d139a..2f0550012 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateCatalogTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateCatalogTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; @@ -39,7 +39,7 @@ public class XmlValidateCatalogTest extends BuildFileTest { /** - * Constructor + * Constructor * * @param name testname */ @@ -65,7 +65,7 @@ public class XmlValidateCatalogTest extends BuildFileTest { /** * catalogfiles fileset should be ignored - * if resolver.jar is not present, but will + * if resolver.jar is not present, but will * be used if it is. either way, test should * work b/c we have a nested dtd with the same * entity diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateTest.java index f3eecbf8e..12b9882cb 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; @@ -41,7 +41,7 @@ public class XmlValidateTest extends BuildFileTest { /** - * Constructor + * Constructor * * @param name testname */ @@ -72,7 +72,7 @@ public class XmlValidateTest extends BuildFileTest { public void testValidate() throws Exception { executeTarget("testValidate"); } - + /** * Test indirect validation. @@ -145,7 +145,7 @@ public class XmlValidateTest extends BuildFileTest { fail("Should throw BuildException because 'Bad Schema Validation'"); expectBuildExceptionContaining("testSchemaBad", - "Bad Schema Validation", + "Bad Schema Validation", "not a valid XML document"); } catch (BuildException e) { if (e.getMessage() diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/XslpLiaisonTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/XslpLiaisonTest.java index cafb83367..ab4a29982 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/XslpLiaisonTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/XslpLiaisonTest.java @@ -2,7 +2,7 @@ package org.apache.tools.ant.taskdefs.optional; import org.apache.tools.ant.taskdefs.XSLTLiaison; -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,7 +16,7 @@ import org.apache.tools.ant.taskdefs.XSLTLiaison; * 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. - * + * */ /** diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/XsltTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/XsltTest.java index a41c4d0b6..c08484ffc 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/XsltTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/XsltTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional; @@ -33,7 +33,7 @@ public class XsltTest extends BuildFileTest { /** - * Constructor + * Constructor * * @param name testname */ @@ -58,7 +58,7 @@ public class XsltTest extends BuildFileTest { } - + /** * A unit test for JUnit */ diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java index 4b869375e..3bece4f81 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.depend; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/i18n/TranslateTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/i18n/TranslateTest.java index ab68b5287..8d422d777 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/i18n/TranslateTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/i18n/TranslateTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.i18n; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/image/ImageTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/image/ImageTest.java index f3e6c852a..9fd409434 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/image/ImageTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/image/ImageTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.image; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTest.java index 95b096a6d..3d4b25145 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.jdepend; @@ -53,7 +53,7 @@ public class JDependTest extends BuildFileTest { expectOutputContaining( "simple", "Package: org.apache.tools.ant.util.facade"); } - + /** * Test xml */ @@ -70,7 +70,7 @@ public class JDependTest extends BuildFileTest { expectLogContaining( "fork", "Package: org.apache.tools.ant.util.facade"); } - + /** * Test fork xml */ @@ -86,7 +86,7 @@ public class JDependTest extends BuildFileTest { expectLogContaining( "fork-timeout", "JDepend FAILED - Timed out"); } - + /** * Test timeout without timing out @@ -106,7 +106,7 @@ public class JDependTest extends BuildFileTest { + realOutput + "\"", realOutput.indexOf(substring) >= 0); } - + /** * Assert that the given message has been outputted */ diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitClassLoaderTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitClassLoaderTest.java index 41a12a959..21ff294c3 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitClassLoaderTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitClassLoaderTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java index a28869a4e..918ec0683 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; @@ -21,7 +21,7 @@ import java.io.File; import org.apache.tools.ant.BuildFileTest; /** - * Small testcase for the junitreporttask. + * Small testcase for the junitreporttask. * First test added to reproduce an fault, still a lot to improve * * @author <a href="mailto:martijn@kruithof.xs4all.nl">Martijn Kruithof</a> @@ -42,12 +42,12 @@ public class JUnitReportTest extends BuildFileTest { /** * Verifies that no empty junit-noframes.html is generated when frames - * output is selected via the default. + * output is selected via the default. * Needs reports1 task from junitreport.xml. */ public void testNoFileJUnitNoFrames() { executeTarget("reports1"); - if (new File("src/etc/testcases/taskdefs/optional/junitreport/test/html/junit-noframes.html").exists()) + if (new File("src/etc/testcases/taskdefs/optional/junitreport/test/html/junit-noframes.html").exists()) { fail("No file junit-noframes.html expected"); } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java index bea92e578..f9906d933 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; @@ -73,7 +73,7 @@ public class JUnitTestRunnerTest extends TestCase { //@fixme as of now does not report the original stacktrace. //assertTrue(error, error.indexOf("thrown on purpose") != -1); } - + protected TestRunner createRunner(Class clazz){ return new TestRunner(new JUnitTest(clazz.getName()), true, true, true); } @@ -127,7 +127,7 @@ public class JUnitTestRunnerTest extends TestCase { throw new NullPointerException("thrown on purpose"); } } - + public static class NoSuiteTestCase extends TestCase { public NoSuiteTestCase(String name){ super(name); } public void testA(){} diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelperTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelperTest.java index 51371aae0..f74779481 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelperTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelperTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; @@ -31,27 +31,27 @@ public class JUnitVersionHelperTest extends TestCase { } public void testMyOwnName() { - assertEquals("testMyOwnName", + assertEquals("testMyOwnName", JUnitVersionHelper.getTestCaseName(this)); } public void testNonTestCaseName() { - assertEquals("I'm a foo", + assertEquals("I'm a foo", JUnitVersionHelper.getTestCaseName(new Foo1())); } public void testNoStringReturn() { - assertEquals("unknown", + assertEquals("unknown", JUnitVersionHelper.getTestCaseName(new Foo2())); } public void testNoGetName() { - assertEquals("unknown", + assertEquals("unknown", JUnitVersionHelper.getTestCaseName(new Foo3())); } public void testNameNotGetName() { - assertEquals("I'm a foo, too", + assertEquals("I'm a foo, too", JUnitVersionHelper.getTestCaseName(new Foo4())); } @@ -60,7 +60,7 @@ public class JUnitVersionHelperTest extends TestCase { } public void testTestCaseSubClass() { - assertEquals("overridden getName", + assertEquals("overridden getName", JUnitVersionHelper.getTestCaseName(new Foo5())); } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/XMLFormatterWithCDATAOnSystemOut.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/XMLFormatterWithCDATAOnSystemOut.java index cb1ee8245..696e62c27 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/XMLFormatterWithCDATAOnSystemOut.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/XMLFormatterWithCDATAOnSystemOut.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.junit; @@ -25,10 +25,10 @@ import org.apache.tools.ant.util.FileUtils; public class XMLFormatterWithCDATAOnSystemOut extends BuildFileTest { private static String DIR = "src/etc/testcases/taskdefs/optional/junit"; - private static String REPORT = + private static String REPORT = "TEST-" + XMLFormatterWithCDATAOnSystemOut.class.getName() + ".xml"; - private static String TESTDATA = + private static String TESTDATA = "<ERROR>" + "<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + " <RESPONSE>" + diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/metamata/MAuditParserTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/metamata/MAuditParserTest.java index 9ca8e74a7..403a9003b 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/metamata/MAuditParserTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/metamata/MAuditParserTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.metamata; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/net/FTPTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/net/FTPTest.java index cc6e949a2..c5d928533 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/net/FTPTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/net/FTPTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.net; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/perforce/P4ChangeTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/perforce/P4ChangeTest.java index 15d7f907e..8bfaff148 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/perforce/P4ChangeTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/perforce/P4ChangeTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.perforce; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java index 472325a9f..b0845ea54 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.script; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassFileTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassFileTest.java index 335e91a5a..616abc330 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassFileTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassFileTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sitraka; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassPathLoaderTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassPathLoaderTest.java index 97ec1c5c8..22d067678 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassPathLoaderTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassPathLoaderTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sitraka; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReportTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReportTest.java index 507cc98e6..a6835a3b5 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReportTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReportTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sitraka; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/sos/SOSTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/sos/SOSTest.java index 2f072d02d..8f7a4e1bb 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/sos/SOSTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/sos/SOSTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.sos; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/splash/SplashScreenTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/splash/SplashScreenTest.java index 15cd23d24..d2abd3afd 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/splash/SplashScreenTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/splash/SplashScreenTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.splash; @@ -52,4 +52,4 @@ public class SplashScreenTest { System.exit(0); } } - + diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/ssh/ScpTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/ssh/ScpTest.java index ab57d8bb8..65ced2267 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/ssh/ScpTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/ssh/ScpTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.ssh; diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java index 5278443ef..209ac54dd 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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. - * + * */ /* @@ -41,7 +41,7 @@ import org.apache.tools.ant.Project; * Symlink.deleteSymlink, making a separate test redundant. * * @version $Revision$ - * @author <a href="mailto:gus.heck@olin.edu">Patrick G. Heck</a> + * @author <a href="mailto:gus.heck@olin.edu">Patrick G. Heck</a> */ public class SymlinkTest extends BuildFileTest { @@ -67,7 +67,7 @@ public class SymlinkTest extends BuildFileTest { if (supportsSymlinks) { executeTarget("test-single"); p = getProject(); - assertNotNull("Failed to create file", + assertNotNull("Failed to create file", p.getProperty("test.single.file.created")); assertNotNull("Failed to create link", p.getProperty("test.single.link.created")); diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java index d64f1205b..a6c926f63 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.taskdefs.optional.vss; diff --git a/src/testcases/org/apache/tools/ant/types/AbstractFileSetTest.java b/src/testcases/org/apache/tools/ant/types/AbstractFileSetTest.java index 07185e01d..633f05356 100644 --- a/src/testcases/org/apache/tools/ant/types/AbstractFileSetTest.java +++ b/src/testcases/org/apache/tools/ant/types/AbstractFileSetTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; @@ -189,7 +189,7 @@ public abstract class AbstractFileSetTest extends TestCase { f.setRefid(new Reference("dummy")); try { f.getDir(project); - fail("Can make " + f.getDataTypeName() + fail("Can make " + f.getDataTypeName() + " a Reference to itself."); } catch (BuildException be) { assertEquals("This data type contains a circular reference.", @@ -197,7 +197,7 @@ public abstract class AbstractFileSetTest extends TestCase { } try { f.getDirectoryScanner(project); - fail("Can make " + f.getDataTypeName() + fail("Can make " + f.getDataTypeName() + " a Reference to itself."); } catch (BuildException be) { assertEquals("This data type contains a circular reference.", @@ -229,7 +229,7 @@ public abstract class AbstractFileSetTest extends TestCase { be.getMessage()); } - // dummy1 --> dummy2 --> dummy3 + // dummy1 --> dummy2 --> dummy3 // (which has the Project's basedir as root). f1 = getInstance(); project.addReference("dummy1", f1); diff --git a/src/testcases/org/apache/tools/ant/types/AddTypeTest.java b/src/testcases/org/apache/tools/ant/types/AddTypeTest.java index 4862dfafd..69ec5f6e2 100644 --- a/src/testcases/org/apache/tools/ant/types/AddTypeTest.java +++ b/src/testcases/org/apache/tools/ant/types/AddTypeTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; @@ -48,7 +48,7 @@ public class AddTypeTest extends BuildFileTest { public void testAddSelector() { executeTarget("addselector"); } - + public void testNestedA() { expectLogContaining("nested.a", "add A called"); } @@ -90,9 +90,9 @@ public class AddTypeTest extends BuildFileTest { public void testNamespace() { executeTarget("namespacetest"); } - + // The following will be used as types and tasks - + public static interface A {} public static interface B {} public static interface C extends A {} @@ -116,7 +116,7 @@ public class AddTypeTest extends BuildFileTest { log("add C called"); } } - + public static class MyCondition implements Condition { diff --git a/src/testcases/org/apache/tools/ant/types/AssertionsTest.java b/src/testcases/org/apache/tools/ant/types/AssertionsTest.java index ad9755da9..fa857f6a4 100644 --- a/src/testcases/org/apache/tools/ant/types/AssertionsTest.java +++ b/src/testcases/org/apache/tools/ant/types/AssertionsTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java b/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java index 77f3ea5d5..1f3a5f1be 100644 --- a/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java +++ b/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/testcases/org/apache/tools/ant/types/CommandlineTest.java b/src/testcases/org/apache/tools/ant/types/CommandlineTest.java index 3b5684419..0346c0535 100644 --- a/src/testcases/org/apache/tools/ant/types/CommandlineTest.java +++ b/src/testcases/org/apache/tools/ant/types/CommandlineTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; @@ -41,7 +41,7 @@ public class CommandlineTest extends TestCase { for (int i=0; i<3; i++) { assertEquals(""+(i+1), s[i]); } - + s = Commandline.translateCommandline(""); assertEquals("empty string", 0, s.length); @@ -59,7 +59,7 @@ public class CommandlineTest extends TestCase { s = Commandline.translateCommandline("1 \"2 3\" 4"); assertEquals("Case with double quotes and whitespace", 3, s.length); assertEquals("Double quotes stripped, space included", "2 3", s[1]); - + s = Commandline.translateCommandline("1 \"2\'3\" 4"); assertEquals("Case with double quotes around single quote", 3, s.length); assertEquals("Double quotes stripped, single quote included", "2\'3", @@ -68,7 +68,7 @@ public class CommandlineTest extends TestCase { s = Commandline.translateCommandline("1 \'2 3\' 4"); assertEquals("Case with single quotes and whitespace", 3, s.length); assertEquals("Single quotes stripped, space included", "2 3", s[1]); - + s = Commandline.translateCommandline("1 \'2\"3\' 4"); assertEquals("Case with single quotes around double quote", 3, s.length); assertEquals("Single quotes stripped, double quote included", "2\"3", @@ -108,7 +108,7 @@ public class CommandlineTest extends TestCase { assertEquals("Singlequoted null arg", "", s[0]); // now to the expected failures - + try { s = Commandline.translateCommandline("a \'b c"); fail("unbalanced single quotes undetected"); diff --git a/src/testcases/org/apache/tools/ant/types/DescriptionTest.java b/src/testcases/org/apache/tools/ant/types/DescriptionTest.java index 78fc80280..59052b11c 100644 --- a/src/testcases/org/apache/tools/ant/types/DescriptionTest.java +++ b/src/testcases/org/apache/tools/ant/types/DescriptionTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; @@ -37,28 +37,28 @@ public class DescriptionTest extends BuildFileTest { super(name); } - public void setUp() { + public void setUp() { } public void tearDown() { } - public void test1() { + public void test1() { configureProject("src/etc/testcases/types/description1.xml"); assertEquals("Single description failed", "Test Project Description", project.getDescription()); } - public void test2() { + public void test2() { configureProject("src/etc/testcases/types/description2.xml"); assertEquals("Multi line description failed", "Multi Line\nProject Description", project.getDescription()); } - - public void test3() { + + public void test3() { configureProject("src/etc/testcases/types/description3.xml"); assertEquals("Multi instance description failed", "Multi Instance Project Description", project.getDescription()); } - - public void test4() { + + public void test4() { configureProject("src/etc/testcases/types/description4.xml"); assertEquals("Multi instance nested description failed", "Multi Instance Nested Project Description", project.getDescription()); } diff --git a/src/testcases/org/apache/tools/ant/types/DirSetTest.java b/src/testcases/org/apache/tools/ant/types/DirSetTest.java index a00b7d844..402da5f9c 100644 --- a/src/testcases/org/apache/tools/ant/types/DirSetTest.java +++ b/src/testcases/org/apache/tools/ant/types/DirSetTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/testcases/org/apache/tools/ant/types/EnumeratedAttributeTest.java b/src/testcases/org/apache/tools/ant/types/EnumeratedAttributeTest.java index 64cc0e9c1..dbe7c5820 100644 --- a/src/testcases/org/apache/tools/ant/types/EnumeratedAttributeTest.java +++ b/src/testcases/org/apache/tools/ant/types/EnumeratedAttributeTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; @@ -35,7 +35,7 @@ public class EnumeratedAttributeTest extends TestCase { public EnumeratedAttributeTest(String name) { super(name); } - + public void testContains() { EnumeratedAttribute t1 = new TestNormal(); for (int i=0; i<expected.length; i++) { diff --git a/src/testcases/org/apache/tools/ant/types/FileListTest.java b/src/testcases/org/apache/tools/ant/types/FileListTest.java index db80cb0cf..50a23ae4e 100644 --- a/src/testcases/org/apache/tools/ant/types/FileListTest.java +++ b/src/testcases/org/apache/tools/ant/types/FileListTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; @@ -130,7 +130,7 @@ public class FileListTest extends TestCase { be.getMessage()); } - // dummy1 --> dummy2 --> dummy3 + // dummy1 --> dummy2 --> dummy3 // (which has the Project's basedir as root). f1 = new FileList(); project.addReference("dummy1", f1); diff --git a/src/testcases/org/apache/tools/ant/types/FileSetTest.java b/src/testcases/org/apache/tools/ant/types/FileSetTest.java index b5aab090b..f4a0d77e5 100644 --- a/src/testcases/org/apache/tools/ant/types/FileSetTest.java +++ b/src/testcases/org/apache/tools/ant/types/FileSetTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/testcases/org/apache/tools/ant/types/FilterSetTest.java b/src/testcases/org/apache/tools/ant/types/FilterSetTest.java index 2e7e3b39a..296c3a5be 100644 --- a/src/testcases/org/apache/tools/ant/types/FilterSetTest.java +++ b/src/testcases/org/apache/tools/ant/types/FilterSetTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; @@ -36,12 +36,12 @@ import java.util.Hashtable; public class FilterSetTest extends BuildFileTest { static private final int BUF_SIZE = 32768; - + public FilterSetTest(String name) { super(name); } - public void setUp() { + public void setUp() { configureProject("src/etc/testcases/types/filterset.xml"); } @@ -49,19 +49,19 @@ public class FilterSetTest extends BuildFileTest { executeTarget("cleanup"); } - public void test1() { + public void test1() { executeTarget("test1"); assertTrue("Filterset 1 failed", compareFiles("src/etc/testcases/types/gold/filterset1.txt", "src/etc/testcases/types/dest1.txt")); } - public void test2() { + public void test2() { executeTarget("test2"); assertTrue("Filterset 2 failed", compareFiles("src/etc/testcases/types/gold/filterset2.txt", "src/etc/testcases/types/dest2.txt")); } - public void test3() { + public void test3() { executeTarget("test3"); assertTrue("Filterset 3 failed", compareFiles("src/etc/testcases/types/gold/filterset3.txt", "src/etc/testcases/types/dest3.txt")); @@ -70,7 +70,7 @@ public class FilterSetTest extends BuildFileTest { /** * This will test the recursive FilterSet. Which means that if * the filter value @test@ contains another filter value, it will - * actually resolve. + * actually resolve. */ public void testRecursive() { String result = "it works line"; @@ -129,23 +129,23 @@ public class FilterSetTest extends BuildFileTest { private boolean compareFiles(String name1, String name2) { File file1 = new File(name1); File file2 = new File(name2); - + try { if (!file1.exists() || !file2.exists()) { System.out.println("One or both files do not exist:" + name1 + ", " + name2); return false; } - + if (file1.length() != file2.length()) { - System.out.println("File size mismatch:" + name1 + "(" + file1.length() + "), " + + System.out.println("File size mismatch:" + name1 + "(" + file1.length() + "), " + name2 + "(" + file2.length() + ")"); return false; } - + // byte - byte compare byte[] buffer1 = new byte[BUF_SIZE]; byte[] buffer2 = new byte[BUF_SIZE]; - + FileInputStream fis1 = new FileInputStream(file1); FileInputStream fis2 = new FileInputStream(file2); int index = 0; @@ -154,7 +154,7 @@ public class FilterSetTest extends BuildFileTest { fis2.read(buffer2); for (int i = 0; i < read; ++i, ++index) { if (buffer1[i] != buffer2[i]) { - System.out.println("Bytes mismatch:" + name1 + ", " + name2 + + System.out.println("Bytes mismatch:" + name1 + ", " + name2 + " at byte " + index); return false; } diff --git a/src/testcases/org/apache/tools/ant/types/FlexIntegerTest.java b/src/testcases/org/apache/tools/ant/types/FlexIntegerTest.java index 8099fe359..2f7170a61 100644 --- a/src/testcases/org/apache/tools/ant/types/FlexIntegerTest.java +++ b/src/testcases/org/apache/tools/ant/types/FlexIntegerTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/testcases/org/apache/tools/ant/types/MapperTest.java b/src/testcases/org/apache/tools/ant/types/MapperTest.java index dfba5ef08..af616d67f 100644 --- a/src/testcases/org/apache/tools/ant/types/MapperTest.java +++ b/src/testcases/org/apache/tools/ant/types/MapperTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; @@ -30,7 +30,7 @@ import java.io.File; /** * JUnit 3 testcases for org.apache.tools.ant.types.Mapper. * - * @author Stefan Bodewig + * @author Stefan Bodewig */ public class MapperTest extends TestCase { @@ -117,7 +117,7 @@ public class MapperTest extends TestCase { be.getMessage()); } - // dummy1 --> dummy2 --> dummy3 + // dummy1 --> dummy2 --> dummy3 // (which holds a glob mapper from "*.java" to "*.class" m1 = new Mapper(project); project.addReference("dummy1", m1); @@ -154,7 +154,7 @@ public class MapperTest extends TestCase { super(name); } - public void setUp() { + public void setUp() { configureProject("src/etc/testcases/types/mapper.xml"); } @@ -162,7 +162,7 @@ public class MapperTest extends TestCase { executeTarget("cleanup"); } - public void test1() { + public void test1() { executeTarget("test1"); } } diff --git a/src/testcases/org/apache/tools/ant/types/PathTest.java b/src/testcases/org/apache/tools/ant/types/PathTest.java index 07a6e460c..a4ee4112b 100644 --- a/src/testcases/org/apache/tools/ant/types/PathTest.java +++ b/src/testcases/org/apache/tools/ant/types/PathTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; @@ -30,8 +30,8 @@ import java.util.Locale; /** * JUnit 3 testcases for org.apache.tools.ant.types.Path * - * @author Stefan Bodewig - * @author <a href="mailto:jtulley@novell.com">Jeff Tulley</a> + * @author Stefan Bodewig + * @author <a href="mailto:jtulley@novell.com">Jeff Tulley</a> */ public class PathTest extends TestCase { @@ -64,28 +64,28 @@ public class PathTest extends TestCase { } else { assertEquals(":\\a", l[0].substring(1)); assertEquals(":\\b", l[1].substring(1)); - } + } } public void testRelativePathUnixStyle() { project.setBasedir("src/etc"); Path p = new Path(project, "..:testcases"); - String[] l = p.list(); + String[] l = p.list(); assertEquals("two items, Unix style", 2, l.length); if (isUnixStyle) { - assertTrue("test resolved relative to src/etc", + assertTrue("test resolved relative to src/etc", l[0].endsWith("/src")); - assertTrue("test resolved relative to src/etc", + assertTrue("test resolved relative to src/etc", l[1].endsWith("/src/etc/testcases")); } else if (isNetWare) { - assertTrue("test resolved relative to src/etc", + assertTrue("test resolved relative to src/etc", l[0].endsWith("\\src")); - assertTrue("test resolved relative to src/etc", + assertTrue("test resolved relative to src/etc", l[1].endsWith("\\src\\etc\\testcases")); } else { - assertTrue("test resolved relative to src/etc", + assertTrue("test resolved relative to src/etc", l[0].endsWith("\\src")); - assertTrue("test resolved relative to src/etc", + assertTrue("test resolved relative to src/etc", l[1].endsWith("\\src\\etc\\testcases")); } } @@ -103,13 +103,13 @@ public class PathTest extends TestCase { } else { assertEquals(":\\a", l[0].substring(1)); assertEquals(":\\b", l[1].substring(1)); - } + } p = new Path(project, "c:\\test"); l = p.list(); if (isUnixStyle) { assertEquals("no drives on Unix", 2, l.length); - assertTrue("c resolved relative to project\'s basedir", + assertTrue("c resolved relative to project\'s basedir", l[0].endsWith("/c")); assertEquals("/test", l[1]); } else if (isNetWare) { @@ -124,10 +124,10 @@ public class PathTest extends TestCase { l = p.list(); if (isUnixStyle) { assertEquals("no drives on Unix", 4, l.length); - assertTrue("c resolved relative to project\'s basedir", + assertTrue("c resolved relative to project\'s basedir", l[0].endsWith("/c")); assertEquals("/test", l[1]); - assertTrue("d resolved relative to project\'s basedir", + assertTrue("d resolved relative to project\'s basedir", l[2].endsWith("/d")); assertEquals("/programs", l[3]); } else if (isNetWare) { @@ -144,7 +144,7 @@ public class PathTest extends TestCase { l = p.list(); if (isUnixStyle) { assertEquals("no drives on Unix", 2, l.length); - assertTrue("c resolved relative to project\'s basedir", + assertTrue("c resolved relative to project\'s basedir", l[0].endsWith("/c")); assertEquals("/test", l[1]); } else if (isNetWare) { @@ -159,10 +159,10 @@ public class PathTest extends TestCase { l = p.list(); if (isUnixStyle) { assertEquals("no drives on Unix", 4, l.length); - assertTrue("c resolved relative to project\'s basedir", + assertTrue("c resolved relative to project\'s basedir", l[0].endsWith("/c")); assertEquals("/test", l[1]); - assertTrue("d resolved relative to project\'s basedir", + assertTrue("d resolved relative to project\'s basedir", l[2].endsWith("/d")); assertEquals("/programs", l[3]); } else if (isNetWare) { @@ -182,7 +182,7 @@ public class PathTest extends TestCase { String[] l = p.list(); if (isUnixStyle) { assertEquals("no drives on Unix", 2, l.length); - assertTrue("sys resolved relative to project\'s basedir", + assertTrue("sys resolved relative to project\'s basedir", l[0].endsWith("/sys")); assertEquals("/test", l[1]); } else if (isNetWare) { @@ -190,9 +190,9 @@ public class PathTest extends TestCase { assertEquals("volumes on NetWare", 1, l.length); } else { assertEquals("no multiple character-length volumes on Windows", 2, l.length); - assertTrue("sys resolved relative to project\'s basedir", + assertTrue("sys resolved relative to project\'s basedir", l[0].endsWith("\\sys")); - assertTrue("test resolved relative to project\'s basedir", + assertTrue("test resolved relative to project\'s basedir", l[1].endsWith("\\test")); } @@ -201,10 +201,10 @@ public class PathTest extends TestCase { l = p.list(); if (isUnixStyle) { assertEquals("no drives on Unix", 4, l.length); - assertTrue("sys resolved relative to project\'s basedir", + assertTrue("sys resolved relative to project\'s basedir", l[0].endsWith("/sys")); assertEquals("/test", l[1]); - assertTrue("dev resolved relative to project\'s basedir", + assertTrue("dev resolved relative to project\'s basedir", l[2].endsWith("/dev")); assertEquals("/temp", l[3]); } else if (isNetWare) { @@ -213,13 +213,13 @@ public class PathTest extends TestCase { assertEquals("dev:\\temp", l[1].toLowerCase(Locale.US)); } else { assertEquals("no multiple character-length volumes on Windows", 4, l.length); - assertTrue("sys resolved relative to project\'s basedir", + assertTrue("sys resolved relative to project\'s basedir", l[0].endsWith("\\sys")); - assertTrue("test resolved relative to project\'s basedir", + assertTrue("test resolved relative to project\'s basedir", l[1].endsWith("\\test")); - assertTrue("dev resolved relative to project\'s basedir", + assertTrue("dev resolved relative to project\'s basedir", l[2].endsWith("\\dev")); - assertTrue("temp resolved relative to project\'s basedir", + assertTrue("temp resolved relative to project\'s basedir", l[3].endsWith("\\temp")); } @@ -228,7 +228,7 @@ public class PathTest extends TestCase { l = p.list(); if (isUnixStyle) { assertEquals("no drives on Unix", 2, l.length); - assertTrue("sys resolved relative to project\'s basedir", + assertTrue("sys resolved relative to project\'s basedir", l[0].endsWith("/sys")); assertEquals("/test", l[1]); } else if (isNetWare) { @@ -236,9 +236,9 @@ public class PathTest extends TestCase { assertEquals("sys:\\test", l[0].toLowerCase(Locale.US)); } else { assertEquals("no multiple character-length volumes on Windows", 2, l.length); - assertTrue("sys resolved relative to project\'s basedir", + assertTrue("sys resolved relative to project\'s basedir", l[0].endsWith("\\sys")); - assertTrue("test resolved relative to project\'s basedir", + assertTrue("test resolved relative to project\'s basedir", l[1].endsWith("\\test")); } @@ -247,10 +247,10 @@ public class PathTest extends TestCase { l = p.list(); if (isUnixStyle) { assertEquals("no drives on Unix", 4, l.length); - assertTrue("sys resolved relative to project\'s basedir", + assertTrue("sys resolved relative to project\'s basedir", l[0].endsWith("/sys")); assertEquals("/test", l[1]); - assertTrue("dev resolved relative to project\'s basedir", + assertTrue("dev resolved relative to project\'s basedir", l[2].endsWith("/dev")); assertEquals("/temp", l[3]); } else if (isNetWare) { @@ -259,25 +259,25 @@ public class PathTest extends TestCase { assertEquals("dev:\\temp", l[1].toLowerCase(Locale.US)); } else { assertEquals("no multiple character-length volumes on Windows", 4, l.length); - assertTrue("sys resolved relative to project\'s basedir", + assertTrue("sys resolved relative to project\'s basedir", l[0].endsWith("\\sys")); - assertTrue("test resolved relative to project\'s basedir", + assertTrue("test resolved relative to project\'s basedir", l[1].endsWith("\\test")); - assertTrue("dev resolved relative to project\'s basedir", + assertTrue("dev resolved relative to project\'s basedir", l[2].endsWith("\\dev")); - assertTrue("temp resolved relative to project\'s basedir", + assertTrue("temp resolved relative to project\'s basedir", l[3].endsWith("\\temp")); } // try a multi-part netware-volume length path with UNIX // separator (this testcase if from an actual bug that was // found, in AvailableTest, which uses PathTokenizer) - p = new Path(project, + p = new Path(project, "SYS:\\JAVA/lib/rt.jar:SYS:\\JAVA/lib/classes.zip"); l = p.list(); if (isUnixStyle) { assertEquals("no drives on Unix", 3, l.length); - assertTrue("sys resolved relative to project\'s basedir", + assertTrue("sys resolved relative to project\'s basedir", l[0].endsWith("/SYS")); assertEquals("/JAVA/lib/rt.jar", l[1]); assertEquals("/JAVA/lib/classes.zip", l[2]); @@ -287,11 +287,11 @@ public class PathTest extends TestCase { assertEquals("sys:\\java\\lib\\classes.zip", l[1].toLowerCase(Locale.US)); } else { assertEquals("no multiple character-length volumes on Windows", 3, l.length); - assertTrue("sys resolved relative to project\'s basedir", + assertTrue("sys resolved relative to project\'s basedir", l[0].endsWith("\\SYS")); - assertTrue("java/lib/rt.jar resolved relative to project\'s basedir", + assertTrue("java/lib/rt.jar resolved relative to project\'s basedir", l[1].endsWith("\\JAVA\\lib\\rt.jar")); - assertTrue("java/lib/classes.zip resolved relative to project\'s basedir", + assertTrue("java/lib/classes.zip resolved relative to project\'s basedir", l[2].endsWith("\\JAVA\\lib\\classes.zip")); } } @@ -312,7 +312,7 @@ public class PathTest extends TestCase { assertEquals(":\\a", l[0].substring(1)); assertEquals(":\\b", l[1].substring(1)); assertEquals(":\\c", l[2].substring(1)); - } + } } public void testSetLocation() { diff --git a/src/testcases/org/apache/tools/ant/types/PatternSetTest.java b/src/testcases/org/apache/tools/ant/types/PatternSetTest.java index cc18a4c82..be82a1c71 100644 --- a/src/testcases/org/apache/tools/ant/types/PatternSetTest.java +++ b/src/testcases/org/apache/tools/ant/types/PatternSetTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; @@ -30,7 +30,7 @@ import java.io.File; * * <p>This doesn't actually test much, mainly reference handling.</p> * - * @author Stefan Bodewig + * @author Stefan Bodewig */ public class PatternSetTest extends TestCase { @@ -164,7 +164,7 @@ public class PatternSetTest extends TestCase { be.getMessage()); } - // dummy1 --> dummy2 --> dummy3 + // dummy1 --> dummy2 --> dummy3 // (which holds patterns "include" and "exclude") p1 = new PatternSet(); project.addReference("dummy1", p1); @@ -185,7 +185,7 @@ public class PatternSetTest extends TestCase { 1, i.length); assertEquals("exclude", i[0]); } - + public void testNestedPatternset() { PatternSet p = new PatternSet(); p.setIncludes("**/*.java"); diff --git a/src/testcases/org/apache/tools/ant/types/PermissionsTest.java b/src/testcases/org/apache/tools/ant/types/PermissionsTest.java index 7ecf6b47e..cbe8cef5b 100644 --- a/src/testcases/org/apache/tools/ant/types/PermissionsTest.java +++ b/src/testcases/org/apache/tools/ant/types/PermissionsTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; @@ -27,13 +27,13 @@ import org.apache.tools.ant.ExitException; * @author <a href="mailto:martijn@kruithof.xs4all.nl>Martijn Kruithof</a> */ public class PermissionsTest extends TestCase { - + Permissions perms; public PermissionsTest(String name) { super(name); } - + public void setUp() { perms = new Permissions(); Permissions.Permission perm = new Permissions.Permission(); @@ -43,7 +43,7 @@ public class PermissionsTest extends TestCase { perm.setName("user.*"); perm.setClass("java.util.PropertyPermission"); perms.addConfiguredGrant(perm); - + perm = new Permissions.Permission(); perm.setActions("read"); perm.setName("java.home"); @@ -57,25 +57,25 @@ public class PermissionsTest extends TestCase { perms.addConfiguredGrant(perm); // Revoke permission to write user.home (granted above via user.*), still able to read though. - // and the default granted permission to read os.name. + // and the default granted permission to read os.name. perm = new Permissions.Permission(); perm.setActions("write"); perm.setName("user.home"); perm.setClass("java.util.PropertyPermission"); - perms.addConfiguredRevoke(perm); - + perms.addConfiguredRevoke(perm); + perm = new Permissions.Permission(); perm.setActions("read"); perm.setName("os.*"); perm.setClass("java.util.PropertyPermission"); - perms.addConfiguredRevoke(perm); + perms.addConfiguredRevoke(perm); } - + /** Tests a permission that is granted per default. */ public void testDefaultGranted() { perms.setSecurityManager(); try { - String s = System.getProperty("line.separator"); + String s = System.getProperty("line.separator"); } finally { perms.restoreSecurityManager(); } @@ -86,7 +86,7 @@ public class PermissionsTest extends TestCase { perms.setSecurityManager(); try { String s = System.getProperty("user.name"); - System.setProperty("user.name", s); + System.setProperty("user.name", s); } finally { perms.restoreSecurityManager(); } @@ -98,7 +98,7 @@ public class PermissionsTest extends TestCase { try { String s = System.getProperty("user.home"); System.setProperty("user.home", s); - fail("Could perform an action that should have been forbidden."); + fail("Could perform an action that should have been forbidden."); } catch (SecurityException e){ // Was expected, test passes } finally { @@ -111,7 +111,7 @@ public class PermissionsTest extends TestCase { perms.setSecurityManager(); try { System.getProperty("os.name"); - fail("Could perform an action that should have been forbidden."); + fail("Could perform an action that should have been forbidden."); } catch (SecurityException e){ // Was expected, test passes } finally { @@ -124,14 +124,14 @@ public class PermissionsTest extends TestCase { perms.setSecurityManager(); try { String s = System.setProperty("line.separator",ls); - fail("Could perform an action that should have been forbidden."); + fail("Could perform an action that should have been forbidden."); } catch (SecurityException e){ // Was expected, test passes } finally { perms.restoreSecurityManager(); } } - + /** Tests an exit condition. */ public void testExit() { perms.setSecurityManager(); @@ -146,11 +146,11 @@ public class PermissionsTest extends TestCase { System.out.println("testExit successfull."); } finally { perms.restoreSecurityManager(); - } + } } - - + + public void tearDown() { } -}
\ No newline at end of file +} diff --git a/src/testcases/org/apache/tools/ant/types/PolyTest.java b/src/testcases/org/apache/tools/ant/types/PolyTest.java index 54c57a850..44f842742 100644 --- a/src/testcases/org/apache/tools/ant/types/PolyTest.java +++ b/src/testcases/org/apache/tools/ant/types/PolyTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; @@ -36,7 +36,7 @@ public class PolyTest extends BuildFileTest { public void testFileSet() { expectLogContaining("fileset", "types.FileSet"); } - + public void testFileSetAntType() { expectLogContaining("fileset-ant-type", "types.PolyTest$MyFileSet"); } @@ -44,7 +44,7 @@ public class PolyTest extends BuildFileTest { public void testPath() { expectLogContaining("path", "types.Path"); } - + public void testPathAntType() { expectLogContaining("path-ant-type", "types.PolyTest$MyPath"); } diff --git a/src/testcases/org/apache/tools/ant/types/XMLCatalogBuildFileTest.java b/src/testcases/org/apache/tools/ant/types/XMLCatalogBuildFileTest.java index 7e8eb1bd7..2a1b3fcca 100644 --- a/src/testcases/org/apache/tools/ant/types/XMLCatalogBuildFileTest.java +++ b/src/testcases/org/apache/tools/ant/types/XMLCatalogBuildFileTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; @@ -26,10 +26,10 @@ import junit.framework.AssertionFailedError; /** * BuildFileTest testcases for org.apache.tools.ant.types.XMLCatalog - * + * * @see org.apache.tools.ant.types.XMLCatalogTest * - * @author <a href="mailto:cstrong@arielpartners.com">Craeg Strong</a> + * @author <a href="mailto:cstrong@arielpartners.com">Craeg Strong</a> * @version $Id$ */ public class XMLCatalogBuildFileTest extends BuildFileTest { @@ -38,7 +38,7 @@ public class XMLCatalogBuildFileTest extends BuildFileTest { super(name); } - public void setUp() { + public void setUp() { } public void tearDown() { @@ -51,9 +51,9 @@ public class XMLCatalogBuildFileTest extends BuildFileTest { // Transform an XML file that refers to the entity into a text // file, stuff result into property: val1 // - public void testEntityNoCatalog() { + public void testEntityNoCatalog() { configureProject("src/etc/testcases/types/xmlcatalog.xml"); - expectPropertySet("testentitynocatalog", "val1", + expectPropertySet("testentitynocatalog", "val1", "A stitch in time saves nine"); } @@ -65,9 +65,9 @@ public class XMLCatalogBuildFileTest extends BuildFileTest { // file, entity is listed in the XMLCatalog pointing to a // different file. Stuff result into property: val2 // - public void testEntityWithCatalog() { + public void testEntityWithCatalog() { configureProject("src/etc/testcases/types/xmlcatalog.xml"); - expectPropertySet("testentitywithcatalog", "val2", + expectPropertySet("testentitywithcatalog", "val2", "No news is good news"); } @@ -78,10 +78,10 @@ public class XMLCatalogBuildFileTest extends BuildFileTest { // Transform an XML file that contains a reference to a _second_ XML file // via the document() function. The _second_ XML file refers to an entity. // Stuff result into the property: val3 - // - public void testDocumentNoCatalog() { + // + public void testDocumentNoCatalog() { configureProject("src/etc/testcases/types/xmlcatalog.xml"); - expectPropertySet("testdocumentnocatalog", "val3", + expectPropertySet("testdocumentnocatalog", "val3", "A stitch in time saves nine"); } @@ -93,10 +93,10 @@ public class XMLCatalogBuildFileTest extends BuildFileTest { // via the document() function. The _second_ XML file refers to an entity. // The entity is listed in the XMLCatalog pointing to a different file. // Stuff result into the property: val4 - // - public void testDocumentWithCatalog() { + // + public void testDocumentWithCatalog() { configureProject("src/etc/testcases/types/xmlcatalog.xml"); - expectPropertySet("testdocumentwithcatalog", "val4", + expectPropertySet("testdocumentwithcatalog", "val4", "No news is good news"); } } diff --git a/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java b/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java index 2678dddbd..5412b48e8 100644 --- a/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java +++ b/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/testcases/org/apache/tools/ant/types/ZipFileSetTest.java b/src/testcases/org/apache/tools/ant/types/ZipFileSetTest.java index 7cbcf27df..247fbbcae 100644 --- a/src/testcases/org/apache/tools/ant/types/ZipFileSetTest.java +++ b/src/testcases/org/apache/tools/ant/types/ZipFileSetTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types; diff --git a/src/testcases/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java b/src/testcases/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java index faf88bf9e..a27be0b2b 100644 --- a/src/testcases/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java +++ b/src/testcases/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.optional.depend; @@ -30,13 +30,13 @@ import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.DirectoryScanner; /** - * Testcase for the Classfileset optional type. - * + * Testcase for the Classfileset optional type. + * * @author Conor MacNeill */ public class ClassFileSetTest extends BuildFileTest { public static final String RESULT_FILESET = "result"; - + public ClassFileSetTest(String name) { super(name); } @@ -63,18 +63,18 @@ public class ClassFileSetTest extends BuildFileTest { for (int i = 0; i < scannedFiles.length; ++i) { files.put(scannedFiles[i], scannedFiles[i]); } - assertEquals("Classfileset did not pick up expected number of " + assertEquals("Classfileset did not pick up expected number of " + "class files", 4, files.size()); - assertTrue("Result did not contain A.class", + assertTrue("Result did not contain A.class", files.containsKey("A.class")); - assertTrue("Result did not contain B.class", + assertTrue("Result did not contain B.class", files.containsKey("B.class")); - assertTrue("Result did not contain C.class", + assertTrue("Result did not contain C.class", files.containsKey("C.class")); - assertTrue("Result did not contain D.class", + assertTrue("Result did not contain D.class", files.containsKey("D.class")); } - + /** * Test small classfileset */ @@ -88,11 +88,11 @@ public class ClassFileSetTest extends BuildFileTest { for (int i = 0; i < scannedFiles.length; ++i) { files.put(scannedFiles[i], scannedFiles[i]); } - assertEquals("Classfileset did not pick up expected number of " + assertEquals("Classfileset did not pick up expected number of " + "class files", 2, files.size()); - assertTrue("Result did not contain B.class", + assertTrue("Result did not contain B.class", files.containsKey("B.class")); - assertTrue("Result did not contain C.class", + assertTrue("Result did not contain C.class", files.containsKey("C.class")); } @@ -109,19 +109,19 @@ public class ClassFileSetTest extends BuildFileTest { for (int i = 0; i < scannedFiles.length; ++i) { files.put(scannedFiles[i], scannedFiles[i]); } - assertEquals("Classfileset did not pick up expected number of " + assertEquals("Classfileset did not pick up expected number of " + "class files", 1, files.size()); - assertTrue("Result did not contain C.class", + assertTrue("Result did not contain C.class", files.containsKey("C.class")); } - + /** * Test that you can pass a classfileset by reference to a fileset. */ public void testByReference() { executeTarget("testbyreference"); } - + /** * Test that classes included in a method "System.out.println(MyClass.class)" are included. */ @@ -147,8 +147,8 @@ public class ClassFileSetTest extends BuildFileTest { files.containsKey("D.class")); assertTrue("Result did not contain E.class", files.containsKey("E.class")); - } - + } + /** * Test that classes included in a method "System.out.println(Outer.Inner.class)" are included. */ diff --git a/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java index 3744df7a7..9c05dc4d2 100644 --- a/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java +++ b/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/testcases/org/apache/tools/ant/types/selectors/ContainsRegexpTest.java b/src/testcases/org/apache/tools/ant/types/selectors/ContainsRegexpTest.java index 58c38cd5c..dde2cd4d2 100644 --- a/src/testcases/org/apache/tools/ant/types/selectors/ContainsRegexpTest.java +++ b/src/testcases/org/apache/tools/ant/types/selectors/ContainsRegexpTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; @@ -41,7 +41,7 @@ public class ContainsRegexpTest extends TestCase { } public void testContainsRegexp() { - TaskdefForRegexpTest MyTask = + TaskdefForRegexpTest MyTask = new TaskdefForRegexpTest("containsregexp"); try { MyTask.setUp(); @@ -56,7 +56,7 @@ public class ContainsRegexpTest extends TestCase { super(name); } - public void setUp() { + public void setUp() { configureProject("src/etc/testcases/types/selectors.xml"); } @@ -64,7 +64,7 @@ public class ContainsRegexpTest extends TestCase { executeTarget("cleanupregexp"); } - public void test() { + public void test() { File dir = null; File[] files = null; int filecount; @@ -74,11 +74,11 @@ public class ContainsRegexpTest extends TestCase { dir = new File(getProjectDir() + "/regexpseltestdest/"); files = dir.listFiles(); filecount = files.length; - + if (filecount != 1) assertEquals("ContainsRegexp test should have copied 1 file", 1, files.length); - + } } } diff --git a/src/testcases/org/apache/tools/ant/types/selectors/ContainsSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/ContainsSelectorTest.java index 705b5e0f7..0d119f6fe 100644 --- a/src/testcases/org/apache/tools/ant/types/selectors/ContainsSelectorTest.java +++ b/src/testcases/org/apache/tools/ant/types/selectors/ContainsSelectorTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/testcases/org/apache/tools/ant/types/selectors/DateSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/DateSelectorTest.java index 4ff2e6058..2da495b04 100644 --- a/src/testcases/org/apache/tools/ant/types/selectors/DateSelectorTest.java +++ b/src/testcases/org/apache/tools/ant/types/selectors/DateSelectorTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/testcases/org/apache/tools/ant/types/selectors/DependSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/DependSelectorTest.java index f6145c1a5..0c6128059 100644 --- a/src/testcases/org/apache/tools/ant/types/selectors/DependSelectorTest.java +++ b/src/testcases/org/apache/tools/ant/types/selectors/DependSelectorTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/testcases/org/apache/tools/ant/types/selectors/DepthSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/DepthSelectorTest.java index df104ac46..817859f08 100644 --- a/src/testcases/org/apache/tools/ant/types/selectors/DepthSelectorTest.java +++ b/src/testcases/org/apache/tools/ant/types/selectors/DepthSelectorTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/testcases/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java index 432ddf00f..1460ba654 100644 --- a/src/testcases/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java +++ b/src/testcases/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java index 89ee7a74a..4597bcde3 100644 --- a/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java +++ b/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; @@ -647,7 +647,7 @@ public class ModifiedSelectorTest extends BaseSelectorTest { File dir = getProject().getBaseDir(); File file = new File(dir, propfile); try { - java.io.FileWriter out = + java.io.FileWriter out = new java.io.FileWriter(file.getAbsolutePath(), true); out.write(line); out.write(System.getProperty("line.separator")); diff --git a/src/testcases/org/apache/tools/ant/types/selectors/PresentSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/PresentSelectorTest.java index 855884447..63c98ad38 100644 --- a/src/testcases/org/apache/tools/ant/types/selectors/PresentSelectorTest.java +++ b/src/testcases/org/apache/tools/ant/types/selectors/PresentSelectorTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/testcases/org/apache/tools/ant/types/selectors/SizeSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/SizeSelectorTest.java index 98fc21e5c..52624744f 100644 --- a/src/testcases/org/apache/tools/ant/types/selectors/SizeSelectorTest.java +++ b/src/testcases/org/apache/tools/ant/types/selectors/SizeSelectorTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/testcases/org/apache/tools/ant/types/selectors/TypeSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/TypeSelectorTest.java index 3b6506be6..6e3e248bd 100644 --- a/src/testcases/org/apache/tools/ant/types/selectors/TypeSelectorTest.java +++ b/src/testcases/org/apache/tools/ant/types/selectors/TypeSelectorTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.types.selectors; diff --git a/src/testcases/org/apache/tools/ant/util/CollectionUtilsTest.java b/src/testcases/org/apache/tools/ant/util/CollectionUtilsTest.java index 3568d862d..0276d3463 100644 --- a/src/testcases/org/apache/tools/ant/util/CollectionUtilsTest.java +++ b/src/testcases/org/apache/tools/ant/util/CollectionUtilsTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; @@ -27,8 +27,8 @@ import junit.framework.TestCase; /** * Tests for org.apache.tools.ant.util.CollectionUtils. * - * @author Stefan Bodewig - * @author <a href="mailto:jtulley@novell.com">Jeff Tulley</a> + * @author Stefan Bodewig + * @author <a href="mailto:jtulley@novell.com">Jeff Tulley</a> */ public class CollectionUtilsTest extends TestCase { diff --git a/src/testcases/org/apache/tools/ant/util/DOMElementWriterTest.java b/src/testcases/org/apache/tools/ant/util/DOMElementWriterTest.java index e8f40696b..32ccef6fa 100644 --- a/src/testcases/org/apache/tools/ant/util/DOMElementWriterTest.java +++ b/src/testcases/org/apache/tools/ant/util/DOMElementWriterTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; @@ -24,7 +24,7 @@ import junit.framework.TestSuite; /** * Tests for org.apache.tools.ant.util.DOMElementWriter. * - * @author Stefan Bodewig + * @author Stefan Bodewig */ public class DOMElementWriterTest extends TestCase { diff --git a/src/testcases/org/apache/tools/ant/util/DateUtilsTest.java b/src/testcases/org/apache/tools/ant/util/DateUtilsTest.java index 036330bc5..8e33cc48b 100644 --- a/src/testcases/org/apache/tools/ant/util/DateUtilsTest.java +++ b/src/testcases/org/apache/tools/ant/util/DateUtilsTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/testcases/org/apache/tools/ant/util/FileUtilsTest.java b/src/testcases/org/apache/tools/ant/util/FileUtilsTest.java index 5eae49939..cdaf0554c 100644 --- a/src/testcases/org/apache/tools/ant/util/FileUtilsTest.java +++ b/src/testcases/org/apache/tools/ant/util/FileUtilsTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/testcases/org/apache/tools/ant/util/GlobPatternMapperTest.java b/src/testcases/org/apache/tools/ant/util/GlobPatternMapperTest.java index 83bae4200..4ec1d5f3c 100644 --- a/src/testcases/org/apache/tools/ant/util/GlobPatternMapperTest.java +++ b/src/testcases/org/apache/tools/ant/util/GlobPatternMapperTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; @@ -24,7 +24,7 @@ import junit.framework.TestSuite; /** * Tests for org.apache.tools.ant.util;GlobPatternMapper. * - * @author Stefan Bodewig + * @author Stefan Bodewig */ public class GlobPatternMapperTest extends TestCase { diff --git a/src/testcases/org/apache/tools/ant/util/JAXPUtilsTest.java b/src/testcases/org/apache/tools/ant/util/JAXPUtilsTest.java index b293f89b8..64f766685 100644 --- a/src/testcases/org/apache/tools/ant/util/JAXPUtilsTest.java +++ b/src/testcases/org/apache/tools/ant/util/JAXPUtilsTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/testcases/org/apache/tools/ant/util/JavaEnvUtilsTest.java b/src/testcases/org/apache/tools/ant/util/JavaEnvUtilsTest.java index 89a229f24..0c0bcc1d4 100644 --- a/src/testcases/org/apache/tools/ant/util/JavaEnvUtilsTest.java +++ b/src/testcases/org/apache/tools/ant/util/JavaEnvUtilsTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/testcases/org/apache/tools/ant/util/LazyFileOutputStreamTest.java b/src/testcases/org/apache/tools/ant/util/LazyFileOutputStreamTest.java index 82b3939a6..ef5fc944f 100644 --- a/src/testcases/org/apache/tools/ant/util/LazyFileOutputStreamTest.java +++ b/src/testcases/org/apache/tools/ant/util/LazyFileOutputStreamTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/testcases/org/apache/tools/ant/util/LoaderUtilsTest.java b/src/testcases/org/apache/tools/ant/util/LoaderUtilsTest.java index 84e37d254..929a20d45 100644 --- a/src/testcases/org/apache/tools/ant/util/LoaderUtilsTest.java +++ b/src/testcases/org/apache/tools/ant/util/LoaderUtilsTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/testcases/org/apache/tools/ant/util/PackageNameMapperTest.java b/src/testcases/org/apache/tools/ant/util/PackageNameMapperTest.java index f5f0f1ea0..c60053919 100644 --- a/src/testcases/org/apache/tools/ant/util/PackageNameMapperTest.java +++ b/src/testcases/org/apache/tools/ant/util/PackageNameMapperTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; @@ -21,18 +21,18 @@ import junit.framework.TestCase; public class PackageNameMapperTest extends TestCase { public PackageNameMapperTest(String name) { super(name); } - + public void testMapping() { PackageNameMapper mapper = new PackageNameMapper(); mapper.setFrom("*.java"); mapper.setTo("TEST-*.xml"); String file = fixupPath("org/apache/tools/ant/util/PackageNameMapperTest.java"); String result = mapper.mapFileName(file)[0]; - + assertEquals("TEST-org.apache.tools.ant.util.PackageNameMapperTest.xml", result); } - + private String fixupPath(String file) { return file.replace('/', File.separatorChar); } diff --git a/src/testcases/org/apache/tools/ant/util/ReferencesTest.java b/src/testcases/org/apache/tools/ant/util/ReferencesTest.java index 9cf6f6d54..7217d1d9b 100644 --- a/src/testcases/org/apache/tools/ant/util/ReferencesTest.java +++ b/src/testcases/org/apache/tools/ant/util/ReferencesTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/testcases/org/apache/tools/ant/util/ResourceUtilsTest.java b/src/testcases/org/apache/tools/ant/util/ResourceUtilsTest.java index e7ae876a8..484e0fe08 100644 --- a/src/testcases/org/apache/tools/ant/util/ResourceUtilsTest.java +++ b/src/testcases/org/apache/tools/ant/util/ResourceUtilsTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; @@ -41,7 +41,7 @@ public class ResourceUtilsTest extends TestCase public void testNoDuplicates() { Resource r = new Resource("samual vimes", true, 1, false); - Resource[] toNew = + Resource[] toNew = ResourceUtils.selectOutOfDateSources(taskINeedForLogging, new Resource[] {r}, this, this); diff --git a/src/testcases/org/apache/tools/ant/util/StringUtilsTest.java b/src/testcases/org/apache/tools/ant/util/StringUtilsTest.java index b9277ca57..d4dd9bfc4 100644 --- a/src/testcases/org/apache/tools/ant/util/StringUtilsTest.java +++ b/src/testcases/org/apache/tools/ant/util/StringUtilsTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; diff --git a/src/testcases/org/apache/tools/ant/util/UnPackageNameMapperTest.java b/src/testcases/org/apache/tools/ant/util/UnPackageNameMapperTest.java index 0ac6eef5e..521370cd6 100644 --- a/src/testcases/org/apache/tools/ant/util/UnPackageNameMapperTest.java +++ b/src/testcases/org/apache/tools/ant/util/UnPackageNameMapperTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; @@ -21,7 +21,7 @@ import junit.framework.TestCase; public class UnPackageNameMapperTest extends TestCase { public UnPackageNameMapperTest(String name) { super(name); } - + public void testMapping() { UnPackageNameMapper mapper = new UnPackageNameMapper(); mapper.setFrom("TEST-*.xml"); @@ -29,10 +29,10 @@ public class UnPackageNameMapperTest extends TestCase { String file ="TEST-org.apache.tools.ant.util.UnPackageNameMapperTest.xml"; String result = mapper.mapFileName(file)[0]; String expected = fixupPath("org/apache/tools/ant/util/UnPackageNameMapperTest.java"); - + assertEquals(expected, result); } - + private String fixupPath(String file) { return file.replace('/', File.separatorChar); } diff --git a/src/testcases/org/apache/tools/ant/util/XMLFragmentTest.java b/src/testcases/org/apache/tools/ant/util/XMLFragmentTest.java index 9486927f1..ca4c5d64b 100644 --- a/src/testcases/org/apache/tools/ant/util/XMLFragmentTest.java +++ b/src/testcases/org/apache/tools/ant/util/XMLFragmentTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util; @@ -23,7 +23,7 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; public class XMLFragmentTest extends BuildFileTest { - + public XMLFragmentTest(String name) { super(name); } @@ -44,7 +44,7 @@ public class XMLFragmentTest extends BuildFileTest { } public void testNestedChildren() { - XMLFragment x = + XMLFragment x = (XMLFragment) getProject().getReference("with-children"); assertNotNull(x); Node n = x.getFragment(); diff --git a/src/testcases/org/apache/tools/ant/util/facade/FacadeTaskHelperTest.java b/src/testcases/org/apache/tools/ant/util/facade/FacadeTaskHelperTest.java index 6643d04c3..1dc7e432a 100644 --- a/src/testcases/org/apache/tools/ant/util/facade/FacadeTaskHelperTest.java +++ b/src/testcases/org/apache/tools/ant/util/facade/FacadeTaskHelperTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.facade; diff --git a/src/testcases/org/apache/tools/ant/util/facade/ImplementationSpecificArgumentTest.java b/src/testcases/org/apache/tools/ant/util/facade/ImplementationSpecificArgumentTest.java index ca1eb0694..8f7ee6333 100644 --- a/src/testcases/org/apache/tools/ant/util/facade/ImplementationSpecificArgumentTest.java +++ b/src/testcases/org/apache/tools/ant/util/facade/ImplementationSpecificArgumentTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.facade; @@ -30,7 +30,7 @@ public class ImplementationSpecificArgumentTest extends TestCase { } public void testDependsOnImplementation() { - ImplementationSpecificArgument ia = + ImplementationSpecificArgument ia = new ImplementationSpecificArgument(); ia.setLine("A B"); String[] parts = ia.getParts(); diff --git a/src/testcases/org/apache/tools/ant/util/regexp/JakartaOroMatcherTest.java b/src/testcases/org/apache/tools/ant/util/regexp/JakartaOroMatcherTest.java index 24e8047ed..fd5631a26 100644 --- a/src/testcases/org/apache/tools/ant/util/regexp/JakartaOroMatcherTest.java +++ b/src/testcases/org/apache/tools/ant/util/regexp/JakartaOroMatcherTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.regexp; @@ -20,7 +20,7 @@ package org.apache.tools.ant.util.regexp; /** * Tests for the jakarta-oro implementation of the RegexpMatcher interface. * - * @author Stefan Bodewig + * @author Stefan Bodewig */ public class JakartaOroMatcherTest extends RegexpMatcherTest { diff --git a/src/testcases/org/apache/tools/ant/util/regexp/JakartaOroRegexpTest.java b/src/testcases/org/apache/tools/ant/util/regexp/JakartaOroRegexpTest.java index 640bc6b28..16c89de02 100644 --- a/src/testcases/org/apache/tools/ant/util/regexp/JakartaOroRegexpTest.java +++ b/src/testcases/org/apache/tools/ant/util/regexp/JakartaOroRegexpTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.regexp; @@ -20,7 +20,7 @@ package org.apache.tools.ant.util.regexp; /** * Tests for the jakarta-oro implementation of the Regexp interface. * - * @author Stefan Bodewig + * @author Stefan Bodewig */ public class JakartaOroRegexpTest extends RegexpTest { diff --git a/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java b/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java index fc6f18b35..fee3be191 100644 --- a/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java +++ b/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.regexp; @@ -26,7 +26,7 @@ import org.apache.tools.ant.taskdefs.condition.Os; /** * Tests for the jakarta-regexp implementation of the RegexpMatcher interface. * - * @author Stefan Bodewig + * @author Stefan Bodewig */ public class JakartaRegexpMatcherTest extends RegexpMatcherTest { diff --git a/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpRegexpTest.java b/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpRegexpTest.java index 3fd57ab19..215158522 100644 --- a/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpRegexpTest.java +++ b/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpRegexpTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.regexp; @@ -26,7 +26,7 @@ import org.apache.tools.ant.taskdefs.condition.Os; /** * Tests for the jakarta-regexp implementation of the Regexp interface. * - * @author Stefan Bodewig + * @author Stefan Bodewig */ public class JakartaRegexpRegexpTest extends RegexpTest { diff --git a/src/testcases/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcherTest.java b/src/testcases/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcherTest.java index 2305a744e..13980ea0d 100644 --- a/src/testcases/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcherTest.java +++ b/src/testcases/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcherTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.regexp; @@ -24,7 +24,7 @@ import junit.framework.AssertionFailedError; /** * Tests for the JDK 1.4 implementation of the RegexpMatcher interface. * - * @author Stefan Bodewig + * @author Stefan Bodewig */ public class Jdk14RegexpMatcherTest extends RegexpMatcherTest { diff --git a/src/testcases/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexpTest.java b/src/testcases/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexpTest.java index 72debcb5f..d240cb85f 100644 --- a/src/testcases/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexpTest.java +++ b/src/testcases/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexpTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.regexp; @@ -24,7 +24,7 @@ import junit.framework.AssertionFailedError; /** * Tests for the JDK 1.4 implementation of the Regexp interface. * - * @author Stefan Bodewig + * @author Stefan Bodewig */ public class Jdk14RegexpRegexpTest extends RegexpTest { diff --git a/src/testcases/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java b/src/testcases/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java index 096fa96a2..ed1817e17 100644 --- a/src/testcases/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java +++ b/src/testcases/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.regexp; @@ -27,7 +27,7 @@ import junit.framework.TestSuite; /** * Tests for all implementations of the RegexpMatcher interface. * - * @author Stefan Bodewig + * @author Stefan Bodewig */ public abstract class RegexpMatcherTest extends TestCase { @@ -77,15 +77,15 @@ public abstract class RegexpMatcherTest extends TestCase { reg.setPattern("aaaa"); Vector v = reg.getGroups("xaaaa"); assertEquals("No parens -> no extra groups", 1, v.size()); - assertEquals("Trivial match with no parens", "aaaa", + assertEquals("Trivial match with no parens", "aaaa", (String) v.elementAt(0)); reg.setPattern("(aaaa)"); v = reg.getGroups("xaaaa"); assertEquals("Trivial match with single paren", 2, v.size()); - assertEquals("Trivial match with single paren, full match", "aaaa", + assertEquals("Trivial match with single paren, full match", "aaaa", (String) v.elementAt(0)); - assertEquals("Trivial match with single paren, matched paren", "aaaa", + assertEquals("Trivial match with single paren, matched paren", "aaaa", (String) v.elementAt(0)); reg.setPattern("(a+)b(b+)"); @@ -109,7 +109,7 @@ public abstract class RegexpMatcherTest extends TestCase { public void testCaseInsensitiveMatch() { reg.setPattern("aaaa"); assertTrue("aaaa doesn't match AAaa", !reg.matches("AAaa")); - assertTrue("aaaa matches AAaa ignoring case", + assertTrue("aaaa matches AAaa ignoring case", reg.matches("AAaa", RegexpMatcher.MATCH_CASE_INSENSITIVE)); } @@ -160,7 +160,7 @@ public abstract class RegexpMatcherTest extends TestCase { buf.append("Line3 endtest").append(UNIX_LINE); buf.append("Line4").append(UNIX_LINE); String text = buf.toString(); - + doStartTest1(text); doStartTest2(text); doEndTest1(text); @@ -170,36 +170,36 @@ public abstract class RegexpMatcherTest extends TestCase { protected void doStartTest1(String text) { reg.setPattern("^starttest"); assertTrue("^starttest in default mode", !reg.matches(text)); - assertTrue("^starttest in single line mode", + assertTrue("^starttest in single line mode", !reg.matches(text, RegexpMatcher.MATCH_SINGLELINE)); - assertTrue("^starttest in multi line mode", + assertTrue("^starttest in multi line mode", reg.matches(text, RegexpMatcher.MATCH_MULTILINE)); } protected void doStartTest2(String text) { reg.setPattern("^Line1"); assertTrue("^Line1 in default mode", reg.matches(text)); - assertTrue("^Line1 in single line mode", + assertTrue("^Line1 in single line mode", reg.matches(text, RegexpMatcher.MATCH_SINGLELINE)); - assertTrue("^Line1 in multi line mode", + assertTrue("^Line1 in multi line mode", reg.matches(text, RegexpMatcher.MATCH_MULTILINE)); } protected void doEndTest1(String text) { reg.setPattern("endtest$"); assertTrue("endtest$ in default mode", !reg.matches(text)); - assertTrue("endtest$ in single line mode", + assertTrue("endtest$ in single line mode", !reg.matches(text, RegexpMatcher.MATCH_SINGLELINE)); - assertTrue("endtest$ in multi line mode", + assertTrue("endtest$ in multi line mode", reg.matches(text, RegexpMatcher.MATCH_MULTILINE)); } protected void doEndTest2(String text) { reg.setPattern("Line4$"); assertTrue("Line4$ in default mode", reg.matches(text)); - assertTrue("Line4$ in single line mode", + assertTrue("Line4$ in single line mode", reg.matches(text, RegexpMatcher.MATCH_SINGLELINE)); - assertTrue("Line4$ in multi line mode", + assertTrue("Line4$ in multi line mode", reg.matches(text, RegexpMatcher.MATCH_MULTILINE)); } diff --git a/src/testcases/org/apache/tools/ant/util/regexp/RegexpTest.java b/src/testcases/org/apache/tools/ant/util/regexp/RegexpTest.java index 53cc3350d..a20e40f9e 100644 --- a/src/testcases/org/apache/tools/ant/util/regexp/RegexpTest.java +++ b/src/testcases/org/apache/tools/ant/util/regexp/RegexpTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.ant.util.regexp; @@ -20,7 +20,7 @@ package org.apache.tools.ant.util.regexp; /** * Tests for all implementations of the Regexp interface. * - * @author Stefan Bodewig + * @author Stefan Bodewig */ public abstract class RegexpTest extends RegexpMatcherTest { @@ -41,7 +41,7 @@ public abstract class RegexpTest extends RegexpMatcherTest { Regexp reg = (Regexp) getReg(); reg.setPattern(pattern); assertTrue(reg.matches(test)); - assertEquals("abedcfg-abcdefg", reg.substitute(test, "ab\\2d\\1f", + assertEquals("abedcfg-abcdefg", reg.substitute(test, "ab\\2d\\1f", Regexp.MATCH_DEFAULT)); } @@ -49,7 +49,7 @@ public abstract class RegexpTest extends RegexpMatcherTest { Regexp reg = (Regexp) getReg(); reg.setPattern(pattern); assertTrue(reg.matches(test)); - assertEquals("abedcfg-abcdefg", reg.substitute(test, "ab\\2d\\1f", + assertEquals("abedcfg-abcdefg", reg.substitute(test, "ab\\2d\\1f", Regexp.REPLACE_FIRST)); } @@ -57,7 +57,7 @@ public abstract class RegexpTest extends RegexpMatcherTest { Regexp reg = (Regexp) getReg(); reg.setPattern(pattern); assertTrue(reg.matches(test)); - assertEquals("abedcfg-abedcfg", reg.substitute(test, "ab\\2d\\1f", + assertEquals("abedcfg-abedcfg", reg.substitute(test, "ab\\2d\\1f", Regexp.REPLACE_ALL)); } } diff --git a/src/testcases/org/apache/tools/mail/MailMessageTest.java b/src/testcases/org/apache/tools/mail/MailMessageTest.java index 2214d595d..b371b8716 100644 --- a/src/testcases/org/apache/tools/mail/MailMessageTest.java +++ b/src/testcases/org/apache/tools/mail/MailMessageTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.mail; @@ -41,15 +41,15 @@ import junit.framework.TestCase; * @since Ant 1.6 */ public class MailMessageTest extends TestCase { - + // 27224 = magic (a random port which is unlikely to be in use) private static int TEST_PORT = 27224; - + private String local = null; - + public MailMessageTest(String name) { super(name); - } + } public void setUp() { try { @@ -58,7 +58,7 @@ public class MailMessageTest extends TestCase { // ignore } } - + /** * Test an example that is similar to the one given in the API * If this testcase takes >90s to complete, it is very likely that @@ -66,13 +66,13 @@ public class MailMessageTest extends TestCase { * timed out. */ public void testAPIExample() { - + ServerThread testMailServer = new ServerThread(); Thread server = new Thread(testMailServer); server.start(); - + ClientThread testMailClient = new ClientThread(); - + testMailClient.from("Mail Message <EmailTaskTest@ant.apache.org>"); testMailClient.to("to@you.com"); testMailClient.cc("cc1@you.com"); @@ -81,17 +81,17 @@ public class MailMessageTest extends TestCase { testMailClient.setSubject("Test subject"); testMailClient.setMessage( "test line 1\n" + "test line 2" ); - + Thread client = new Thread(testMailClient); client.start(); - + try { server.join(60 * 1000); // 60s client.join(30 * 1000); // a further 30s } catch (InterruptedException ie ) { fail( "InterruptedException: " + ie ); } - + String result = testMailServer.getResult(); String expectedResult = "220 test SMTP EmailTaskTest\r\n" + "HELO " + local + "\r\n" + @@ -144,7 +144,7 @@ public class MailMessageTest extends TestCase { fail(testMailClient.getFailMessage()); } } - + /** * Test a MailMessage with no cc or bcc lines */ @@ -154,23 +154,23 @@ public class MailMessageTest extends TestCase { server.start(); ClientThread testMailClient = new ClientThread(); - + testMailClient.from("Mail Message <EmailTaskTest@ant.apache.org>"); testMailClient.to("to@you.com"); testMailClient.setSubject("Test subject"); testMailClient.setMessage( "test line 1\n" + "test line 2" ); - + Thread client = new Thread(testMailClient); client.start(); - + try { server.join(60 * 1000); // 60s client.join(30 * 1000); // a further 30s } catch (InterruptedException ie ) { fail("InterruptedException: " + ie); } - + String result = testMailServer.getResult(); String expectedResult = "220 test SMTP EmailTaskTest\r\n" + "HELO " + local + "\r\n" + @@ -199,8 +199,8 @@ public class MailMessageTest extends TestCase { fail(testMailClient.getFailMessage()); } } - - + + /** * Test a MailMessage with no to or bcc lines */ @@ -210,23 +210,23 @@ public class MailMessageTest extends TestCase { server.start(); ClientThread testMailClient = new ClientThread(); - + testMailClient.from("Mail Message <EmailTaskTest@ant.apache.org>"); testMailClient.cc("cc@you.com"); testMailClient.setSubject("Test subject"); testMailClient.setMessage( "test line 1\n" + "test line 2" ); - + Thread client = new Thread(testMailClient); client.start(); - + try { server.join(60 * 1000); // 60s client.join(30 * 1000); // a further 30s } catch (InterruptedException ie ) { fail( "InterruptedException: " + ie ); } - + String result = testMailServer.getResult(); String expectedResult = "220 test SMTP EmailTaskTest\r\n" + "HELO " + local + "\r\n" + @@ -255,8 +255,8 @@ public class MailMessageTest extends TestCase { fail(testMailClient.getFailMessage()); } } - - + + /** * Test a MailMessage with no to or cc lines */ @@ -266,23 +266,23 @@ public class MailMessageTest extends TestCase { server.start(); ClientThread testMailClient = new ClientThread(); - + testMailClient.from("Mail Message <EmailTaskTest@ant.apache.org>"); testMailClient.bcc("bcc@you.com"); testMailClient.setSubject("Test subject"); testMailClient.setMessage( "test line 1\n" + "test line 2" ); - + Thread client = new Thread(testMailClient); client.start(); - + try { server.join(60 * 1000); // 60s client.join(30 * 1000); // a further 30s } catch (InterruptedException ie ) { fail( "InterruptedException: " + ie ); } - + String result = testMailServer.getResult(); String expectedResult = "220 test SMTP EmailTaskTest\r\n" + "HELO " + local + "\r\n" + @@ -310,8 +310,8 @@ public class MailMessageTest extends TestCase { fail( testMailClient.getFailMessage() ); } } - - + + /** * Test a MailMessage with no subject line * Subject is an optional field (RFC 822 s4.1) @@ -322,22 +322,22 @@ public class MailMessageTest extends TestCase { server.start(); ClientThread testMailClient = new ClientThread(); - + testMailClient.from("Mail Message <EmailTaskTest@ant.apache.org>"); testMailClient.to("to@you.com"); testMailClient.setMessage( "test line 1\n" + "test line 2" ); - + Thread client = new Thread(testMailClient); client.start(); - + try { server.join(60 * 1000); // 60s client.join(30 * 1000); // a further 30s } catch (InterruptedException ie ) { fail( "InterruptedException: " + ie ); } - + String result = testMailServer.getResult(); String expectedResult = "220 test SMTP EmailTaskTest\r\n" + "HELO " + local + "\r\n" + @@ -365,8 +365,8 @@ public class MailMessageTest extends TestCase { fail( testMailClient.getFailMessage() ); } } - - + + /** * Test a MailMessage with empty body message */ @@ -376,22 +376,22 @@ public class MailMessageTest extends TestCase { server.start(); ClientThread testMailClient = new ClientThread(); - + testMailClient.from("Mail Message <EmailTaskTest@ant.apache.org>"); testMailClient.to("to@you.com"); testMailClient.setSubject("Test subject"); testMailClient.setMessage(""); - + Thread client = new Thread(testMailClient); client.start(); - + try { server.join(60 * 1000); // 60s client.join(30 * 1000); // a further 30s } catch (InterruptedException ie ) { fail( "InterruptedException: " + ie ); } - + String result = testMailServer.getResult(); String expectedResult = "220 test SMTP EmailTaskTest\r\n" + "HELO " + local + "\r\n" + @@ -419,8 +419,8 @@ public class MailMessageTest extends TestCase { fail(testMailClient.getFailMessage()); } } - - + + /** * Test a MailMessage with US-ASCII character set * The next four testcase can be kinda hard to debug as Ant will often @@ -433,7 +433,7 @@ public class MailMessageTest extends TestCase { server.start(); ClientThread testMailClient = new ClientThread(); - + testMailClient.from("Mail Message <EmailTaskTest@ant.apache.org>"); testMailClient.to("Ceki G\u00fclc\u00fc <abuse@mail-abuse.org>"); testMailClient.setSubject("Test subject"); @@ -441,14 +441,14 @@ public class MailMessageTest extends TestCase { Thread client = new Thread(testMailClient); client.start(); - + try { server.join(60 * 1000); // 60s client.join(30 * 1000); // a further 30s } catch (InterruptedException ie ) { fail("InterruptedException: " + ie); } - + String result = testMailServer.getResult(); String expectedResult = "220 test SMTP EmailTaskTest\r\n" + "HELO " + local + "\r\n" + @@ -486,15 +486,15 @@ public class MailMessageTest extends TestCase { fail(testMailClient.getFailMessage()); } } - - - + + + /** * A private test class that pretends to be a mail transfer agent */ private class ServerThread implements Runnable { - + private StringBuffer sb = null; private boolean loop = false; ServerSocket ssock = null; @@ -522,10 +522,10 @@ public class MailMessageTest extends TestCase { break; } sb.append( response + "\r\n" ); - + if ( !data && response.startsWith( "HELO" ) ) { send( "250 " + local + " Hello " + local + " " + - "[127.0.0.1], pleased to meet you\r\n" ); + "[127.0.0.1], pleased to meet you\r\n" ); } else if ( !data && response.startsWith("MAIL") ) { send( "250\r\n" ); } else if ( !data && response.startsWith("RCPT")) { @@ -548,7 +548,7 @@ public class MailMessageTest extends TestCase { } else { // sb.append( response + "\r\n" ); } - + } // while } catch (IOException ioe) { fail(); @@ -556,13 +556,13 @@ public class MailMessageTest extends TestCase { disconnect(); } } - + private void send(String retmsg) throws IOException { out.write( retmsg ); out.flush(); sb.append( retmsg ); } - + private void disconnect() { if (out != null) { try { @@ -598,32 +598,32 @@ public class MailMessageTest extends TestCase { } } } - + public synchronized String getResult() { loop = false; return sb.toString(); } - + } - + /** * A private test class that wraps MailMessage */ private class ClientThread implements Runnable { - + private MailMessage msg; private boolean fail = false; private String failMessage = null; - + protected String from = null; protected String subject = null; protected String message = null; - + protected Vector replyToList = new Vector(); protected Vector toList = new Vector(); protected Vector ccList = new Vector(); protected Vector bccList = new Vector(); - + public void run() { for (int i = 9; i > 0; i--) { @@ -644,47 +644,47 @@ public class MailMessageTest extends TestCase { break; } } - + if (msg == null) { fail = true; failMessage = "java.net.ConnectException: Connection refused"; return; } - + try { msg.from(from); - + Enumeration e; - + e = replyToList.elements(); while (e.hasMoreElements()) { msg.replyto(e.nextElement().toString()); } - + e = toList.elements(); while (e.hasMoreElements()) { msg.to(e.nextElement().toString()); } - + e = ccList.elements(); while (e.hasMoreElements()) { msg.cc(e.nextElement().toString()); } - + e = bccList.elements(); while (e.hasMoreElements()) { msg.bcc(e.nextElement().toString()); } - + if (subject != null) { msg.setSubject(subject); } - + if (message != null ) { PrintStream out = msg.getPrintStream(); out.println( message ); } - + msg.sendAndClose(); } catch (IOException ioe) { fail = true; @@ -692,43 +692,43 @@ public class MailMessageTest extends TestCase { return; } } - + public boolean isFailed() { return fail; } - + public String getFailMessage() { return failMessage; } - + public void replyTo(String replyTo) { replyToList.add(replyTo); } - + public void to(String to) { toList.add(to); } - + public void cc(String cc) { ccList.add(cc); } - + public void bcc(String bcc) { bccList.add(bcc); } - + public void setSubject(String subject) { this.subject = subject; } - + public void from(String from) { this.from = from; } - + public void setMessage(String message) { this.message = message; } - + } - + } diff --git a/src/testcases/org/apache/tools/tar/TarEntryTest.java b/src/testcases/org/apache/tools/tar/TarEntryTest.java index a96295156..ed5c33a65 100644 --- a/src/testcases/org/apache/tools/tar/TarEntryTest.java +++ b/src/testcases/org/apache/tools/tar/TarEntryTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.tar; diff --git a/src/testcases/org/apache/tools/tar/TarRoundTripTest.java b/src/testcases/org/apache/tools/tar/TarRoundTripTest.java index 8ba638bc8..a07fb4417 100644 --- a/src/testcases/org/apache/tools/tar/TarRoundTripTest.java +++ b/src/testcases/org/apache/tools/tar/TarRoundTripTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2003-2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.tar; diff --git a/src/testcases/org/apache/tools/zip/AsiExtraFieldTest.java b/src/testcases/org/apache/tools/zip/AsiExtraFieldTest.java index d5a1e5dec..b5d4ae563 100644 --- a/src/testcases/org/apache/tools/zip/AsiExtraFieldTest.java +++ b/src/testcases/org/apache/tools/zip/AsiExtraFieldTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.zip; @@ -22,7 +22,7 @@ import junit.framework.TestCase; /** * JUnit 3 testcases for org.apache.tools.zip.AsiExtraField. * - * @author Stefan Bodewig + * @author Stefan Bodewig */ public class AsiExtraFieldTest extends TestCase implements UnixStat { public AsiExtraFieldTest(String name) { @@ -51,7 +51,7 @@ public class AsiExtraFieldTest extends TestCase implements UnixStat { a.setUserId(5); a.setGroupId(6); byte[] b = a.getLocalFileDataData(); - + // CRC manually calculated, sorry byte[] expect = {(byte)0xC6, 0x02, 0x78, (byte)0xB6, // CRC 0123, (byte)0x80, // mode @@ -87,7 +87,7 @@ public class AsiExtraFieldTest extends TestCase implements UnixStat { 5, 0, 6, 0}; // uid, gid AsiExtraField a = new AsiExtraField(); a.parseFromLocalFileData(data, 0, data.length); - assertEquals("length plain file", data.length, + assertEquals("length plain file", data.length, a.getLocalFileDataLength().getValue()); assertTrue("plain file, no link", !a.isLink()); assertTrue("plain file, no dir", !a.isDirectory()); @@ -102,7 +102,7 @@ public class AsiExtraFieldTest extends TestCase implements UnixStat { (byte)'t', (byte)'e', (byte)'s', (byte)'t'}; a = new AsiExtraField(); a.parseFromLocalFileData(data, 0, data.length); - assertEquals("length link", data.length, + assertEquals("length link", data.length, a.getLocalFileDataLength().getValue()); assertTrue("link, is link", a.isLink()); assertTrue("link, no dir", !a.isDirectory()); @@ -117,7 +117,7 @@ public class AsiExtraFieldTest extends TestCase implements UnixStat { 5, 0, 6, 0}; // uid, gid a = new AsiExtraField(); a.parseFromLocalFileData(data, 0, data.length); - assertEquals("length dir", data.length, + assertEquals("length dir", data.length, a.getLocalFileDataLength().getValue()); assertTrue("dir, no link", !a.isLink()); assertTrue("dir, is dir", a.isDirectory()); @@ -134,7 +134,7 @@ public class AsiExtraFieldTest extends TestCase implements UnixStat { a.parseFromLocalFileData(data, 0, data.length); fail("should raise bad CRC exception"); } catch (Exception e) { - assertEquals("bad CRC checksum 0 instead of ebf018e", + assertEquals("bad CRC checksum 0 instead of ebf018e", e.getMessage()); } } diff --git a/src/testcases/org/apache/tools/zip/ExtraFieldUtilsTest.java b/src/testcases/org/apache/tools/zip/ExtraFieldUtilsTest.java index ea6ec7bf7..62d5b7cf9 100644 --- a/src/testcases/org/apache/tools/zip/ExtraFieldUtilsTest.java +++ b/src/testcases/org/apache/tools/zip/ExtraFieldUtilsTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.zip; @@ -22,7 +22,7 @@ import junit.framework.TestCase; /** * JUnit 3 testcases for org.apache.tools.zip.ExtraFieldUtils. * - * @author Stefan Bodewig + * @author Stefan Bodewig */ public class ExtraFieldUtilsTest extends TestCase implements UnixStat { public ExtraFieldUtilsTest(String name) { @@ -49,11 +49,11 @@ public class ExtraFieldUtilsTest extends TestCase implements UnixStat { System.arraycopy(a.getHeaderId().getBytes(), 0, data, 0, 2); System.arraycopy(a.getLocalFileDataLength().getBytes(), 0, data, 2, 2); System.arraycopy(aLocal, 0, data, 4, aLocal.length); - System.arraycopy(dummy.getHeaderId().getBytes(), 0, data, + System.arraycopy(dummy.getHeaderId().getBytes(), 0, data, 4+aLocal.length, 2); - System.arraycopy(dummy.getLocalFileDataLength().getBytes(), 0, data, + System.arraycopy(dummy.getLocalFileDataLength().getBytes(), 0, data, 4+aLocal.length+2, 2); - System.arraycopy(dummyLocal, 0, data, + System.arraycopy(dummyLocal, 0, data, 4+aLocal.length+4, dummyLocal.length); } @@ -68,7 +68,7 @@ public class ExtraFieldUtilsTest extends TestCase implements UnixStat { assertEquals("mode field 1", 040755, ((AsiExtraField) ze[0]).getMode()); assertTrue("type field 2", ze[1] instanceof UnrecognizedExtraField); - assertEquals("data length field 2", 0, + assertEquals("data length field 2", 0, ze[1].getLocalFileDataLength().getValue()); byte[] data2 = new byte[data.length-1]; @@ -77,7 +77,7 @@ public class ExtraFieldUtilsTest extends TestCase implements UnixStat { ExtraFieldUtils.parse(data2); fail("data should be invalid"); } catch (Exception e) { - assertEquals("message", + assertEquals("message", "data starting at "+(4+aLocal.length)+" is in unknown format", e.getMessage()); } @@ -87,28 +87,28 @@ public class ExtraFieldUtilsTest extends TestCase implements UnixStat { * Test merge methods */ public void testMerge() { - byte[] local = + byte[] local = ExtraFieldUtils.mergeLocalFileDataData(new ZipExtraField[] {a, dummy}); assertEquals("local length", data.length, local.length); for (int i=0; i<local.length; i++) { assertEquals("local byte "+i, data[i], local[i]); } - + byte[] dummyCentral = dummy.getCentralDirectoryData(); byte[] data2 = new byte[4 + aLocal.length + 4 + dummyCentral.length]; System.arraycopy(data, 0, data2, 0, 4 + aLocal.length + 2); - System.arraycopy(dummy.getCentralDirectoryLength().getBytes(), 0, + System.arraycopy(dummy.getCentralDirectoryLength().getBytes(), 0, data2, 4+aLocal.length+2, 2); - System.arraycopy(dummyCentral, 0, data2, + System.arraycopy(dummyCentral, 0, data2, 4+aLocal.length+4, dummyCentral.length); - byte[] central = + byte[] central = ExtraFieldUtils.mergeCentralDirectoryData(new ZipExtraField[] {a, dummy}); assertEquals("central length", data2.length, central.length); for (int i=0; i<central.length; i++) { assertEquals("central byte "+i, data2[i], central[i]); } - + } } diff --git a/src/testcases/org/apache/tools/zip/ZipEntryTest.java b/src/testcases/org/apache/tools/zip/ZipEntryTest.java index fd42fb9ac..aad14cf9d 100644 --- a/src/testcases/org/apache/tools/zip/ZipEntryTest.java +++ b/src/testcases/org/apache/tools/zip/ZipEntryTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001-2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.zip; @@ -22,7 +22,7 @@ import junit.framework.TestCase; /** * JUnit 3 testcases for org.apache.tools.zip.ZipEntry. * - * @author Stefan Bodewig + * @author Stefan Bodewig */ public class ZipEntryTest extends TestCase { @@ -90,13 +90,13 @@ public class ZipEntryTest extends TestCase { assertEquals(0, ze.getPlatform()); ze.setUnixMode(0755); assertEquals(3, ze.getPlatform()); - assertEquals(0755, + assertEquals(0755, (ze.getExternalAttributes() >> 16) & 0xFFFF); assertEquals(0, ze.getExternalAttributes() & 0xFFFF); ze.setUnixMode(0444); assertEquals(3, ze.getPlatform()); - assertEquals(0444, + assertEquals(0444, (ze.getExternalAttributes() >> 16) & 0xFFFF); assertEquals(1, ze.getExternalAttributes() & 0xFFFF); @@ -104,13 +104,13 @@ public class ZipEntryTest extends TestCase { assertEquals(0, ze.getPlatform()); ze.setUnixMode(0777); assertEquals(3, ze.getPlatform()); - assertEquals(0777, + assertEquals(0777, (ze.getExternalAttributes() >> 16) & 0xFFFF); assertEquals(0x10, ze.getExternalAttributes() & 0xFFFF); ze.setUnixMode(0577); assertEquals(3, ze.getPlatform()); - assertEquals(0577, + assertEquals(0577, (ze.getExternalAttributes() >> 16) & 0xFFFF); assertEquals(0x11, ze.getExternalAttributes() & 0xFFFF); } diff --git a/src/testcases/org/apache/tools/zip/ZipLongTest.java b/src/testcases/org/apache/tools/zip/ZipLongTest.java index 94b4d308f..a8d88e5d4 100644 --- a/src/testcases/org/apache/tools/zip/ZipLongTest.java +++ b/src/testcases/org/apache/tools/zip/ZipLongTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.zip; @@ -22,7 +22,7 @@ import junit.framework.TestCase; /** * JUnit 3 testcases for org.apache.tools.zip.ZipLong. * - * @author Stefan Bodewig + * @author Stefan Bodewig */ public class ZipLongTest extends TestCase { diff --git a/src/testcases/org/apache/tools/zip/ZipShortTest.java b/src/testcases/org/apache/tools/zip/ZipShortTest.java index 93b0acefe..6e560f646 100644 --- a/src/testcases/org/apache/tools/zip/ZipShortTest.java +++ b/src/testcases/org/apache/tools/zip/ZipShortTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.tools.zip; @@ -22,7 +22,7 @@ import junit.framework.TestCase; /** * JUnit 3 testcases for org.apache.tools.zip.ZipShort. * - * @author Stefan Bodewig + * @author Stefan Bodewig */ public class ZipShortTest extends TestCase { diff --git a/src/testcases/org/example/junit/Output.java b/src/testcases/org/example/junit/Output.java index ee551de3e..b7a6e20bb 100644 --- a/src/testcases/org/example/junit/Output.java +++ b/src/testcases/org/example/junit/Output.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.example.junit; diff --git a/src/testcases/org/example/junit/ThreadedOutput.java b/src/testcases/org/example/junit/ThreadedOutput.java index 437f35ce2..4474c6655 100644 --- a/src/testcases/org/example/junit/ThreadedOutput.java +++ b/src/testcases/org/example/junit/ThreadedOutput.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2002,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.example.junit; diff --git a/src/testcases/org/example/tasks/TaskdefTestContainerTask.java b/src/testcases/org/example/tasks/TaskdefTestContainerTask.java index a03c90ab0..91d8d6d82 100644 --- a/src/testcases/org/example/tasks/TaskdefTestContainerTask.java +++ b/src/testcases/org/example/tasks/TaskdefTestContainerTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.example.tasks; diff --git a/src/testcases/org/example/tasks/TaskdefTestSimpleTask.java b/src/testcases/org/example/tasks/TaskdefTestSimpleTask.java index 8ebd53022..7dd4b3a39 100644 --- a/src/testcases/org/example/tasks/TaskdefTestSimpleTask.java +++ b/src/testcases/org/example/tasks/TaskdefTestSimpleTask.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.example.tasks; @@ -27,15 +27,15 @@ public class TaskdefTestSimpleTask extends Task { private String message = null; public void setMessage(String s) {message = s;} } - + public TaskdefTestSimpleTask() {} - + private Echo echo; public Echo createEcho() { echo = new Echo(); return echo; } - + public void execute() { log("simpletask: "+echo.message, Project.MSG_INFO); } diff --git a/src/testcases/org/example/types/TypedefTestType.java b/src/testcases/org/example/types/TypedefTestType.java index 72429681a..915ebea9f 100644 --- a/src/testcases/org/example/types/TypedefTestType.java +++ b/src/testcases/org/example/types/TypedefTestType.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2001,2004 Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +12,7 @@ * 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.example.types; |