Return-Path: 
 <directory-cvs-return-2205-apmail-incubator-directory-cvs-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-directory-cvs-archive@www.apache.org
Received: (qmail 83692 invoked from network); 16 Nov 2004 00:31:41 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 16 Nov 2004 00:31:41 -0000
Received: (qmail 37582 invoked by uid 500); 16 Nov 2004 00:31:39 -0000
Delivered-To: apmail-incubator-directory-cvs-archive@incubator.apache.org
Received: (qmail 37543 invoked by uid 500); 16 Nov 2004 00:31:39 -0000
Mailing-List: contact directory-cvs-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:directory-cvs-help@incubator.apache.org>
List-Unsubscribe: <mailto:directory-cvs-unsubscribe@incubator.apache.org>
List-Post: <mailto:directory-cvs@incubator.apache.org>
List-Id: <directory-cvs.incubator.apache.org>
Reply-To: directory-dev@incubator.apache.org
Delivered-To: mailing list directory-cvs@incubator.apache.org
Received: (qmail 37527 invoked by uid 99); 16 Nov 2004 00:31:38 -0000
X-ASF-Spam-Status: No, hits=-10.0 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Mon, 15 Nov 2004 16:31:38 -0800
Received: (qmail 83580 invoked by uid 65534); 16 Nov 2004 00:31:37 -0000
Date: 16 Nov 2004 00:31:37 -0000
Message-ID: <20041116003137.83577.qmail@minotaur.apache.org>
From: vtence@apache.org
To: directory-cvs@incubator.apache.org
Subject: svn commit: rev 74437 - in
 incubator/directory/janus/trunk/script/src: java/org/apache/janus/script/xml
 test/org/apache/janus/script/xml
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: vtence
Date: Mon Nov 15 16:31:35 2004
New Revision: 74437

Modified:
   incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/Dom4JRealmBuilder.java
   incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/xml/Dom4JRealmBuilderTest.java
Log:
Made it easier to provide global XML files by reading at the element level

Modified: incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/Dom4JRealmBuilder.java
==============================================================================
--- incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/Dom4JRealmBuilder.java	(original)
+++ incubator/directory/janus/trunk/script/src/java/org/apache/janus/script/xml/Dom4JRealmBuilder.java	Mon Nov 15 16:31:35 2004
@@ -44,7 +44,7 @@
 public class Dom4JRealmBuilder implements RealmBuilder
 {
     private final RealmBuilderMonitor m_monitor;
-    private Document m_doc;
+    private Element m_root;
 
     public Dom4JRealmBuilder( Reader reader ) throws DocumentException
     {
@@ -54,15 +54,23 @@
     public Dom4JRealmBuilder( Reader reader, RealmBuilderMonitor monitor )
             throws DocumentException
     {
-        m_doc = readDocument( reader );
+        this( readDocument( reader ).getRootElement(), monitor );
+    }
+
+    public Dom4JRealmBuilder( Element element )
+    {
+        this( element, new NullRealmBuilderMonitor() );
+    }
+
+    public Dom4JRealmBuilder( Element element, RealmBuilderMonitor monitor )
+    {
+        m_root = element;
         m_monitor = monitor;
     }
 
     public void buildRealm( MutableRealm realm ) throws IOException
     {
-        Element root = m_doc.getRootElement();
-        Element users = root.element( "users" );
-        addUsers( realm, users );
+        addUsers( realm, m_root );
     }
 
     private void addUsers( MutableRealm realm, Element users )
@@ -89,7 +97,7 @@
         }
     }
 
-    private Document readDocument( Reader reader ) throws DocumentException
+    private static Document readDocument( Reader reader ) throws DocumentException
     {
         SAXReader xmlReader = new SAXReader();
         Document doc = xmlReader.read( reader );

Modified: incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/xml/Dom4JRealmBuilderTest.java
==============================================================================
--- incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/xml/Dom4JRealmBuilderTest.java	(original)
+++ incubator/directory/janus/trunk/script/src/test/org/apache/janus/script/xml/Dom4JRealmBuilderTest.java	Mon Nov 15 16:31:35 2004
@@ -38,7 +38,7 @@
         junit.textui.TestRunner.run( Dom4JRealmBuilderTest.class );
     }
 
-    public void testSimpleBuild() throws Exception
+    public void testAddsIdentitiesToRealm() throws Exception
     {
         Dom4JRealmBuilder builder = new Dom4JRealmBuilder( new StringReader( simpleRealm() ) );
 
@@ -55,10 +55,8 @@
     {
         String content = "<?xml version=\"1.0\"?>\n"
                 + "<realm>\n"
-                + "    <users>\n"
-                + "        <user username=\"john\" password=\"doe\"/>\n"
-                + "        <user username=\"jane\" password=\"doe\"/>\n"
-                + "    </users>\n"
+                + "    <user username=\"john\" password=\"doe\"/>\n"
+                + "    <user username=\"jane\" password=\"doe\"/>\n"
                 + "</realm>";
         return content;
     }
@@ -95,10 +93,8 @@
     {
         String content = "<?xml version=\"1.0\"?>\n"
                 + "<realm>\n"
-                + "    <users>\n"
-                + "        <user username=\"john\" password=\"doe\"/>\n"
-                + "        <user username=\"john\" password=\"doe\"/>\n"
-                + "    </users>\n"
+                + "    <user username=\"john\" password=\"doe\"/>\n"
+                + "    <user username=\"john\" password=\"doe\"/>\n"
                 + "</realm>";
         return content;
     }