[portal-commits] JBoss Portal SVN: r6360 - branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded.
Author: thomas.heute(a)jboss.com
Date: 2007-02-21 06:47:55 -0500 (Wed, 21 Feb 2007)
New Revision: 6360
Modified:
branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java
Log:
It's datasource-name... not database-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
11:34:19 UTC (rev 6359)
+++
branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java 2007-02-21
11:47:55 UTC (rev 6360)
@@ -261,13 +261,7 @@
for (Iterator i = XML.getChildrenIterator(doc.getDocumentElement(),
"datasource"); i.hasNext();)
{
Element childElt = (Element)i.next();
- 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 displayNameURLElt = XML.getUniqueChild(childElt,
"datasource-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);