[portal-commits] JBoss Portal SVN: r6358 - in branches/JBoss_Portal_Branch_2_4/test/src: main/org/jboss/portal/test/framework/embedded and 1 other directory.
Author: thomas.heute(a)jboss.com
Date: 2007-02-21 05:45:53 -0500 (Wed, 21 Feb 2007)
New Revision: 6358
Modified:
branches/JBoss_Portal_Branch_2_4/test/src/etc/datasources.xml
branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java
Log:
"display-name" is deprecated in datasources.xml. Replaced by
"database-name"
Modified: branches/JBoss_Portal_Branch_2_4/test/src/etc/datasources.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/etc/datasources.xml 2007-02-21 05:55:02 UTC
(rev 6357)
+++ branches/JBoss_Portal_Branch_2_4/test/src/etc/datasources.xml 2007-02-21 10:45:53 UTC
(rev 6358)
@@ -23,7 +23,7 @@
<datasources>
<datasource>
- <display-name>hsqldb</display-name>
+ <datasource-name>hsqldb</datasource-name>
<connection-url>jdbc:hsqldb:file:test</connection-url>
<driver-class>org.hsqldb.jdbcDriver</driver-class>
<user-name>sa</user-name>
Modified:
branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java
===================================================================
---
branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java 2007-02-21
05:55:02 UTC (rev 6357)
+++
branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java 2007-02-21
10:45:53 UTC (rev 6358)
@@ -261,7 +261,13 @@
for (Iterator i = XML.getChildrenIterator(doc.getDocumentElement(),
"datasource"); i.hasNext();)
{
Element childElt = (Element)i.next();
- Element displayNameURLElt = XML.getUniqueChild(childElt,
"display-name", true);
+ Element displayNameURLElt = XML.getUniqueChild(childElt,
"database-name", true);
+ if (displayNameURLElt == null)
+ {
+ System.out.println("XML element datasource-name is not present,
trying deprecated display-name element instead, you should fix your
datasources.xml");
+ displayNameURLElt = XML.getUniqueChild(childElt,
"display-name", true);
+ }
+
Element connectionURLElt = XML.getUniqueChild(childElt,
"connection-url", true);
Element driverClassElt = XML.getUniqueChild(childElt,
"driver-class", true);
Element userNameElt = XML.getUniqueChild(childElt, "user-name",
true);