portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject cvs commit: jakarta-jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/containers rdbms.container.groovy
Date Tue, 09 Mar 2004 16:17:02 GMT
weaver      2004/03/09 08:17:02

  Modified:    components/rdbms/src/java/org/apache/jetspeed/containers
                        rdbms.container.groovy
  Log:
  - added property checks
  - now uses parent container
  
  
  Revision  Changes    Path
  1.7       +5 -3      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- rdbms.container.groovy	27 Feb 2004 19:44:11 -0000	1.6
  +++ rdbms.container.groovy	9 Mar 2004 16:17:02 -0000	1.7
  @@ -20,7 +20,7 @@
   
   
   
  -container = new DefaultPicoContainer()
  +container = new DefaultPicoContainer(parent)
   
   // This JNDI component helps us publish the datasource
   Class jndiClass = JNDIComponent
  @@ -28,13 +28,15 @@
   container.registerComponentInstance(jndiClass, jndiImpl)
   
   // Create a datasource based on the HSQL server we just created
  -Class dsClass = Class.forName("org.apache.jetspeed.components.datasource.DatasourceComponent")
   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")
   
  -container.registerComponentInstance(dsClass, new BoundDBCPDatasourceComponent(user, password,
driver, url, 20, 5000, GenericObjectPool.WHEN_EXHAUSTED_GROW, true, "jetspeed", jndiImpl))
  +if(url != null)
  +{
  +	container.registerComponentInstance(DatasourceComponent, new BoundDBCPDatasourceComponent(user,
password, driver, url, 20, 5000, GenericObjectPool.WHEN_EXHAUSTED_GROW, true, "jetspeed",
jndiImpl))
  +}
   
   
   
  
  
  

---------------------------------------------------------------------
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