You are viewing a plain text version of this content. The canonical link for it is here.
Posted to easyant-commits@incubator.apache.org by jl...@apache.org on 2011/02/27 18:37:22 UTC
svn commit: r1075110 - in /incubator/easyant/core/trunk/src:
main/java/org/apache/easyant/core/ main/java/org/apache/easyant/core/parser/
main/java/org/apache/easyant/tasks/ test/java/org/apache/easyant/core/
Author: jlboudart
Date: Sun Feb 27 18:37:21 2011
New Revision: 1075110
URL: http://svn.apache.org/viewvc?rev=1075110&view=rev
Log:
fixing compilation errors (missing \n)
Modified:
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/BuildConfigurationHelper.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/EasyAntConfigParser.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/CheckResolver.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/SubModule.java
incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/EasyAntBaseTest.java
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/BuildConfigurationHelper.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/BuildConfigurationHelper.java?rev=1075110&r1=1075109&r2=1075110&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/BuildConfigurationHelper.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/BuildConfigurationHelper.java Sun Feb 27 18:37:21 2011
@@ -88,7 +88,7 @@ public class BuildConfigurationHelper {
* spaces.
*/
public static String removeSpaces(String confs) {
- return confs.replaceAll("\s", "");
+ return confs.replaceAll("\\s", "");
}
public static List<String> buildList(String conf) {
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java?rev=1075110&r1=1075109&r2=1075110&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java Sun Feb 27 18:37:21 2011
@@ -353,8 +353,7 @@ public class EasyAntMain implements AntM
String msg = "Ant's Main method is being handed "
+ "an option " + arg
+ " that is only for the launcher class."
- + "
-This can be caused by a version mismatch between "
+ + "\nThis can be caused by a version mismatch between "
+ "the ant script/.bat file and Ant itself.";
throw new BuildException(msg);
} else if (arg.equals("-autoproxy")) {
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/EasyAntConfigParser.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/EasyAntConfigParser.java?rev=1075110&r1=1075109&r2=1075110&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/EasyAntConfigParser.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/EasyAntConfigParser.java Sun Feb 27 18:37:21 2011
@@ -112,11 +112,9 @@ public class EasyAntConfigParser {
protected void addError(String msg) {
if (configUrl != null) {
- errors.add(msg + " in " + configUrl + "
-");
+ errors.add(msg + " in " + configUrl + "\n");
} else {
- errors.add(msg + "
-");
+ errors.add(msg + "\n");
}
}
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/CheckResolver.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/CheckResolver.java?rev=1075110&r1=1075109&r2=1075110&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/CheckResolver.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/CheckResolver.java Sun Feb 27 18:37:21 2011
@@ -43,14 +43,12 @@ public class CheckResolver extends IvyTa
StringBuilder sb = new StringBuilder();
sb.append("resolver ").append(resolverProperty);
sb.append(" does not exist in current project, please check your project ivysettings.xml file.");
- sb.append("
-");
+ sb.append("\n");
if (getDescription() != null) {
sb.append(resolver);
sb.append(" : ");
sb.append(getDescription());
- sb.append("
-");
+ sb.append("\n");
}
sb.append("Available resolvers : ");
sb.append(getSettings().getResolverNames().toString());
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/SubModule.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/SubModule.java?rev=1075110&r1=1075109&r2=1075110&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/SubModule.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/SubModule.java Sun Feb 27 18:37:21 2011
@@ -139,8 +139,7 @@ public class SubModule extends Task {
if (file.isDirectory()) {
if (verbose) {
subdirPath = file.getPath();
- log("Entering directory: " + subdirPath + "
-",
+ log("Entering directory: " + subdirPath + "\n",
Project.MSG_INFO);
}
file = new File(file, moduleFile);
@@ -148,15 +147,13 @@ public class SubModule extends Task {
directory = file.getParentFile();
execute(file, directory);
if (verbose && subdirPath != null) {
- log("Leaving directory: " + subdirPath + "
-",
+ log("Leaving directory: " + subdirPath + "\n",
Project.MSG_INFO);
}
} catch (RuntimeException ex) {
if (!(getProject().isKeepGoingMode())) {
if (verbose && subdirPath != null) {
- log("Leaving directory: " + subdirPath + "
-",
+ log("Leaving directory: " + subdirPath + "\n",
Project.MSG_INFO);
}
throw ex; // throw further
@@ -165,8 +162,7 @@ public class SubModule extends Task {
} catch (Throwable ex) {
if (!(getProject().isKeepGoingMode())) {
if (verbose && subdirPath != null) {
- log("Leaving directory: " + subdirPath + "
-",
+ log("Leaving directory: " + subdirPath + "\n",
Project.MSG_INFO);
}
throw new BuildException(ex);
@@ -192,8 +188,7 @@ public class SubModule extends Task {
}
}
if (verbose && subdirPath != null) {
- log("Leaving directory: " + subdirPath + "
-",
+ log("Leaving directory: " + subdirPath + "\n",
Project.MSG_INFO);
}
}
Modified: incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/EasyAntBaseTest.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/EasyAntBaseTest.java?rev=1075110&r1=1075109&r2=1075110&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/EasyAntBaseTest.java (original)
+++ incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/EasyAntBaseTest.java Sun Feb 27 18:37:21 2011
@@ -285,8 +285,7 @@ public abstract class EasyAntBaseTest ex
boolean cr = false;
for (int i = 0; i < buffer.length(); i++) {
char ch = buffer.charAt(i);
- if (ch == '
-') {
+ if (ch == '\r') {
cr = true;
continue;
}