svn commit: r709345 - in /ant/sandbox/javafront/src/main/org/apache/ant/javafront: builder/Tag.java builder/TagBuilder.java helper/JavaFrontHelper.java

[bodewig]

Author: bodewig
Date: Thu Oct 30 21:35:49 2008
New Revision: 709345

URL: http://svn.apache.org/viewvc?rev=709345&view=rev
Log:
Namespace support

Modified:
    ant/sandbox/javafront/src/main/org/apache/ant/javafront/builder/Tag.java
    
ant/sandbox/javafront/src/main/org/apache/ant/javafront/builder/TagBuilder.java
    
ant/sandbox/javafront/src/main/org/apache/ant/javafront/helper/JavaFrontHelper.java

Modified: 
ant/sandbox/javafront/src/main/org/apache/ant/javafront/builder/Tag.java
URL: 
http://svn.apache.org/viewvc/ant/sandbox/javafront/src/main/org/apache/ant/javafront/builder/Tag.java?rev=709345&r1=709344&r2=709345&view=diff
==============================================================================
--- ant/sandbox/javafront/src/main/org/apache/ant/javafront/builder/Tag.java 
(original)
+++ ant/sandbox/javafront/src/main/org/apache/ant/javafront/builder/Tag.java 
Thu Oct 30 21:35:49 2008
@@ -17,6 +17,7 @@
  */
 package org.apache.ant.javafront.builder;
 
+import javax.xml.namespace.QName;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.RuntimeConfigurable;
 import org.apache.tools.ant.Task;
@@ -29,7 +30,17 @@
     private final RuntimeConfigurable rc;
 
     protected Tag(Project p, String name) {
+        this(p, name, "");
+    }
+
+    protected Tag(Project p, String name, String namespaceUri) {
         ue = new UnknownElement(name);
+        ue.setNamespace(namespaceUri);
+        if (namespaceUri == null || namespaceUri.length() == 0) {
+            ue.setQName(new QName(name).toString());
+        } else {
+            ue.setQName(new QName(namespaceUri, name).toString());
+        }
         ue.setProject(p);
         ue.setTaskType(name);
         ue.setTaskName(name);

Modified: 
ant/sandbox/javafront/src/main/org/apache/ant/javafront/builder/TagBuilder.java
URL: 
http://svn.apache.org/viewvc/ant/sandbox/javafront/src/main/org/apache/ant/javafront/builder/TagBuilder.java?rev=709345&r1=709344&r2=709345&view=diff
==============================================================================
--- 
ant/sandbox/javafront/src/main/org/apache/ant/javafront/builder/TagBuilder.java 
(original)
+++ 
ant/sandbox/javafront/src/main/org/apache/ant/javafront/builder/TagBuilder.java 
Thu Oct 30 21:35:49 2008
@@ -38,9 +38,19 @@
      * Collects information for a given task/type.
      */
     public Tag newTag(String name) {
-        return new Tag(project, name);
+        return newTag(name, "");
     }
 
+    /**
+     * Collects information for a given task/type.
+     */
+    public Tag newTag(String name, String namespaceUri) {
+        return new Tag(project, name, namespaceUri);
+    }
+
+    /**
+     * Specialized for the property task.
+     */
     public PropertyBuilder newProperty() {
         return new PropertyBuilder(project);
     }

Modified: 
ant/sandbox/javafront/src/main/org/apache/ant/javafront/helper/JavaFrontHelper.java
URL: 
http://svn.apache.org/viewvc/ant/sandbox/javafront/src/main/org/apache/ant/javafront/helper/JavaFrontHelper.java?rev=709345&r1=709344&r2=709345&view=diff
==============================================================================
--- 
ant/sandbox/javafront/src/main/org/apache/ant/javafront/helper/JavaFrontHelper.java
 (original)
+++ 
ant/sandbox/javafront/src/main/org/apache/ant/javafront/helper/JavaFrontHelper.java
 Thu Oct 30 21:35:49 2008
@@ -115,6 +115,7 @@
         javac.setProject(p);
         javac.setSrcdir(new Path(p, BUILD_FILE_DIR.getAbsolutePath()));
         javac.setDestdir(BUILD_FILE_DIR);
+        javac.setTaskName("buildfile");
         javac.execute();
     }