I dont have access to the cvs right now so here is the best I can do until I
get access. Here is a patch with the diff running against the b4 version of
turbine:
##########################################################
[thor@thor turbine-beta]$ diff
vb.4/src/java/org/apache/turbine/services/BaseServiceBroker.java
my_src/java/org/apache/turbine/services/BaseServiceBroker.java
28,30c28,30
< * 4. The names "Apache" and "Apache Software Foundation" and
< * "Apache Turbine" must not be used to endorse or promote products
< * derived from this software without prior written permission. For
---
> * 4. The names "Apache" and "Apache Software Foundation" and
> * "Apache Turbine" must not be used to endorse or promote products
> * derived from this software without prior written permission. For
34c34
< * "Apache Turbine", nor may "Apache" appear in their name, without
---
> * "Apache Turbine", nor may "Apache" appear in their name, without
58a59
> import java.util.ArrayList;
59a61
> import java.util.Set;
62a65,67
> import org.apache.turbine.services.logging.LoggingService;
> import org.apache.turbine.services.resources.ResourceService;
>
131c136
< "ServiceBroker: initialization of unknown service " +
---
> "ServiceBroker: initialization of unknown service " +
159c164
< * Performs early initiailzation of all services. You can decide
---
> * Performs early initiailzation of all services. You can decide
170c175
< notice("Initializing all services using: " +
---
> notice("Initializing all services using: " +
173,174c178,179
< // throw exceptions
< if(report)
---
> // throw exceptions
> if(report)
217c222
<
---
>
242c247
< * Shuts down all Turbine services, releasing allocated resources and
---
> * Shuts down all Turbine services, releasing allocated resources and
247,248c252,256
< notice("Shutting down all services!");
< Enumeration serviceNames = mapping.keys();
---
> notice("Shutting down all services!!!!!!!!!!!!!!");
>
> Set serviceNamesSet = mapping.keySet();
> Iterator serviceNames = serviceNamesSet.iterator();
>
250c258,261
< while (serviceNames.hasMoreElements())
---
> ArrayList namesList = new ArrayList();
> ArrayList lastNamesList = new ArrayList();
>
> while (serviceNames.hasNext())
252c263,285
< serviceName = (String)serviceNames.nextElement();
---
> String thisServiceName = (String)serviceNames.next();
>
> if (thisServiceName.equals(LoggingService.SERVICE_NAME) ||
> thisServiceName.equals(ResourceService.SERVICE_NAME))
> {
> lastNamesList.add(thisServiceName);
> }
> else
> {
> namesList.add(thisServiceName);
> }
> }
> // shutdown in reverse order
> for (int i=(namesList.size()-1); i >= 0; i--)
> {
> serviceName = (String)namesList.get(i);
> notice("Shutting down service: " + serviceName);
> shutdownService(serviceName);
> }
> //shutdown the logging and resource services
> for (int i=(lastNamesList.size()-1); i >= 0; i--)
> {
> serviceName = (String)lastNamesList.get(i);
255a289
>
298c332
< throw new InstantiationException("Service " + name +
---
> throw new InstantiationException("Service " + name +
##########################################################
This puts the names in reverse order (which I am not sure is really necessary
unless the order actually works) and the saves the Logging and Resource
Services for last.
John
--
********************************
** John Thorhauer
** [EMAIL PROTECTED]
** take a look at:
** http://tambora.zenplex.org
** http://www.zenplex.org
** http://www.zenplex.com
********************************
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
