portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/containers rdbms.container.groovy
Date Sat, 22 May 2004 17:51:06 GMT
taylor      2004/05/22 10:51:06

  Modified:    components/rdbms/src/java/org/apache/jetspeed/containers
                        rdbms.container.groovy
  Log:
  change ascii flag
  
  Revision  Changes    Path
  1.8       +42 -42    jakarta-jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/containers/rdbms.container.groovy
  
  Index: rdbms.container.groovy
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/containers/rdbms.container.groovy,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- rdbms.container.groovy	9 Mar 2004 16:17:02 -0000	1.7
  +++ rdbms.container.groovy	22 May 2004 17:51:06 -0000	1.8
  @@ -1,43 +1,43 @@
  -import org.picocontainer.defaults.DefaultPicoContainer
  -import org.apache.commons.configuration.PropertiesConfiguration
  -import org.apache.jetspeed.components.jndi.JNDIComponent
  -import org.apache.jetspeed.components.jndi.TyrexJNDIComponent
  -import org.apache.jetspeed.components.datasource.BoundDBCPDatasourceComponent
  -import org.apache.jetspeed.components.datasource.DatasourceComponent
  -import org.hsqldb.jdbcDriver
  -import org.apache.commons.pool.impl.GenericObjectPool
  -import org.picocontainer.Parameter
  -import org.picocontainer.defaults.ConstantParameter
  -import org.picocontainer.ComponentAdapter
  -import org.picocontainer.defaults.ConstructorComponentAdapter
  -import java.io.File
  -
  -// WARNING!!!!!!
  -// DO NOT use {Class}.class as it appears to be broken in Groovy
  -// You end getting a Class instance of the type java.lang.Class
  -// instead of the requested type!  This causes AssignabilityExceptions
  -// in pico.
  -
  -
  -
  -container = new DefaultPicoContainer(parent)
  -
  -// This JNDI component helps us publish the datasource
  -Class jndiClass = JNDIComponent
  -JNDIComponent jndiImpl = new TyrexJNDIComponent()
  -container.registerComponentInstance(jndiClass, jndiImpl)
  -
  -// Create a datasource based on the HSQL server we just created
  -String url = System.getProperty("org.apache.jetspeed.database.url")
  -String driver = System.getProperty("org.apache.jetspeed.database.driver")
  -String user = System.getProperty("org.apache.jetspeed.database.user")
  -String password = System.getProperty("org.apache.jetspeed.database.password")
  -
  -if(url != null)
  -{
  -	container.registerComponentInstance(DatasourceComponent, new BoundDBCPDatasourceComponent(user,
password, driver, url, 20, 5000, GenericObjectPool.WHEN_EXHAUSTED_GROW, true, "jetspeed",
jndiImpl))
  -}
  -
  -
  -
  +import org.picocontainer.defaults.DefaultPicoContainer
  +import org.apache.commons.configuration.PropertiesConfiguration
  +import org.apache.jetspeed.components.jndi.JNDIComponent
  +import org.apache.jetspeed.components.jndi.TyrexJNDIComponent
  +import org.apache.jetspeed.components.datasource.BoundDBCPDatasourceComponent
  +import org.apache.jetspeed.components.datasource.DatasourceComponent
  +import org.hsqldb.jdbcDriver
  +import org.apache.commons.pool.impl.GenericObjectPool
  +import org.picocontainer.Parameter
  +import org.picocontainer.defaults.ConstantParameter
  +import org.picocontainer.ComponentAdapter
  +import org.picocontainer.defaults.ConstructorComponentAdapter
  +import java.io.File
  +
  +// WARNING!!!!!!
  +// DO NOT use {Class}.class as it appears to be broken in Groovy
  +// You end getting a Class instance of the type java.lang.Class
  +// instead of the requested type!  This causes AssignabilityExceptions
  +// in pico.
  +
  +
  +
  +container = new DefaultPicoContainer(parent)
  +
  +// This JNDI component helps us publish the datasource
  +Class jndiClass = JNDIComponent
  +JNDIComponent jndiImpl = new TyrexJNDIComponent()
  +container.registerComponentInstance(jndiClass, jndiImpl)
  +
  +// Create a datasource based on the HSQL server we just created
  +String url = System.getProperty("org.apache.jetspeed.database.url")
  +String driver = System.getProperty("org.apache.jetspeed.database.driver")
  +String user = System.getProperty("org.apache.jetspeed.database.user")
  +String password = System.getProperty("org.apache.jetspeed.database.password")
  +
  +if(url != null)
  +{
  +	container.registerComponentInstance(DatasourceComponent, new BoundDBCPDatasourceComponent(user,
password, driver, url, 20, 5000, GenericObjectPool.WHEN_EXHAUSTED_GROW, true, "jetspeed",
jndiImpl))
  +}
  +
  +
  +
   return container
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message