Author: thomas.heute(a)jboss.com Date: 2007-02-21 10:31:49 -0500 (Wed, 21 Feb 2007) New Revision: 6363 Removed: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/test/ Modified: branches/JBoss_Portal_Branch_2_4/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans.xml branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Tools.java 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 branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java Log: Rollback changes of the day. Modified: branches/JBoss_Portal_Branch_2_4/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans.xml =================================================================== --- branches/JBoss_Portal_Branch_2_4/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans.xml 2007-02-21 13:55:54 UTC (rev 6362) +++ branches/JBoss_Portal_Branch_2_4/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans.xml 2007-02-21 15:31:49 UTC (rev 6363) @@ -34,13 +34,6 @@ </constructor> </bean> - <bean name="HibernateConfig" class="org.jboss.portal.test.framework.embedded.HibernateSupport$Config"> - <constructor factoryMethod="getBean"> - <factory bean="BeanFactory"/> - <parameter>HibernateConfig</parameter> - </constructor> - </bean> - <bean name="JNDISupport" class="org.jboss.portal.test.framework.embedded.JNDISupport"> </bean> @@ -55,11 +48,13 @@ <property name="transactionManager"><inject bean="TransactionManagerSupport" property="transactionManager"/></property> <property name="connectionManagerReference"><inject bean="ConnectionManagerSupport" property="connectionManagerReference"/></property> - <property name="config"><inject bean="DataSourceConfig"/></property> + <property name="driverClass"><inject bean="DataSourceConfig" property="driverClass"/></property> + <property name="connectionURL"><inject bean="DataSourceConfig" property="connectionURL"/></property> + <property name="userName"><inject bean="DataSourceConfig" property="userName"/></property> + <property name="password"><inject bean="DataSourceConfig" property="password"/></property> </bean> <bean name="HibernateSupport" class="org.jboss.portal.test.framework.embedded.HibernateSupport"> - <property name="config"><inject bean="HibernateConfig"/></property> <property name="jNDIName">java:/SessionFactory</property> <property name="mappings"> <list elementClass="java.lang.String"> @@ -69,7 +64,7 @@ </bean> <!-- - <bean name="TestBean" class="org.jboss.portal.test.identity.db.DBUserTestCase"> + <bean name="TestBean" class="org.jboss.portal.test.identity.UserTestCase"> <constructor factoryMethod="getBean"> <factory bean="BeanFactory"/> <parameter>TestBean</parameter> Modified: branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Tools.java =================================================================== --- branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Tools.java 2007-02-21 13:55:54 UTC (rev 6362) +++ branches/JBoss_Portal_Branch_2_4/common/src/main/org/jboss/portal/common/util/Tools.java 2007-02-21 15:31:49 UTC (rev 6363) @@ -26,7 +26,6 @@ import org.apache.log4j.Logger; import org.jboss.portal.common.logging.Log4JWriter; -import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -786,24 +785,4 @@ ObjectInputStream ois = new ObjectInputStream(bais); return ois.readObject(); } - - public static BufferedInputStream safeBufferedWrapper(InputStream in) - { - if (in != null) - { - if (in instanceof BufferedInputStream) - { - return (BufferedInputStream)in; - } - else - { - return new BufferedInputStream(in); - } - } - else - { - return null; - } - } - } \ No newline at end of file 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 13:55:54 UTC (rev 6362) +++ branches/JBoss_Portal_Branch_2_4/test/src/etc/datasources.xml 2007-02-21 15:31:49 UTC (rev 6363) @@ -23,7 +23,7 @@ <datasources> <datasource> - <datasource-name>hsqldb</datasource-name> + <display-name>hsqldb</display-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 13:55:54 UTC (rev 6362) +++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java 2007-02-21 15:31:49 UTC (rev 6363) @@ -20,12 +20,10 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * ******************************************************************************/ - package org.jboss.portal.test.framework.embedded; import org.jboss.portal.common.util.Tools; import org.jboss.portal.common.util.XML; -import org.jboss.portal.common.test.MultiValuedTestParameterValue; import org.jboss.resource.adapter.jdbc.local.LocalTxDataSource; import org.jboss.resource.connectionmanager.CachedConnectionManagerReference; import org.w3c.dom.Document; @@ -38,10 +36,8 @@ import java.sql.Connection; import java.sql.Statement; import java.util.ArrayList; -import java.util.Arrays; import java.util.Hashtable; import java.util.Iterator; -import java.util.List; /** * An helper to setup JDNI available objects @@ -59,7 +55,7 @@ private CachedConnectionManagerReference connectionManagerReference; // - private Config config; + private Config cfg; private String jndiName = "java:/DefaultDS"; @@ -68,7 +64,7 @@ public DataSourceSupport(Config cfg) { - this.config = cfg; + this.cfg = cfg; } public DataSourceSupport() @@ -85,10 +81,10 @@ // ds = new LocalTxDataSource(); - ds.setConnectionURL(config.getConnectionURL()); - ds.setDriverClass(config.getDriverClass()); - ds.setUserName(config.getUserName()); - ds.setPassword(config.getPassword()); + ds.setConnectionURL(cfg.getConnectionURL()); + ds.setDriverClass(cfg.getDriverClass()); + ds.setUserName(cfg.getUserName()); + ds.setPassword(cfg.getPassword()); ds.setJndiName(jndiName); ds.setMaxSize(10); ds.setMinSize(0); @@ -103,7 +99,7 @@ public void stop() { // Make hsqldb flush its data on the disk - if ("org.hsqldb.jdbcDriver".equals(config.driverClass)) + if ("org.hsqldb.jdbcDriver".equals(cfg.driverClass)) { try { @@ -136,16 +132,56 @@ { } - public Config getConfig() + public String getConnectionURL() { - return config; + return cfg.connectionURL; } - public void setConfig(Config config) + public void setConnectionURL(String connectionURL) { - this.config = config; + this.cfg.connectionURL = connectionURL; } + public String getDriverClass() + { + return cfg.driverClass; + } + + public void setDriverClass(String driverClass) + { + this.cfg.driverClass = driverClass; + } + + public String getUserName() + { + return cfg.userName; + } + + public void setUserName(String userName) + { + this.cfg.userName = userName; + } + + public String getPassword() + { + return cfg.password; + } + + public void setPassword(String password) + { + this.cfg.password = password; + } + + public String getJndiName() + { + return jndiName; + } + + public void setJndiName(String jndiName) + { + this.jndiName = jndiName; + } + public TransactionManager getTransactionManager() { return transactionManager; @@ -169,40 +205,26 @@ public static class Config { - /** . */ - private String name; - - /** . */ + private String displayName; private String connectionURL; - - /** . */ private String driverClass; - - /** . */ private String userName; - - /** . */ private String password; - public Config(String name, String connectionURL, String driverClass, String userName, String password) + public Config(String displayName, String connectionURL, String driverClass, String userName, String password) { - this.name = name; + this.displayName = displayName; this.connectionURL = connectionURL; this.driverClass = driverClass; this.userName = userName; this.password = password; } - public Config() + public String getDisplayName() { - + return displayName; } - public String getName() - { - return name; - } - public String getConnectionURL() { return connectionURL; @@ -225,74 +247,32 @@ public String toString() { - return "Datasource[" + name + "]"; + return "DataSource[" + displayName + "]"; } - - public void setName(String name) - { - this.name = name; - } - - public void setConnectionURL(String connectionURL) - { - this.connectionURL = connectionURL; - } - - public void setDriverClass(String driverClass) - { - this.driverClass = driverClass; - } - - public void setUserName(String userName) - { - this.userName = userName; - } - - public void setPassword(String password) - { - this.password = password; - } - - public static MultiValuedTestParameterValue fromXML2(URL url) throws Exception - { - Config[] configs = fromXML(url); - List list = Arrays.asList(configs); - return new MultiValuedTestParameterValue(list); - } - public static Config[] fromXML(URL url) throws Exception { ArrayList configs = new ArrayList(); InputStream in = null; try { - in = Tools.safeBufferedWrapper(url.openStream()); + in = url.openStream(); Document doc = XML.getDocumentBuilderFactory().newDocumentBuilder().parse(in); for (Iterator i = XML.getChildrenIterator(doc.getDocumentElement(), "datasource"); i.hasNext();) { Element childElt = (Element)i.next(); - - // 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 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); Element passwordElt = XML.getUniqueChild(childElt, "password", true); - String name = XML.asString(nameElt); + String displayName = XML.asString(displayNameURLElt); String connectionURL = XML.asString(connectionURLElt); String driverClass = XML.asString(driverClassElt); String userName = XML.asString(userNameElt); String password = XML.asString(passwordElt); Config dsCfg = new Config( - name, + displayName, connectionURL, driverClass, userName, @@ -306,5 +286,6 @@ Tools.safeClose(in); } } + } } Modified: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java =================================================================== --- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java 2007-02-21 13:55:54 UTC (rev 6362) +++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java 2007-02-21 15:31:49 UTC (rev 6363) @@ -20,7 +20,6 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * ******************************************************************************/ - package org.jboss.portal.test.framework.embedded; import org.hibernate.HibernateException; @@ -31,20 +30,11 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Settings; import org.hibernate.tool.hbm2ddl.SchemaExport; -import org.jboss.portal.common.util.XML; -import org.jboss.portal.common.util.Tools; -import org.w3c.dom.Element; -import org.w3c.dom.Document; import javax.transaction.Synchronization; import java.util.Collection; import java.util.Iterator; -import java.util.Map; -import java.util.LinkedHashMap; -import java.util.HashMap; import java.util.Properties; -import java.io.InputStream; -import java.net.URL; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -53,6 +43,8 @@ public class HibernateSupport { + public static final String DS_JNDI_NAME = "java:/DefaultDS"; + /** . */ protected String jndiName; @@ -60,20 +52,17 @@ protected Collection mappings; /** . */ - protected Config config; + protected Configuration cfg; /** . */ protected SessionFactory factory; /** . */ - protected Session session; + protected Settings settings; /** . */ - protected Configuration cfg; + protected Session session; - /** . */ - protected Settings settings; - public Collection getMappings() { return mappings; @@ -84,16 +73,11 @@ this.mappings = mappings; } - public Config getConfig() + public Configuration getConfig() { - return config; + return cfg; } - public void setConfig(Config config) - { - this.config = config; - } - public SessionFactory getSessionFactory() { return factory; @@ -111,8 +95,10 @@ protected void createConfiguration() { - Configuration cfg = new Configuration(); + // + cfg = new Configuration(); + // for (Iterator i = mappings.iterator(); i.hasNext();) { String mapping = (String)i.next(); @@ -121,21 +107,25 @@ // Properties props = new Properties(); - props.putAll(config.properties); - cfg.addProperties(props); + props.setProperty("hibernate.show_sql", "true"); + props.setProperty("hibernate.transaction.flush_before_completion", "true"); + props.setProperty("hibernate.transaction.auto_close_session", "true"); + props.setProperty("hibernate.transaction.factory_class", "org.hibernate.transaction.JTATransactionFactory"); + props.setProperty("hibernate.transaction.manager_lookup_class", "org.hibernate.transaction.JBossTransactionManagerLookup"); + props.setProperty("hibernate.connection.datasource", DS_JNDI_NAME); + props.setProperty("hibernate.cache.provider_class", "org.hibernate.cache.HashtableCacheProvider"); // - cfg.setProperty("hibernate.connection.datasource", "java:/DefaultDS"); - - // if (jndiName != null) { - cfg.setProperty("hibernate.session_factory_name", jndiName); + props.setProperty("hibernate.session_factory_name", jndiName); } // - this.settings = cfg.buildSettings(); - this.cfg = cfg; + cfg.setProperties(props); + + // + settings = cfg.buildSettings(); } protected void createSessionFactory() @@ -162,7 +152,7 @@ protected void destroyConfiguration() { - config = null; + cfg = null; } public void create() throws Exception @@ -314,105 +304,4 @@ }); return session; } - - public static class Config - { - - /** . */ - private String name; - - /** . */ - private Map properties; - - public Config(String name, Map properties) - { - this.name = name; - this.properties = properties; - } - - public String getName() - { - return name; - } - - public Map getProperties() - { - return properties; - } - } - - /** . */ - private static Map configs; - - public static Map fromXML(URL url) throws Exception - { - Map configs = new LinkedHashMap(); - InputStream in = null; - try - { - in = Tools.safeBufferedWrapper(url.openStream()); - Document doc = XML.getDocumentBuilderFactory().newDocumentBuilder().parse(in); - for (Iterator i = XML.getChildrenIterator(doc.getDocumentElement(), "configuration"); i.hasNext();) - { - Element childElt = (Element)i.next(); - - // - Element configurationNameElt = XML.getUniqueChild(childElt, "configuration-name", true); - String configurationName = XML.asString(configurationNameElt); - - // - Map properties = new HashMap(); - Element propertiesElt = XML.getUniqueChild(childElt, "properties", false); - if (propertiesElt != null) - { - for (Iterator j = XML.getChildrenIterator(propertiesElt, "property");j.hasNext();) - { - Element propertyElt = (Element)j.next(); - Element nameElt = XML.getUniqueChild(propertyElt, "name", true); - Element valueElt = XML.getUniqueChild(propertyElt, "value", true); - String name = XML.asString(nameElt); - String value = XML.asString(valueElt); - properties.put(name, value); - } - } - - // - Config config = new Config(configurationName, properties); - configs.put(configurationName, config); - } - return configs; - } - finally - { - Tools.safeClose(in); - } - } - - public synchronized static Config getConfig(String name) throws Exception - { - if (configs == null) - { - URL url = Thread.currentThread().getContextClassLoader().getResource("hibernates.xml"); - configs = fromXML(url); - - // Remove and merge default with all - Config defaultCfg = (Config)configs.remove("default"); - - // - for (Iterator i = configs.values().iterator();i.hasNext();) - { - Config cfg = (Config)i.next(); - if ("default".equals(cfg.getName()) == false) - { - Map tmp = new HashMap(defaultCfg.properties); - tmp.putAll(cfg.properties); - cfg.properties = tmp; - } - } - - } - - // - return (Config)configs.get(name); - } }