DO NOT REPLY [Bug 25546] - Option -propertyfile don't work right.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25546. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25546 Option -propertyfile don't work right. [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Additional Comments From [EMAIL PROTECTED] 2003-12-16 08:24 --- Dup of second part *** This bug has been marked as a duplicate of 18732 *** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18732] - expand properties during -propertyfile processing
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18732. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18732 expand properties during -propertyfile processing [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2003-12-16 08:24 --- *** Bug 25546 has been marked as a duplicate of this bug. *** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/CoreTasks recorder.html
peterreilly2003/12/16 00:35:33
Modified:docs/manual/CoreTasks recorder.html
Log:
Default value of append attribute for record task documented incorrectly
PR: 25544
Obtained from: John McDonnell
Revision ChangesPath
1.10 +1 -1 ant/docs/manual/CoreTasks/recorder.html
Index: recorder.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/recorder.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- recorder.html 4 Sep 2002 11:05:16 - 1.9
+++ recorder.html 16 Dec 2003 08:35:33 - 1.10
@@ -50,7 +50,7 @@
td valign=topappend/td
td valign=topShould the recorder append to a file, or create a new
one? This is only applicable the first time this task is called for
-this file. [Values = {yes|no}, Default=yes]/td
+this file. [Values = {yes|no}, Default=no]/td
td align=center valign=middleno/td
/tr
tr
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/CoreTasks recorder.html
peterreilly2003/12/16 00:36:09
Modified:docs/manual/CoreTasks Tag: ANT_16_BRANCH recorder.html
Log:
sync with HEAD
Revision ChangesPath
No revision
No revision
1.9.2.2 +1 -1 ant/docs/manual/CoreTasks/recorder.html
Index: recorder.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/recorder.html,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- recorder.html 9 Oct 2003 21:01:07 - 1.9.2.1
+++ recorder.html 16 Dec 2003 08:36:09 - 1.9.2.2
@@ -51,7 +51,7 @@
td valign=topappend/td
td valign=topShould the recorder append to a file, or create a new
one? This is only applicable the first time this task is called for
-this file. [Values = {yes|no}, Default=yes]/td
+this file. [Values = {yes|no}, Default=no]/td
td align=center valign=middleno/td
/tr
tr
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 25544] - record task overwrites existing log file (doc says it appends)
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25544. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25544 record task overwrites existing log file (doc says it appends) [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2003-12-16 08:37 --- Thanks for the report, the documentation has now been updated. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/docs/manual/CoreTasks recorder.html
Maybe we should also merge it into the 1.5 branch so that the online manual is correct? Maybe it's not worth the effort if the online manual switches to the 1.6 version this week anyway. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: problems with logging (message priority level)
On Mon, 15 Dec 2003, Peter Reilly [EMAIL PROTECTED] wrote: I think we should change the priority in this case to warning. +1 This is of course not backward compatible. So we have to document it. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 25540] - echo hyperlinks
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25540. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25540 echo hyperlinks --- Additional Comments From [EMAIL PROTECTED] 2003-12-16 10:00 --- The reason we CDATA stuff out is that too much other stuff comes out the log that needs escaping -things like angle brackets. If you need raw XML, you will probably need to fiddle with the XMLlogger source to turn that behaviour on... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 25564] New: - CVS tagdiff does not escape XML characters
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25564. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25564 CVS tagdiff does not escape XML characters Summary: CVS tagdiff does not escape XML characters Product: Ant Version: 1.6Beta Platform: PC OS/Version: Linux Status: NEW Severity: Normal Priority: Other Component: Core tasks AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] I go the following exception when performing a 'style' on CVSTagDiff [style] Using class org.apache.tools.ant.taskdefs.optional.TraXLiaison [style] Processing .diff.xml to Diff.html [style] Loading stylesheet /opt/ant/etc/tagdiff.xsl [style] .diff.xml:288:49: Fatal Error! The reference to entity PRXPRESS.doc must end with the ';' delimiter. [style] Failed to process .diff.xml [antcall] Exiting build.xml BUILD FAILED build.xml:77: Following error occured while executing this line build.xml:118: Fatal error during transformation at org.apache.tools.ant.ProjectHelper.addLocationToBuildException(ProjectHelper.java:574) at org.apache.tools.ant.taskdefs.Ant.execute(Ant.java:422) at org.apache.tools.ant.taskdefs.CallTarget.execute(CallTarget.java:144) at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:306) at org.apache.tools.ant.Task.perform(Task.java:401) at org.apache.tools.ant.Target.execute(Target.java:338) at org.apache.tools.ant.Target.performTasks(Target.java:365) at org.apache.tools.ant.Project.executeTarget(Project.java:1237) at org.apache.tools.ant.Project.executeTargets(Project.java:1094) at org.apache.tools.ant.Main.runBuild(Main.java:669) at org.apache.tools.ant.Main.startAnt(Main.java:220) at org.apache.tools.ant.launch.Launcher.run(Launcher.java:215) at org.apache.tools.ant.launch.Launcher.main(Launcher.java:90) Looking at the XML file that was created entry file namedocumentation/bulk/sandp/SPRXPRESS.doc/name revision1.1/revision /file /entry As you can see, the should be escaped; this used to work on Ant 1.5.4. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 25564] - CVS tagdiff does not escape XML characters
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25564. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25564 CVS tagdiff does not escape XML characters --- Additional Comments From [EMAIL PROTECTED] 2003-12-16 12:19 --- To elaborate about it working in 1.5: The filename that is causing the problem is a new file, these were not being output due to cvs version incompatibility (fixed in revision 1.18). So the file was never output, therefore the bug was never encountered in 1.5 The writeTagDiff and writeTagEntry methods do not use an XML API to generate the output. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/docs/manual/CoreTasks recorder.html
Stefan Bodewig wrote: Maybe we should also merge it into the 1.5 branch so that the online manual is correct? Maybe it's not worth the effort if the online manual switches to the 1.6 version this week anyway. Stefan Hi Stefan, the online manual will switch to 1.6 this week. Cheers, Antoine - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual cover.html credits.html
antoine 2003/12/16 06:48:11 Modified:.Tag: ANT_16_BRANCH ReleaseInstructions build.xml docs/manual Tag: ANT_16_BRANCH cover.html credits.html Log: Preparation for upcoming release. Revision ChangesPath No revision No revision 1.17.2.4 +5 -2 ant/ReleaseInstructions Index: ReleaseInstructions === RCS file: /home/cvs/ant/ReleaseInstructions,v retrieving revision 1.17.2.3 retrieving revision 1.17.2.4 diff -u -r1.17.2.3 -r1.17.2.4 --- ReleaseInstructions 30 Sep 2003 13:06:32 - 1.17.2.3 +++ ReleaseInstructions 16 Dec 2003 14:48:10 - 1.17.2.4 @@ -141,8 +141,8 @@ file under /usr/local/apache2/logs 16. When the final beta is considered OK, propose a vote on [EMAIL PROTECTED] to -officially adopt the latest beta as the Ant 1.6 release. If it is passed, -(it usually does,) this would be labelled ANT_16 and built in a similar +officially adopt the latest beta as the Ant 1.6.0 release. If it is passed, +(it usually does,) this would be labelled ANT_160 and built in a similar fashion to the above process. 17. BUT @@ -162,6 +162,9 @@ 18. Change the links in /xdocs/bindownload.xml and /xdocs/srcdownload.xml, regenerate the HTML files, commit and update the site. + +Updating the site includes updating the online manual which should display +the manual of ant 1.6.0 instead of 1.5.4 As the mirrors may need some days to pick up the new release, you may want to add a note to that effect to the pages and remove it a few 1.392.2.14 +2 -2 ant/build.xml Index: build.xml === RCS file: /home/cvs/ant/build.xml,v retrieving revision 1.392.2.13 retrieving revision 1.392.2.14 diff -u -r1.392.2.13 -r1.392.2.14 --- build.xml 4 Dec 2003 22:38:16 - 1.392.2.13 +++ build.xml 16 Dec 2003 14:48:10 - 1.392.2.14 @@ -25,8 +25,8 @@ -- property name=Name value=Apache Ant/ property name=name value=ant/ - property name=version value=1.6beta3/ - property name=manifest-version value=1.6/ + property name=version value=1.6.0/ + property name=manifest-version value=1.6.0/ property name=bootstrap.jar value=ant-bootstrap.jar/ property name=ant.package value=org/apache/tools/ant/ No revision No revision 1.6.2.3 +2 -2 ant/docs/manual/cover.html Index: cover.html === RCS file: /home/cvs/ant/docs/manual/cover.html,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -u -r1.6.2.2 -r1.6.2.3 --- cover.html9 Oct 2003 21:01:14 - 1.6.2.2 +++ cover.html16 Dec 2003 14:48:11 - 1.6.2.3 @@ -9,8 +9,8 @@ body bgcolor=#FF div align=center h1img src=../images/ant_logo_large.gif width=190 height=120/h1 - h1Apache Ant 1.6 Manual/h1 - p align=leftThis is the manual for version 1.6 of + h1Apache Ant 1.6.0 Manual/h1 + p align=leftThis is the manual for version 1.6.0 of a href=http://ant.apache.org/index.html;Apache Ant/a. If your version of Ant (as verified with ttant -version/tt) is older or newer than this 1.23.2.4 +2 -2 ant/docs/manual/credits.html Index: credits.html === RCS file: /home/cvs/ant/docs/manual/credits.html,v retrieving revision 1.23.2.3 retrieving revision 1.23.2.4 diff -u -r1.23.2.3 -r1.23.2.4 --- credits.html 16 Oct 2003 21:13:29 - 1.23.2.3 +++ credits.html 16 Dec 2003 14:48:11 - 1.23.2.4 @@ -45,7 +45,7 @@ /ul center -pVersion: 1.6br +pVersion: 1.6.0br $Id$/p /center hr - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Bug 25394: - OutofMemory when running lots of script tasks
I am writing this here because Nagoya seem to be down at the moment. (I cannot reach it) I am seeing a lost of between 2100KB and 2500KB for each call to one of my scripts that connect to the database. The memory hogging seems quite consistent. The memory is not been release even if the script runs inside an antcall. I.e., after returning from the ANT call, the memory does not get released. So, this may give some clues for people looking at this bug. I will try to see if I can find some more clues on what is going on. This happens when using beanshell as the scripting language. Jose Alberto -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: 10 December 2003 12:54 To: [EMAIL PROTECTED] Subject: DO NOT REPLY [Bug 25394] New: - OutofMemory when running lots of script tasks DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cg i?id=25394. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25394 OutofMemory when running lots of script tasks Summary: OutofMemory when running lots of script tasks Product: Ant Version: 1.6Beta Platform: All OS/Version: Other Status: NEW Severity: Normal Priority: Other Component: Optional Tasks AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] This is a regression from ANT1.5. I have a buildfile which needs to call multiple script tasks during the building process. The scripts are complex requiring database connections and such. In ANT1.5 the build runs without problems but in ANT1.6 it runs out of memory. We are talking about 100 script calls. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Bug 25564 - CVS tagdiff does not escape XML characters
Server is down at the moment, so I cannot add to
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25564
Hi All,
I have been looking through the problem source and the XML is generated by
hand with code like
writer.print(tagdiff );
if (mystartTag != null) {
writer.print(startTag=\ + mystartTag + \ );
} else {
writer.print(startDate=\ + mystartDate + \ );
}
if (myendTag != null) {
writer.print(endTag=\ + myendTag + \ );
} else {
writer.print(endDate=\ + myendDate + \ );
}
Which is all quite nasty.
Firstlly, the problem could be fixed by adding a CDATA to the offending
text, but this still leaves potential problems.
My favoured way of generating XML from a class is to extend XMLFilterImpl
and fire SAX events to a Transformer with no stylesheet and StreamResult
of the required output file, inspired by Cocoon 2.
Given that frequently the XML output of this task would be transformed to
HTML using taggdiff.xsl then the processing would be more efficient to use
that transformer from the outset; this would of course have to be optional
in order not to break existing build files.
The cvschangelog task is also guitly of handcrafting XML albeit using a
CDATA for certain elements, again this task is also frequently followed by
a style task.
CvsTagDiff extends AbstractCvsTask yet ChangeLogTask does not, but both
tasks are very similar, i.e:
execute cvs command
parse resultant file to memory
output memory contents to XML
And are both frequently followed by a style task, such similarity IMO
should be exploited.
Anyway, I am new to this open source apache stuff so appologies if I have
omitted and stages or information. I am happy to perform this work myself
of course.
Steve
Re: DynamicConfigurator namespace problem
Stefan Bodewig wrote:
On Fri, 12 Dec 2003, Christopher Lenz [EMAIL PROTECTED] wrote:
public class DynamicConfiguratorNS {
looks fine to me.
I don't think this interface should extend DynamicConfigurator.
Same here.
I'd also like Ant to pass element and attribute names in as they are,
i.e. without changing their case in any way.
I have code for this, however I am uneasy about placing it
it ANT for 1.6, without a new beta release.
The interface is:
public interface DynamicConfiguratorNS {
void setDynamicAttribute(String uri, String qualifiedName,
String value)
throws BuildException;
Object createDynamicElement(
String uri, String localName) throws BuildException;
}
The prefix is not set. - It is possible to get it for the element
but not (without more major changes) for the attributes.
One issue with the patch is that if the namespace of
the attribute is the same as the element, the namespace URI
is replaced with a .
For an example:
public class DTest2 extends Task implements DynamicConfiguratorNS {
public Object createDynamicElement(
String uri,
String localName) {
System.out.println(Element { + uri +, + localName + });
return new DTest2();
}
public void setDynamicAttribute(
String uri,
String localName,
String value) {
System.out.println(Attribute { + uri +, + localName + });
}
}
dtest x=b ant:b=b xmlns:ant=antlib:org.apache.tools.ant/
will print:
Attribute {, x}
Attribute {antlib:org.apache.tools.ant, b}
and
dtest x=b ant:b=b xmlns:ant=antlib:org.apache.tools.ant
xmlns=antlib:org.apache.tools.ant/
will print
Attribute {, x}
Attribute {, b}
Another Namespace issue is the handling of the ant core uri by the
code. Currently the code sets this to at an early stage.
It however should be retained in the system (ie. whether
the namespace URI of an element is or antlib:org.apache.tools.ant).
For ant 1.6 (and beyond) we can make macrodef namespace independent,
without
this patch.
So for example:
macrodef name=example
element name=element/
sequential
element/
/sequential
/macrodef
In a antlib referred to by a namespace prefix x, the following
would work:
x:example
x:element
echoHello world/echo
/x:element
/x:example
And the following would work:
x:example
element
echoHello world/echo
/element
/x:example
Peter
Index: src/main/org/apache/tools/ant/IntrospectionHelper.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/IntrospectionHelper.java,v
retrieving revision 1.69
diff -u -r1.69 IntrospectionHelper.java
--- src/main/org/apache/tools/ant/IntrospectionHelper.java 11 Dec 2003 17:21:05 - 1.69
+++ src/main/org/apache/tools/ant/IntrospectionHelper.java 16 Dec 2003 19:27:25 -
@@ -517,13 +517,24 @@
public void setAttribute(Project p, Object element, String attributeName,
String value) throws BuildException {
AttributeSetter as
-= (AttributeSetter) attributeSetters.get(attributeName);
+= (AttributeSetter) attributeSetters.get(
+attributeName.toLowerCase(Locale.US));
if (as == null) {
-if (element instanceof DynamicConfigurator) {
+if (element instanceof DynamicConfiguratorNS) {
+DynamicConfiguratorNS dc = (DynamicConfiguratorNS) element;
+dc.setDynamicAttribute(
+ProjectHelper.extractUriFromComponentName(attributeName),
+ProjectHelper.extractNameFromComponentName(attributeName),
+value);
+return;
+} else if (element instanceof DynamicConfigurator) {
DynamicConfigurator dc = (DynamicConfigurator) element;
-dc.setDynamicAttribute(attributeName, value);
+dc.setDynamicAttribute(attributeName.toLowerCase(Locale.US), value);
return;
} else {
+if (attributeName.indexOf(':') != -1) {
+return; // Ignore attribute from unknown uri's
+}
String msg = getElementName(p, element)
+ doesn't support the \ + attributeName
+ \ attribute.;
@@ -543,6 +554,7 @@
throw new BuildException(t);
}
}
+
/**
* Adds PCDATA to an element, using the element's
@@ -611,6 +623,9 @@
if (nc == null) {
nc = createAddTypeCreator(project, parent, elementName);
}
+if (nc == null parent instanceof DynamicConfiguratorNS) {
+throw new BuildException(SHOULD NOT BE HERE);
+}
if (nc == null parent instanceof DynamicConfigurator) {
DynamicConfigurator dc = (DynamicConfigurator) parent;
final Object nestedElement =
Re: Release date of ant 1.6
Antoine Lévy-Lambert wrote: Stefan Bodewig wrote: What about the name? 1.6 or 1.6.0? I tend to prefer 1.6.0 as we know pretty well that a 1.6.1 is going to happen. 1.6.0 is fine. :-D I would prefer 1.6 8-) Peter - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs MacroInstance.java
peterreilly2003/12/16 13:13:15
Modified:src/main/org/apache/tools/ant/taskdefs MacroInstance.java
Log:
allow macrodef to work with namespace free version of dynamicconfigator
Revision ChangesPath
1.13 +1 -4
ant/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java
Index: MacroInstance.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- MacroInstance.java3 Dec 2003 13:16:01 - 1.12
+++ MacroInstance.java16 Dec 2003 21:13:15 - 1.13
@@ -129,13 +129,10 @@
private Map getNsElements() {
if (nsElements == null) {
nsElements = new HashMap();
-String myUri = ProjectHelper.extractUriFromComponentName(
-getTaskType());
for (Iterator i = macroDef.getElements().entrySet().iterator();
i.hasNext();) {
Map.Entry entry = (Map.Entry) i.next();
-nsElements.put(ProjectHelper.genComponentName(
- myUri, (String) entry.getKey()),
+nsElements.put((String) entry.getKey(),
entry.getValue());
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs MacroInstance.java
peterreilly2003/12/16 13:19:26
Modified:src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
MacroInstance.java
Log:
sync with HEAD
Revision ChangesPath
No revision
No revision
1.5.2.8 +1 -4
ant/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java
Index: MacroInstance.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java,v
retrieving revision 1.5.2.7
retrieving revision 1.5.2.8
diff -u -r1.5.2.7 -r1.5.2.8
--- MacroInstance.java3 Dec 2003 13:22:30 - 1.5.2.7
+++ MacroInstance.java16 Dec 2003 21:19:26 - 1.5.2.8
@@ -129,13 +129,10 @@
private Map getNsElements() {
if (nsElements == null) {
nsElements = new HashMap();
-String myUri = ProjectHelper.extractUriFromComponentName(
-getTaskType());
for (Iterator i = macroDef.getElements().entrySet().iterator();
i.hasNext();) {
Map.Entry entry = (Map.Entry) i.next();
-nsElements.put(ProjectHelper.genComponentName(
- myUri, (String) entry.getKey()),
+nsElements.put((String) entry.getKey(),
entry.getValue());
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: Bug 25564 - CVS tagdiff does not escape XML characters
Hi Steven,
I will address this type of bug report once 1.6 is released.
Right now, I prefer to concentrate my energy on getting the release done
right.
Cheers,
Antoine
- Original Message -
From: [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Sent: Tuesday, December 16, 2003 7:21 PM
Subject: Bug 25564 - CVS tagdiff does not escape XML characters
Server is down at the moment, so I cannot add to
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25564
Hi All,
I have been looking through the problem source and the XML is generated by
hand with code like
writer.print(tagdiff );
if (mystartTag != null) {
writer.print(startTag=\ + mystartTag + \ );
} else {
writer.print(startDate=\ + mystartDate + \ );
}
if (myendTag != null) {
writer.print(endTag=\ + myendTag + \ );
} else {
writer.print(endDate=\ + myendDate + \ );
}
Which is all quite nasty.
Firstlly, the problem could be fixed by adding a CDATA to the offending
text, but this still leaves potential problems.
My favoured way of generating XML from a class is to extend XMLFilterImpl
and fire SAX events to a Transformer with no stylesheet and StreamResult
of the required output file, inspired by Cocoon 2.
Given that frequently the XML output of this task would be transformed to
HTML using taggdiff.xsl then the processing would be more efficient to use
that transformer from the outset; this would of course have to be optional
in order not to break existing build files.
The cvschangelog task is also guitly of handcrafting XML albeit using a
CDATA for certain elements, again this task is also frequently followed by
a style task.
CvsTagDiff extends AbstractCvsTask yet ChangeLogTask does not, but both
tasks are very similar, i.e:
execute cvs command
parse resultant file to memory
output memory contents to XML
And are both frequently followed by a style task, such similarity IMO
should be exploited.
Anyway, I am new to this open source apache stuff so appologies if I have
omitted and stages or information. I am happy to perform this work myself
of course.
Steve
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: 1.6 or 1.6.0 [was Release date of ant 1.6]
Do we need to vote concerning 1.6 or 1.6.0 ? For me it is indifferent, I begun doing some small changes on the assumption that we would choose 1.6.0 Cheers, Antoine - Original Message - From: Peter Reilly [EMAIL PROTECTED] To: Ant Developers List [EMAIL PROTECTED] Sent: Tuesday, December 16, 2003 10:05 PM Subject: Re: Release date of ant 1.6 Antoine Lévy-Lambert wrote: Stefan Bodewig wrote: What about the name? 1.6 or 1.6.0? I tend to prefer 1.6.0 as we know pretty well that a 1.6.1 is going to happen. 1.6.0 is fine. :-D I would prefer 1.6 8-) Peter - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: DynamicConfigurator namespace problem
Hi Peter,
How serious is the problem ?
Will we be able to fix the problem in a minor release without breaking the
backward compatibility ?
Cheers,
Antoine
- Original Message -
From: Peter Reilly [EMAIL PROTECTED]
To: Ant Developers List [EMAIL PROTECTED]
Sent: Tuesday, December 16, 2003 9:04 PM
Subject: Re: DynamicConfigurator namespace problem
Stefan Bodewig wrote:
On Fri, 12 Dec 2003, Christopher Lenz [EMAIL PROTECTED] wrote:
public class DynamicConfiguratorNS {
looks fine to me.
I don't think this interface should extend DynamicConfigurator.
Same here.
I'd also like Ant to pass element and attribute names in as they are,
i.e. without changing their case in any way.
I have code for this, however I am uneasy about placing it
it ANT for 1.6, without a new beta release.
The interface is:
public interface DynamicConfiguratorNS {
void setDynamicAttribute(String uri, String qualifiedName,
String value)
throws BuildException;
Object createDynamicElement(
String uri, String localName) throws BuildException;
}
The prefix is not set. - It is possible to get it for the element
but not (without more major changes) for the attributes.
One issue with the patch is that if the namespace of
the attribute is the same as the element, the namespace URI
is replaced with a .
For an example:
public class DTest2 extends Task implements DynamicConfiguratorNS {
public Object createDynamicElement(
String uri,
String localName) {
System.out.println(Element { + uri +, + localName + });
return new DTest2();
}
public void setDynamicAttribute(
String uri,
String localName,
String value) {
System.out.println(Attribute { + uri +, + localName + });
}
}
dtest x=b ant:b=b xmlns:ant=antlib:org.apache.tools.ant/
will print:
Attribute {, x}
Attribute {antlib:org.apache.tools.ant, b}
and
dtest x=b ant:b=b xmlns:ant=antlib:org.apache.tools.ant
xmlns=antlib:org.apache.tools.ant/
will print
Attribute {, x}
Attribute {, b}
Another Namespace issue is the handling of the ant core uri by the
code. Currently the code sets this to at an early stage.
It however should be retained in the system (ie. whether
the namespace URI of an element is or antlib:org.apache.tools.ant).
For ant 1.6 (and beyond) we can make macrodef namespace independent,
without
this patch.
So for example:
macrodef name=example
element name=element/
sequential
element/
/sequential
/macrodef
In a antlib referred to by a namespace prefix x, the following
would work:
x:example
x:element
echoHello world/echo
/x:element
/x:example
And the following would work:
x:example
element
echoHello world/echo
/element
/x:example
Peter
Index: src/main/org/apache/tools/ant/IntrospectionHelper.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/IntrospectionHelper.java,v
retrieving revision 1.69
diff -u -r1.69 IntrospectionHelper.java
--- src/main/org/apache/tools/ant/IntrospectionHelper.java 11 Dec 2003
17:21:05 - 1.69
+++ src/main/org/apache/tools/ant/IntrospectionHelper.java 16 Dec 2003
19:27:25 -
@@ -517,13 +517,24 @@
public void setAttribute(Project p, Object element, String
attributeName,
String value) throws BuildException {
AttributeSetter as
-= (AttributeSetter) attributeSetters.get(attributeName);
+= (AttributeSetter) attributeSetters.get(
+attributeName.toLowerCase(Locale.US));
if (as == null) {
-if (element instanceof DynamicConfigurator) {
+if (element instanceof DynamicConfiguratorNS) {
+DynamicConfiguratorNS dc = (DynamicConfiguratorNS)
element;
+dc.setDynamicAttribute(
+
ProjectHelper.extractUriFromComponentName(attributeName),
+
ProjectHelper.extractNameFromComponentName(attributeName),
+value);
+return;
+} else if (element instanceof DynamicConfigurator) {
DynamicConfigurator dc = (DynamicConfigurator) element;
-dc.setDynamicAttribute(attributeName, value);
+
dc.setDynamicAttribute(attributeName.toLowerCase(Locale.US), value);
return;
} else {
+if (attributeName.indexOf(':') != -1) {
+return; // Ignore attribute from unknown uri's
+}
String msg = getElementName(p, element)
+ doesn't support the \ + attributeName
+ \ attribute.;
@@ -543,6 +554,7 @@
