weaver      2004/08/02 13:32:49

  Modified:    portal/src/java/org/apache/jetspeed/engine SpringEngine.java
  Log:
  Make sure data source is always started first.
  
  Revision  Changes    Path
  1.7       +9 -2      
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/SpringEngine.java
  
  Index: SpringEngine.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/SpringEngine.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SpringEngine.java 2 Aug 2004 19:41:34 -0000       1.6
  +++ SpringEngine.java 2 Aug 2004 20:32:49 -0000       1.7
  @@ -95,7 +95,14 @@
           String[] configs = new String[configFiles.length];
           for(int i=0; i<configFiles.length; i++)
           {
  -            configs[i] = 
configFiles[i].getCanonicalFile().toURL().toExternalForm();            
  +            configs[i] = configFiles[i].getCanonicalFile().toURL().toExternalForm();
  +            if(configs[i].indexOf("pooled-datasource-support") > -1 && i > 0)
  +            {        
  +                String current0Offset = configs[0];
  +                configs[0] = configs[i];
  +                configs[i] = current0Offset;
  +                
  +            }          
           }
           
           ComponentManager cm = new SpringComponentManager(configs, null);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to