bodewig 2004/07/02 04:52:18
Modified: proposal/sandbox/dotnet/docs Tag: ANT_16_BRANCH index.html
msbuild.html
proposal/sandbox/dotnet/src/main/org/apache/tools/ant/util
Tag: ANT_16_BRANCH XMLFragment.java
Log:
merge
Revision Changes Path
No revision
No revision
1.2.2.2 +1 -1 ant/proposal/sandbox/dotnet/docs/index.html
Index: index.html
===================================================================
RCS file: /home/cvs/ant/proposal/sandbox/dotnet/docs/index.html,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- index.html 16 Apr 2004 09:15:31 -0000 1.2.2.1
+++ index.html 2 Jul 2004 11:52:18 -0000 1.2.2.2
@@ -14,7 +14,7 @@
<h2>Requirements</h2>
- <p><a href="http://ant.apache.org/bindownload.cgi";>Ant 1.6.x</a>
+ <p><a href="http://ant.apache.org/bindownload.cgi";>Ant 1.6.2</a>
is required.</p>
<h2>Installation</h2>
1.2.2.2 +1 -2 ant/proposal/sandbox/dotnet/docs/msbuild.html
Index: msbuild.html
===================================================================
RCS file: /home/cvs/ant/proposal/sandbox/dotnet/docs/msbuild.html,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- msbuild.html 16 Apr 2004 09:15:31 -0000 1.2.2.1
+++ msbuild.html 2 Jul 2004 11:52:18 -0000 1.2.2.2
@@ -15,8 +15,7 @@
<p>You can either use an existing build file or nest a build file
(snippet) as a child into the task. If you don't specify either,
- MSBuild's default build file search algorithm will apply. Nesting
- build file snippets is most probably not working correctly.</p>
+ MSBuild's default build file search algorithm will apply.</p>
<h3>Parameters</h3>
<table border="1" cellpadding="2" cellspacing="0">
No revision
No revision
1.1.2.2 +20 -16
ant/proposal/sandbox/dotnet/src/main/org/apache/tools/ant/util/Attic/XMLFragment.java
Index: XMLFragment.java
===================================================================
RCS file:
/home/cvs/ant/proposal/sandbox/dotnet/src/main/org/apache/tools/ant/util/Attic/XMLFragment.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- XMLFragment.java 16 Apr 2004 09:15:32 -0000 1.1.2.1
+++ XMLFragment.java 2 Jul 2004 11:52:18 -0000 1.1.2.2
@@ -24,7 +24,7 @@
import org.w3c.dom.Text;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DynamicConfigurator;
+import org.apache.tools.ant.DynamicConfiguratorNS;
import org.apache.tools.ant.ProjectHelper;
/**
@@ -38,7 +38,7 @@
*
* @since Ant 1.7
*/
-public class XMLFragment implements DynamicConfigurator {
+public class XMLFragment implements DynamicConfiguratorNS {
private Document doc;
private DocumentFragment fragment;
@@ -66,7 +66,7 @@
/**
* No attributes for the wrapping element.
*/
- public void setDynamicAttribute(String name, String value)
+ public void setDynamicAttribute(String uri, String name, String qName,
String value)
throws BuildException {
throw new BuildException("Attribute " + name + " is not supported.");
}
@@ -74,10 +74,8 @@
/**
* Creates a nested element.
*/
- public Object createDynamicElement(String name) {
- Element e = doc
- .createElementNS(ProjectHelper.extractUriFromComponentName(name),
-
ProjectHelper.extractNameFromComponentName(name));
+ public Object createDynamicElement(String uri, String name, String
qName) {
+ Element e = doc.createElementNS(uri, qName);
fragment.appendChild(e);
return new Child(e);
}
@@ -89,7 +87,7 @@
}
}
- public class Child implements DynamicConfigurator {
+ public class Child implements DynamicConfiguratorNS {
private Element e;
Child(Element e) {
@@ -106,19 +104,25 @@
/**
* Sets the attribute
*/
- public void setDynamicAttribute(String name, String value) {
- e.setAttribute(name, value);
+ public void setDynamicAttribute(
+ String uri, String name, String qName, String value) {
+ if (uri.equals("")) {
+ e.setAttribute(name, value);
+ } else {
+ e.setAttributeNS(uri, qName, value);
+ }
}
/**
* Creates a nested element.
*/
- public Object createDynamicElement(String name) {
- Element e2 = doc
- .createElementNS(ProjectHelper
- .extractUriFromComponentName(name),
- ProjectHelper
- .extractNameFromComponentName(name));
+ public Object createDynamicElement(String uri, String name, String
qName) {
+ Element e2 = null;
+ if (uri.equals("")) {
+ e2 = doc.createElement(name);
+ } else {
+ e2 = doc.createElementNS(uri, qName);
+ }
e.appendChild(e2);
return new Child(e2);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
