Return-Path: 
 <commons-dev-return-68693-apmail-jakarta-commons-dev-archive=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org
Received: (qmail 90679 invoked from network); 2 Mar 2005 09:06:33 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 2 Mar 2005 09:06:33 -0000
Received: (qmail 67895 invoked by uid 500); 2 Mar 2005 09:06:28 -0000
Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org
Received: (qmail 67829 invoked by uid 500); 2 Mar 2005 09:06:28 -0000
Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:commons-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:commons-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:commons-dev-help@jakarta.apache.org>
List-Post: <mailto:commons-dev@jakarta.apache.org>
List-Id: "Jakarta Commons Developers List" <commons-dev.jakarta.apache.org>
Reply-To: "Jakarta Commons Developers List" <commons-dev@jakarta.apache.org>
Delivered-To: mailing list commons-dev@jakarta.apache.org
Received: (qmail 67814 invoked by uid 500); 2 Mar 2005 09:06:28 -0000
Received: (qmail 67805 invoked by uid 99); 2 Mar 2005 09:06:28 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Wed, 02 Mar 2005 01:06:26 -0800
Received: (qmail 90577 invoked by uid 65534); 2 Mar 2005 09:06:25 -0000
Message-ID: <20050302090625.90574.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Wed, 02 Mar 2005 09:06:25 -0000
Subject: svn commit: r155899 -
 jakarta/commons/proper/digester/branches/digester2/src/java/org/apache/commons/digester2/plugins/PluginDeclarationAction.java
To: commons-cvs@jakarta.apache.org
From: skitching@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: skitching
Date: Wed Mar  2 01:06:22 2005
New Revision: 155899

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D155899
Log:
Ensure attributes with associated namespaces are passed to the
RuleFinder classes.

Modified:
    jakarta/commons/proper/digester/branches/digester2/src/java/org/apache/=
commons/digester2/plugins/PluginDeclarationAction.java

Modified: jakarta/commons/proper/digester/branches/digester2/src/java/org/a=
pache/commons/digester2/plugins/PluginDeclarationAction.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/digester/branches=
/digester2/src/java/org/apache/commons/digester2/plugins/PluginDeclarationA=
ction.java?view=3Ddiff&r1=3D155898&r2=3D155899
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- jakarta/commons/proper/digester/branches/digester2/src/java/org/apache/=
commons/digester2/plugins/PluginDeclarationAction.java (original)
+++ jakarta/commons/proper/digester/branches/digester2/src/java/org/apache/=
commons/digester2/plugins/PluginDeclarationAction.java Wed Mar  2 01:06:22 =
2005
@@ -68,19 +68,7 @@
     org.xml.sax.Attributes attributes)
     throws ParseException {
=20
-        // copy all the attribute values into a properties object so that
-        // the plugin finder strategies can access the properties later.
-        int nAttrs =3D attributes.getLength();
-        Properties props =3D new Properties();
-        for(int i=3D0; i<nAttrs; ++i) {
-            String key =3D attributes.getLocalName(i);
-            if ((key =3D=3D null) || (key.length() =3D=3D 0)) {
-                key =3D attributes.getQName(i);
-            }
-            String value =3D attributes.getValue(i);
-            props.setProperty(key, value);
-        }
-       =20
+        Properties props =3D attributesToProperties(attributes);
         try {
             declarePlugin(context, props);
         } catch(PluginInvalidInputException ex) {
@@ -125,6 +113,32 @@
=20
         PluginDeclarationScope pds =3D PluginDeclarationScope.getInstance(=
context);=20
         pds.addDeclaration(newDecl);
+    }
+
+    /**
+     * Copy all the (key,value) pairs in the provided Attributes object in=
to
+     * a java.util.Properties object. If an attribute has an associated
+     * namespace, then the properties key is of form "{namespace}name".
+     */
+    private static Properties attributesToProperties(org.xml.sax.Attribute=
s attrs) {
+        int nAttrs =3D attrs.getLength();
+        Properties props =3D new Properties();
+        for(int i=3D0; i<nAttrs; ++i) {
+            String namespace =3D attrs.getURI(i);
+
+            String key =3D attrs.getLocalName(i);
+            if ((key =3D=3D null) || (key.length() =3D=3D 0)) {
+                key =3D attrs.getQName(i);
+            }
+
+            if ((namespace !=3D null) && (namespace.length()>0)) {
+                key =3D "{" + namespace + "}" + key;
+            }
+           =20
+            String value =3D attrs.getValue(i);
+            props.setProperty(key, value);
+        }
+        return props;
     }
 }
=20



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org