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/registry/src/java/org/apache/jetspeed/containers registry.container.groovy
Date Fri, 27 Feb 2004 18:30:00 GMT
weaver      2004/02/27 10:30:00

  Modified:    portal/src/java/org/apache/jetspeed/capability/containers
                        capability-container.groovy
               components/rdbms/src/java/org/apache/jetspeed/containers
                        rdbms.container.groovy
               components/registry/src/java/org/apache/jetspeed/containers
                        registry.container.groovy
  Log:
  - removed HSQL references from .groovy script
  
  Revision  Changes    Path
  1.2       +9 -15     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capability/containers/capability-container.groovy
  
  Index: capability-container.groovy
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capability/containers/capability-container.groovy,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- capability-container.groovy	26 Feb 2004 22:50:41 -0000	1.1
  +++ capability-container.groovy	27 Feb 2004 18:30:00 -0000	1.2
  @@ -5,8 +5,6 @@
   import org.picocontainer.defaults.ConstantParameter
   import org.picocontainer.defaults.ComponentParameter
   import org.hsqldb.jdbcDriver
  -import org.apache.jetspeed.components.hsql.HSQLServerComponent
  -import org.apache.jetspeed.components.hsql.HSQLServerComponent
   import org.apache.jetspeed.components.jndi.JNDIComponent
   import org.apache.jetspeed.components.jndi.TyrexJNDIComponent
   import org.apache.jetspeed.components.datasource.DBCPDatasourceComponent
  @@ -26,25 +24,21 @@
   // create the root container
   container = new DefaultPicoContainer()
   
  -
  -// This is the HSQL engine that holds the test registry
  -if(new File("./test/db/hsql").exists())
  -{
  -   container.registerComponentInstance(new HSQLServerComponent(9001, "sa","","./test/db/hsql/Registry",false,
true))
  -}
  -else
  -{
  -   container.registerComponentInstance(new HSQLServerComponent(9001, "sa","","./portal/test/db/hsql/Registry",false,
true))
  -}
  -
   // This JNDI component helps us publish the datasource
   Class jndiClass = Class.forName("org.apache.jetspeed.components.jndi.JNDIComponent")
   Class tyrexJndiClass = Class.forName("org.apache.jetspeed.components.jndi.TyrexJNDIComponent")
   container.registerComponentImplementation(jndiClass, tyrexJndiClass)
   
  -// Create a datasource based on the HSQL server we just created
   Class dsClass = Class.forName("org.apache.jetspeed.components.datasource.DatasourceComponent")
  -container.registerComponentInstance(dsClass, new DBCPDatasourceComponent("sa","", "org.hsqldb.jdbcDriver",
"jdbc:hsqldb:hsql://127.0.0.1", 20, 5000, GenericObjectPool.WHEN_EXHAUSTED_GROW, true))
  +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(dsClass, new DBCPDatasourceComponent(user, password,
driver, url, 20, 5000, GenericObjectPool.WHEN_EXHAUSTED_GROW, true))
  +}
   
   //
   // Persistence
  
  
  
  1.5       +0 -1      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- rdbms.container.groovy	27 Feb 2004 17:49:12 -0000	1.4
  +++ rdbms.container.groovy	27 Feb 2004 18:30:00 -0000	1.5
  @@ -1,6 +1,5 @@
   import org.picocontainer.defaults.DefaultPicoContainer
   import org.apache.commons.configuration.PropertiesConfiguration
  -import org.apache.jetspeed.components.hsql.HSQLServerComponent
   import org.apache.jetspeed.components.jndi.JNDIComponent
   import org.apache.jetspeed.components.jndi.TyrexJNDIComponent
   import org.apache.jetspeed.components.datasource.DBCPDatasourceComponent
  
  
  
  1.3       +4 -4      jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/containers/registry.container.groovy
  
  Index: registry.container.groovy
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/containers/registry.container.groovy,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- registry.container.groovy	27 Feb 2004 17:50:01 -0000	1.2
  +++ registry.container.groovy	27 Feb 2004 18:30:00 -0000	1.3
  @@ -6,8 +6,6 @@
   import org.picocontainer.defaults.ConstantParameter
   import org.picocontainer.defaults.ComponentParameter
   import org.hsqldb.jdbcDriver
  -import org.apache.jetspeed.components.hsql.HSQLServerComponent
  -import org.apache.jetspeed.components.hsql.HSQLServerComponent
   import org.apache.jetspeed.components.jndi.JNDIComponent
   import org.apache.jetspeed.components.jndi.TyrexJNDIComponent
   import org.apache.jetspeed.components.datasource.DBCPDatasourceComponent
  @@ -43,14 +41,16 @@
   Class tyrexJndiClass = Class.forName("org.apache.jetspeed.components.jndi.TyrexJNDIComponent")
   container.registerComponentImplementation(jndiClass, tyrexJndiClass)
   
  -// 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 DBCPDatasourceComponent(user, password,
driver, url, 20, 5000, GenericObjectPool.WHEN_EXHAUSTED_GROW, true))
  +if(url != null)
  +{
  +	container.registerComponentInstance(dsClass, new DBCPDatasourceComponent(user, password,
driver, url, 20, 5000, GenericObjectPool.WHEN_EXHAUSTED_GROW, true))
  +}
   
   //
   // Persistence
  
  
  

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