From 929d67e0c966c8b8f996eda2060d9fb89f5b8e60 Mon Sep 17 00:00:00 2001
From: Peter Reilly <peterreilly@apache.org>
Date: Tue, 18 Nov 2003 17:06:58 +0000
Subject: [PATCH] Ignore attributes for different uris.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275644 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/testcases/taskdefs/xmlns.xml          | 13 +++++++++++-
 .../tools/ant/helper/ProjectHelper2.java      | 20 ++++++++++++++++++-
 .../apache/tools/ant/taskdefs/XmlnsTest.java  |  8 ++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/etc/testcases/taskdefs/xmlns.xml b/src/etc/testcases/taskdefs/xmlns.xml
index 05ecfb932..f442b8cc3 100644
--- a/src/etc/testcases/taskdefs/xmlns.xml
+++ b/src/etc/testcases/taskdefs/xmlns.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
-<project name="test">
+<project name="test" xmlns:other="this is the other uri"
+         other:attr="this should be ignored by ant">
 
   <property name="testcases.dir" location="../../../../build/testcases"/>
 
@@ -16,6 +17,16 @@
     <test:mytask/>
   </target>
 
+  <target name="other" other:a="this is another attribute">
+    <echo other:g="abc" message="a message"/>
+  </target>
+
+  <target name="ns.attributes">
+    <taskdef name="my.echo" classname="org.apache.tools.ant.taskdefs.Echo"
+             uri="x-uri"/>
+    <x:my.echo x:message="hello world" xmlns:x="x-uri"/>
+  </target>
+
   <target name="xmlns.file" xmlns:test="this.is.a.test.uri">
     <typedef file="test.antlib.xml"
              classpathref="testclasses"
diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
index 1d8c5ce11..169e1d3f3 100644
--- a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
+++ b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
@@ -645,9 +645,15 @@ public class ProjectHelper2 extends ProjectHelper {
              */
 
             for (int i = 0; i < attrs.getLength(); i++) {
+                String attrUri = attrs.getURI(i);
+                if (attrUri != null
+                    && !attrUri.equals("")
+                    && !attrUri.equals(uri)) {
+                    continue; // Ignore attributes from unknown uris
+                }
                 String key = attrs.getLocalName(i);
                 String value = attrs.getValue(i);
-
+ 
                 if (key.equals("default")) {
                     if (value != null && !value.equals("")) {
                         if (!context.isIgnoringProjectTag()) {
@@ -797,6 +803,12 @@ public class ProjectHelper2 extends ProjectHelper {
             context.addTarget(target);
 
             for (int i = 0; i < attrs.getLength(); i++) {
+                String attrUri = attrs.getURI(i);
+                if (attrUri != null
+                    && !attrUri.equals("")
+                    && !attrUri.equals(uri)) {
+                    continue; // Ignore attributes from unknown uris
+                }
                 String key = attrs.getLocalName(i);
                 String value = attrs.getValue(i);
 
@@ -967,6 +979,12 @@ public class ProjectHelper2 extends ProjectHelper {
                 = new RuntimeConfigurable(task, task.getTaskName());
 
             for (int i = 0; i < attrs.getLength(); i++) {
+                String attrUri = attrs.getURI(i);
+                if (attrUri != null
+                    && !attrUri.equals("")
+                    && !attrUri.equals(uri)) {
+                    continue; // Ignore attributes from unknown uris
+                }
                 String name = attrs.getLocalName(i);
                 String value = attrs.getValue(i);
                 // PR: Hack for ant-type value
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/XmlnsTest.java b/src/testcases/org/apache/tools/ant/taskdefs/XmlnsTest.java
index 19b0c2afb..a39e82bd6 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/XmlnsTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/XmlnsTest.java
@@ -88,6 +88,14 @@ public class XmlnsTest extends BuildFileTest {
             "Attempt to use a reserved URI ant:notallowed");
     }
 
+    public void testOther() {
+        expectLog("other", "a message");
+    }
+
+    public void testNsAttributes() {
+        expectLog("ns.attributes", "hello world");
+    }
+    
     public static class MyTask extends Task {
         public void execute() {
             log("MyTask called");