Author: bodewig
Date: Mon Nov 10 08:45:48 2008
New Revision: 712690
URL: http://svn.apache.org/viewvc?rev=712690&view=rev
Log:
append text to the correct element
Modified:
ant/sandbox/javafront/src/main/org/apache/ant/javafront/TaskExec.java
ant/sandbox/javafront/taskexec.sh
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=712690&r1=712689&r2=712690&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 08:45:48 2008
@@ -94,8 +94,14 @@
if (arg.equals("+")) {
nextIs = NextStatementIs.TAG;
} else if (arg.equals("-")) {
+ if (text.length() > 0) {
+ debug("XXSTORE: " + text.toString());
+ current.withNestedText(text.toString());
+ text = new StringBuilder();
+ }
debug("CLOSE: " + tags.pop());
current = tags.peek();
+ debug("CURRENT now: " + current);
nextIs = NextStatementIs.ATTRIBUTE;
} else if (arg.equals("#")) {
nextIs = NextStatementIs.TEXT;
Modified: ant/sandbox/javafront/taskexec.sh
URL:
http://svn.apache.org/viewvc/ant/sandbox/javafront/taskexec.sh?rev=712690&r1=712689&r2=712690&view=diff
==============================================================================
--- ant/sandbox/javafront/taskexec.sh (original)
+++ ant/sandbox/javafront/taskexec.sh Mon Nov 10 08:45:48 2008
@@ -105,7 +105,7 @@
echo
'---------------------------------------------------------------------------------------------'
mkdir _ivy
echo "------ First we '<get>' Ivy -----"
-rem %START% get dest _ivy/ivy.jar src
http://people.apache.org/~xavier/ivy/ivy-trunk.jar
+StartAnt get dest _ivy/ivy.jar src
http://people.apache.org/~xavier/ivy/ivy-trunk.jar
echo '------ Then we use Ivy to retrieve JUnit -----'
ant -lib build/classes -lib _ivy -main org.apache.ant.javafront.TaskExec
-xmlns:ivy=antlib:org.apache.ivy.ant ivy:retrieve organisation junit module
junit pattern _ivy/[artifact].[ext] inline true
