Browse Source

Copyright fix; minor message corrections.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271126 13f79535-47bb-0310-9956-ffa450edef68
master
Magesh Umasankar 23 years ago
parent
commit
9b1632dc47
2 changed files with 13 additions and 13 deletions
  1. +8
    -8
      src/main/org/apache/tools/ant/UnknownElement.java
  2. +5
    -5
      src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java

+ 8
- 8
src/main/org/apache/tools/ant/UnknownElement.java View File

@@ -1,7 +1,7 @@
/* /*
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* *
* Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved. * reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -235,13 +235,13 @@ public class UnknownElement extends Task {
+ " libraries, or download a release version from apache.org" +lSep + " libraries, or download a release version from apache.org" +lSep
+ " - The build file was written for a later version of Ant" +lSep + " - The build file was written for a later version of Ant" +lSep
+ " Fix: upgrade to at least the latest release version of Ant" +lSep + " Fix: upgrade to at least the latest release version of Ant" +lSep
+ lSep
+ "Remember that for JAR files to be visible to ant tasks implemented" +lSep
+ "in ANT_HOME/lib, the files must be in the same directory or on the" +lSep
+ "classpath"+ lSep
+ lSep
+ "Please do not file bug reports on this problem, nor email the" +lSep
+ "ant mailing lists, until all of these causes have been explored," +lSep
+ lSep
+ "Remember that for JAR files to be visible to Ant tasks implemented" +lSep
+ "in ANT_HOME/lib, the files must be in the same directory or on the" +lSep
+ "classpath"+ lSep
+ lSep
+ "Please neither file bug reports on this problem, nor email the" +lSep
+ "Ant mailing lists, until all of these causes have been explored," +lSep
+ "as this is not an Ant bug."; + "as this is not an Ant bug.";






+ 5
- 5
src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java View File

@@ -1,7 +1,7 @@
/* /*
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* *
* Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved. * reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -64,7 +64,7 @@ import java.io.File;
/** /**
* JUnit 3 testcases for org.apache.tools.ant.CommandlineJava * JUnit 3 testcases for org.apache.tools.ant.CommandlineJava
* *
* @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
* @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
*/ */
public class CommandlineJavaTest extends TestCase { public class CommandlineJavaTest extends TestCase {


@@ -97,7 +97,7 @@ public class CommandlineJavaTest extends TestCase {
*/ */
assertEquals("no classpath", "-Djava.compiler=NONE", s[1]); assertEquals("no classpath", "-Djava.compiler=NONE", s[1]);
assertEquals("no classpath", "junit.textui.TestRunner", s[2]); assertEquals("no classpath", "junit.textui.TestRunner", s[2]);
assertEquals("no classpath",
assertEquals("no classpath",
"org.apache.tools.ant.CommandlineJavaTest", s[3]); "org.apache.tools.ant.CommandlineJavaTest", s[3]);
try { try {
CommandlineJava c2 = (CommandlineJava) c.clone(); CommandlineJava c2 = (CommandlineJava) c.clone();
@@ -112,11 +112,11 @@ public class CommandlineJavaTest extends TestCase {
// assertEquals("with classpath", "java", s[0]); // assertEquals("with classpath", "java", s[0]);
assertEquals("with classpath", "-Djava.compiler=NONE", s[1]); assertEquals("with classpath", "-Djava.compiler=NONE", s[1]);
assertEquals("with classpath", "-classpath", s[2]); assertEquals("with classpath", "-classpath", s[2]);
assertTrue("junit.jar contained",
assertTrue("junit.jar contained",
s[3].indexOf("junit.jar"+java.io.File.pathSeparator) >= 0); s[3].indexOf("junit.jar"+java.io.File.pathSeparator) >= 0);
assertTrue("ant.jar contained", s[3].endsWith("ant.jar")); assertTrue("ant.jar contained", s[3].endsWith("ant.jar"));
assertEquals("with classpath", "junit.textui.TestRunner", s[4]); assertEquals("with classpath", "junit.textui.TestRunner", s[4]);
assertEquals("with classpath",
assertEquals("with classpath",
"org.apache.tools.ant.CommandlineJavaTest", s[5]); "org.apache.tools.ant.CommandlineJavaTest", s[5]);
} }




Loading…
Cancel
Save