[portal-commits] JBoss Portal SVN: r5748 - in trunk: cms/src/main/org/jboss/portal/test/cms core/src/main/org/jboss/portal/test/core core/src/main/org/jboss/portal/test/core/model/instance core/src/main/org/jboss/portal/test/core/state identity/src/main/org/jboss/portal/test/identity/db test/src/etc test/src/main/org/jboss/portal/test/framework/embedded
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Mon Dec 4 08:36:48 EST 2006
Author: julien at jboss.com
Date: 2006-12-04 08:36:35 -0500 (Mon, 04 Dec 2006)
New Revision: 5748
Modified:
trunk/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java
trunk/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java
trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java
trunk/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java
trunk/identity/src/main/org/jboss/portal/test/identity/db/DBUserTestCase.java
trunk/test/src/etc/datasources.xml
trunk/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java
Log:
rename in datasources.xml display-name to datasource-name
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java 2006-12-04 13:06:02 UTC (rev 5747)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java 2006-12-04 13:36:35 UTC (rev 5748)
@@ -67,7 +67,7 @@
runtimeContext = new TestRuntimeContext("org/jboss/portal/cms/jboss-beans.xml");
runtimeContext.addBean("TestBean", this);
runtimeContext.addBean("DataSourceConfig", dataSourceConfigParameter);
- runtimeContext.addBean("HibernateConfig", HibernateSupport.getConfig(dataSourceConfigParameter.getDisplayName()));
+ runtimeContext.addBean("HibernateConfig", HibernateSupport.getConfig(dataSourceConfigParameter.getName()));
runtimeContext.start();
}
Modified: trunk/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java 2006-12-04 13:06:02 UTC (rev 5747)
+++ trunk/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java 2006-12-04 13:36:35 UTC (rev 5748)
@@ -102,7 +102,7 @@
public String getName()
{
- return super.getName() + ",ds=" + dataSourceConfigParameter.getDisplayName();
+ return super.getName() + ",ds=" + dataSourceConfigParameter.getName();
}
protected Set getDefaultSecurityConstraints()
@@ -129,7 +129,7 @@
runtimeContext = new TestRuntimeContext(getConfigLocation());
runtimeContext.addBean("TestBean", this);
runtimeContext.addBean("DataSourceConfig", dataSourceConfigParameter);
- runtimeContext.addBean("HibernateConfig", HibernateSupport.getConfig(dataSourceConfigParameter.getDisplayName()));
+ runtimeContext.addBean("HibernateConfig", HibernateSupport.getConfig(dataSourceConfigParameter.getName()));
runtimeContext.start();
//
Modified: trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java 2006-12-04 13:06:02 UTC (rev 5747)
+++ trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java 2006-12-04 13:36:35 UTC (rev 5748)
@@ -76,7 +76,6 @@
import java.net.URL;
import java.util.List;
-import java.util.Map;
import java.util.Set;
/**
@@ -182,7 +181,7 @@
public String getName()
{
- return super.getName() + ",persistLocally=" + persistLocally + ",cloneOnCreate=" + cloneOnCreate + ",ds=" + dataSourceConfigParameter.getDisplayName();
+ return super.getName() + ",persistLocally=" + persistLocally + ",cloneOnCreate=" + cloneOnCreate + ",ds=" + dataSourceConfigParameter.getName();
}
public String getPersistLocallyParameter()
@@ -302,7 +301,7 @@
runtimeContext.addBean("TestCaseConfig", this);
runtimeContext.addBean("TestBean", this);
runtimeContext.addBean("DataSourceConfig", dataSourceConfigParameter);
- runtimeContext.addBean("HibernateConfig", HibernateSupport.getConfig(dataSourceConfigParameter.getDisplayName()));
+ runtimeContext.addBean("HibernateConfig", HibernateSupport.getConfig(dataSourceConfigParameter.getName()));
runtimeContext.start();
}
Modified: trunk/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java 2006-12-04 13:06:02 UTC (rev 5747)
+++ trunk/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java 2006-12-04 13:36:35 UTC (rev 5748)
@@ -113,7 +113,7 @@
public String getName()
{
- return super.getName() + ",ds=" + dataSourceConfigParameter.getDisplayName();
+ return super.getName() + ",ds=" + dataSourceConfigParameter.getName();
}
public HibernateSupport getHibernateSupport()
@@ -171,7 +171,7 @@
runtimeContext = new TestRuntimeContext("org/jboss/portal/test/core/state/jboss-beans.xml");
runtimeContext.addBean("TestBean", this);
runtimeContext.addBean("DataSourceConfig", dataSourceConfigParameter);
- runtimeContext.addBean("HibernateConfig", HibernateSupport.getConfig(dataSourceConfigParameter.getDisplayName()));
+ runtimeContext.addBean("HibernateConfig", HibernateSupport.getConfig(dataSourceConfigParameter.getName()));
runtimeContext.start();
portletContainer.addPortlet("SimplePortlet", new PortletSupport()
Modified: trunk/identity/src/main/org/jboss/portal/test/identity/db/DBUserTestCase.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/test/identity/db/DBUserTestCase.java 2006-12-04 13:06:02 UTC (rev 5747)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/db/DBUserTestCase.java 2006-12-04 13:36:35 UTC (rev 5748)
@@ -113,7 +113,7 @@
public String getName()
{
- return super.getName() + "," + dataSourceConfigParameter.getDisplayName();
+ return super.getName() + "," + dataSourceConfigParameter.getName();
}
public void setUp() throws Exception
@@ -121,7 +121,7 @@
runtimeContext = new TestRuntimeContext("org/jboss/portal/test/identity/db-beans.xml");
runtimeContext.addBean("DBTestBean", this);
runtimeContext.addBean("DataSourceConfig", dataSourceConfigParameter);
- runtimeContext.addBean("HibernateConfig", HibernateSupport.getConfig(dataSourceConfigParameter.getDisplayName()));
+ runtimeContext.addBean("HibernateConfig", HibernateSupport.getConfig(dataSourceConfigParameter.getName()));
runtimeContext.start();
//
Modified: trunk/test/src/etc/datasources.xml
===================================================================
--- trunk/test/src/etc/datasources.xml 2006-12-04 13:06:02 UTC (rev 5747)
+++ trunk/test/src/etc/datasources.xml 2006-12-04 13:36:35 UTC (rev 5748)
@@ -24,7 +24,7 @@
<datasources>
<!-- The hsqldb datasource -->
<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: trunk/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java 2006-12-04 13:06:02 UTC (rev 5747)
+++ trunk/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java 2006-12-04 13:36:35 UTC (rev 5748)
@@ -170,7 +170,7 @@
{
/** . */
- private String displayName;
+ private String name;
/** . */
private String connectionURL;
@@ -184,18 +184,18 @@
/** . */
private String password;
- public Config(String displayName, String connectionURL, String driverClass, String userName, String password)
+ public Config(String name, String connectionURL, String driverClass, String userName, String password)
{
- this.displayName = displayName;
+ this.name = name;
this.connectionURL = connectionURL;
this.driverClass = driverClass;
this.userName = userName;
this.password = password;
}
- public String getDisplayName()
+ public String getName()
{
- return displayName;
+ return name;
}
public String getConnectionURL()
@@ -220,7 +220,7 @@
public String toString()
{
- return "Datasource[" + displayName + "]";
+ return "Datasource[" + name + "]";
}
public static MultiValuedTestParameterValue fromXML2(URL url) throws Exception
@@ -241,18 +241,27 @@
for (Iterator i = XML.getChildrenIterator(doc.getDocumentElement(), "datasource"); i.hasNext();)
{
Element childElt = (Element)i.next();
- Element displayNameElt = XML.getUniqueChild(childElt, "display-name", true);
+
+ // Parse the datasource name, taking in account the deprecated display-name element
+ Element nameElt = XML.getUniqueChild(childElt, "datasource-name", false);
+ if (nameElt == null)
+ {
+ System.out.println("XML element datasource-name is not present, trying deprecated display-name element instead, you should fix your datasources.xml");
+ nameElt = XML.getUniqueChild(childElt, "display-name", true);
+ }
+
+ // Parse the rest of the configuration
Element connectionURLElt = XML.getUniqueChild(childElt, "connection-url", true);
Element driverClassElt = XML.getUniqueChild(childElt, "driver-class", true);
Element userNameElt = XML.getUniqueChild(childElt, "user-name", true);
Element passwordElt = XML.getUniqueChild(childElt, "password", true);
- String displayName = XML.asString(displayNameElt);
+ String name = XML.asString(nameElt);
String connectionURL = XML.asString(connectionURLElt);
String driverClass = XML.asString(driverClassElt);
String userName = XML.asString(userNameElt);
String password = XML.asString(passwordElt);
Config dsCfg = new Config(
- displayName,
+ name,
connectionURL,
driverClass,
userName,
More information about the portal-commits
mailing list