You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by jh...@apache.org on 2008/11/11 07:24:43 UTC
svn commit: r712959 - in /ant/sandbox/javafront:
src/main/org/apache/ant/javafront/TaskExec.java taskexec.bat
Author: jhm
Date: Mon Nov 10 22:24:43 2008
New Revision: 712959
URL: http://svn.apache.org/viewvc?rev=712959&view=rev
Log:
- activate Ivy-Download on Windows
- use %START% in the Ivy example
- whitespaces in Java
- deactivate logging in Java
Modified:
ant/sandbox/javafront/src/main/org/apache/ant/javafront/TaskExec.java
ant/sandbox/javafront/taskexec.bat
Modified: ant/sandbox/javafront/src/main/org/apache/ant/javafront/TaskExec.java
URL: http://svn.apache.org/viewvc/ant/sandbox/javafront/src/main/org/apache/ant/javafront/TaskExec.java?rev=712959&r1=712958&r2=712959&view=diff
==============================================================================
--- ant/sandbox/javafront/src/main/org/apache/ant/javafront/TaskExec.java (original)
+++ ant/sandbox/javafront/src/main/org/apache/ant/javafront/TaskExec.java Mon Nov 10 22:24:43 2008
@@ -94,11 +94,12 @@
if (arg.equals("+")) {
nextIs = NextStatementIs.TAG;
} else if (arg.equals("-")) {
- if (text.length() > 0) {
- debug("XXSTORE: " + text.toString());
+ // Closing text statements and the last opened tag.
+ if (text.length() > 0) {
+ debug("STORE: " + text.toString());
current.withNestedText(text.toString());
text = new StringBuilder();
- }
+ }
debug("CLOSE: " + tags.pop());
current = tags.peek();
debug("CURRENT now: " + current);
@@ -156,7 +157,7 @@
}
if (!(nextIs == NextStatementIs.TEXT) && text.length()>0) {
// We have stored and no further text, so add it to the element.
- debug("XXSTORE: " + text.toString());
+ debug("STORE: " + text.toString());
current.withNestedText(text.toString());
text = new StringBuilder();
}
@@ -201,7 +202,7 @@
/** Debugging on or off */
- private boolean debug = true;
+ private boolean debug = false;
/**
* Prints a message.
Modified: ant/sandbox/javafront/taskexec.bat
URL: http://svn.apache.org/viewvc/ant/sandbox/javafront/taskexec.bat?rev=712959&r1=712958&r2=712959&view=diff
==============================================================================
--- ant/sandbox/javafront/taskexec.bat (original)
+++ ant/sandbox/javafront/taskexec.bat Mon Nov 10 22:24:43 2008
@@ -99,19 +99,17 @@
echo ===============================================================================================
-echo XML: ^<ivy:retrieve xmlns:ivy="antlib:org.apache.ivy.ant" organisation="junit" module="junit" inline="true" pattern="_ivy/[artifact].[ext]"/^>
+echo XML: ^<ivy:retrieve xmlns:ivy="antlib:org.apache.ivy.ant"
+echo organisation="junit" module="junit" inline="true" pattern="_ivy/[artifact].[ext]"/^>
echo CMD: -lib path-to-ivy.jar
echo -xmlns:ivy=antlib:org.apache.ivy.ant
echo ivy:retrieve organisation junit module junit inline true pattern _ivy/[artifact].[ext]
echo -----------------------------------------------------------------------------------------------
md _ivy
echo ------ First we ^<get^> Ivy -----
-rem %START% get dest _ivy/ivy.jar src http://people.apache.org/~xavier/ivy/ivy-trunk.jar
+%START% get dest _ivy/ivy.jar src http://people.apache.org/~xavier/ivy/ivy-trunk.jar
echo ------ Then we use Ivy to retrieve JUnit -----
-call ant ^
- -lib build\classes -lib _ivy ^
- -main org.apache.ant.javafront.TaskExec ^
- -xmlns:ivy=antlib:org.apache.ivy.ant ^
+%START% -lib _ivy -xmlns:ivy antlib:org.apache.ivy.ant ^
ivy:retrieve ^
organisation junit ^
module junit ^