Author: julien(a)jboss.com Date: 2006-12-04 08:38:17 -0500 (Mon, 04 Dec 2006) New Revision: 5749 Modified: trunk/test/src/etc/directories.xml trunk/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java Log: in directories.xml use "directory-name" instead of "name" in order to be consistent with the other test configuration files. Modified: trunk/test/src/etc/directories.xml =================================================================== --- trunk/test/src/etc/directories.xml 2006-12-04 13:36:35 UTC (rev 5748) +++ trunk/test/src/etc/directories.xml 2006-12-04 13:38:17 UTC (rev 5749) @@ -23,7 +23,7 @@ <directories> <directory> - <name>OpenDS</name> + <directory-name>OpenDS</directory-name> <description>OpenDS service deployed on JBoss AS as an mbean</description> <!--identity configuration file--> <config-file>identityconfig/opends-config.xml</config-file> @@ -38,7 +38,7 @@ <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> </directory> <!--<directory> in - <name>RedHatDS</name> + <directory-name>RedHatDS</directory-name> <description>RedHat Directory in QA Labs (need vpn access)</description> <config-file>identityconfig/rhds-config.xml</config-file> Modified: trunk/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java =================================================================== --- trunk/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java 2006-12-04 13:36:35 UTC (rev 5748) +++ trunk/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java 2006-12-04 13:38:17 UTC (rev 5749) @@ -128,7 +128,7 @@ for (Iterator i = XML.getChildrenIterator(doc.getDocumentElement(), "directory"); i.hasNext();) { Element childElt = (Element)i.next(); - Element nm = XML.getUniqueChild(childElt, "name", true); + Element nm = XML.getUniqueChild(childElt, "directory-name", true); Element desc = XML.getUniqueChild(childElt, "description", true); Element config = XML.getUniqueChild(childElt, "config-file", true); Element h = XML.getUniqueChild(childElt, "host", true);