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/portal/src/webapp/WEB-INF/assembly jetspeed.groovy
Date Fri, 27 Feb 2004 17:59:03 GMT
weaver      2004/02/27 09:59:03

  Modified:    portal/src/webapp/WEB-INF/assembly jetspeed.groovy
  Log:
  removed all HSQL specific references from the project.
  
  Building will now require the user to start the test HSQL server for "allBuild"
  and the production server for inatallProductionDb and any deployment goals
  
  Revision  Changes    Path
  1.15      +10 -10    jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed.groovy
  
  Index: jetspeed.groovy
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed.groovy,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- jetspeed.groovy	26 Feb 2004 22:50:41 -0000	1.14
  +++ jetspeed.groovy	27 Feb 2004 17:59:03 -0000	1.15
  @@ -79,15 +79,6 @@
   container.registerComponentInstance("CastorXmlPageManager", 
                                        new CastorXmlPageManager(idgenerator, fileCache, root))
   
  -//
  -// HSQL Server 
  -//                
  -
  -// container.registerComponentInstance(new HSQLServerComponent(9001, "sa","",applicationRoot+"WEB-INF/db/hsql/Registry",false,
true))                     
  -container.registerComponentInstance(new HSQLServerComponent(9001, "sa","", System.getProperty(HSQLServerComponent.SYS_PROP_HSQLDBSERVER_DB_PATH),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")
  @@ -95,7 +86,16 @@
   
   // 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", 5, 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")
  +
  +// Only create a datasource if the properties can be found
  +if(url != null)
  +{
  +	container.registerComponentInstance(dsClass, new DBCPDatasourceComponent(user, password,
driver, url, 20, 5000, GenericObjectPool.WHEN_EXHAUSTED_GROW, true))
  +}
   
   
   //
  
  
  

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