Author: cziegeler
Date: Sat Oct 23 12:11:55 2004
New Revision: 55395
Modified:
cocoon/trunk/src/blocks/axis/java/org/apache/cocoon/components/axis/SoapServerImpl.java
cocoon/trunk/src/blocks/axis/java/org/apache/cocoon/webservices/AbstractServiceableService.java
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
cocoon/trunk/src/blocks/linotype/java/org/apache/cocoon/components/SourceRepository.java
cocoon/trunk/src/blocks/lucene/java/org/apache/cocoon/generation/SearchGenerator.java
cocoon/trunk/src/blocks/lucene/samples/create-index.xsp
cocoon/trunk/src/blocks/lucene/samples/document-files.xsp
cocoon/trunk/src/blocks/lucene/samples/search-index.xsp
cocoon/trunk/src/blocks/mail/java/org/apache/cocoon/components/language/markup/xsp/java/sendmail.xsl
cocoon/trunk/src/blocks/ojb/samples/forms/success.xsp
cocoon/trunk/src/blocks/ojb/samples/jdo/xsp/demo1.xsp
cocoon/trunk/src/blocks/ojb/samples/odmg/xsp/demo1.xsp
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input/CopletModule.java
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input/LayoutModule.java
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/URICopletAdapter.java
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceSelector.java
cocoon/trunk/src/documentation/xdocs/ctwig/ctwig-installing.xml
cocoon/trunk/src/java/org/apache/cocoon/i18n/BundleFactory.java
cocoon/trunk/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java
Log:
Remove all uses of Component, Composable, ComponentException,
ComponentSelector, Final Part III
Modified:
cocoon/trunk/src/blocks/axis/java/org/apache/cocoon/components/axis/SoapServerImpl.java
==============================================================================
---
cocoon/trunk/src/blocks/axis/java/org/apache/cocoon/components/axis/SoapServerImpl.java
(original)
+++
cocoon/trunk/src/blocks/axis/java/org/apache/cocoon/components/axis/SoapServerImpl.java
Sat Oct 23 12:11:55 2004
@@ -145,7 +145,7 @@
* Compose this server
*
* @param manager a <code>ServiceManager</code> value
- * @exception ComponentException if an error occurs
+ * @exception ServiceException if an error occurs
*/
public void service(ServiceManager manager)
throws ServiceException
Modified:
cocoon/trunk/src/blocks/axis/java/org/apache/cocoon/webservices/AbstractServiceableService.java
==============================================================================
---
cocoon/trunk/src/blocks/axis/java/org/apache/cocoon/webservices/AbstractServiceableService.java
(original)
+++
cocoon/trunk/src/blocks/axis/java/org/apache/cocoon/webservices/AbstractServiceableService.java
Sat Oct 23 12:11:55 2004
@@ -60,7 +60,7 @@
setServiceManager();
} catch (org.apache.avalon.framework.service.ServiceException e) {
- throw new ServiceException("ComponentException generated", e);
+ throw new ServiceException("ServiceException generated", e);
}
}
@@ -75,7 +75,7 @@
/**
* Helper method to extract the ServiceManager reference
* from the context.
- * @exception ComponentException if an error occurs
+ * @exception org.apache.avalon.framework.service.ServiceException if an
error occurs
*/
private void setServiceManager() throws
org.apache.avalon.framework.service.ServiceException {
service(
Modified:
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
==============================================================================
---
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
(original)
+++
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
Sat Oct 23 12:11:55 2004
@@ -168,11 +168,11 @@
<xsl:if test=".//esql:connection/esql:pool">
private static ServiceSelector _esql_selector = null;
- protected ServiceSelector _esql_get_selector() throws
org.apache.avalon.framework.component.ComponentException {
+ protected ServiceSelector _esql_get_selector() throws
org.apache.avalon.framework.service.ServiceException {
if (_esql_selector == null) {
try {
_esql_selector = (ServiceSelector)
manager.lookup(DataSourceComponent.ROLE + "Selector");
- } catch (ComponentException cme) {
+ } catch (ServiceException cme) {
getLogger().error("Could not look up the datasource
component", cme);
}
}
Modified:
cocoon/trunk/src/blocks/linotype/java/org/apache/cocoon/components/SourceRepository.java
==============================================================================
---
cocoon/trunk/src/blocks/linotype/java/org/apache/cocoon/components/SourceRepository.java
(original)
+++
cocoon/trunk/src/blocks/linotype/java/org/apache/cocoon/components/SourceRepository.java
Sat Oct 23 12:11:55 2004
@@ -39,7 +39,7 @@
/**
* @author stefano
- * @version CVS $Id: SourceRepository.java,v 1.5 2004/05/25 07:28:25 cziegeler
Exp $
+ * @version CVS $Id$
*/
public class SourceRepository {
@@ -68,7 +68,7 @@
resolver = (SourceResolver) manager.lookup(SourceResolver.ROLE);
source = (TraversableSource) resolver.resolveURI(uri);
} catch (ServiceException ce) {
- throw new IOException("ComponentException");
+ throw new IOException("ServiceException");
} finally {
manager.release(resolver);
}
Modified:
cocoon/trunk/src/blocks/lucene/java/org/apache/cocoon/generation/SearchGenerator.java
==============================================================================
---
cocoon/trunk/src/blocks/lucene/java/org/apache/cocoon/generation/SearchGenerator.java
(original)
+++
cocoon/trunk/src/blocks/lucene/java/org/apache/cocoon/generation/SearchGenerator.java
Sat Oct 23 12:11:55 2004
@@ -94,7 +94,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jeremy Quinn</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Conal Tuohy</a>
- * @version CVS $Id: SearchGenerator.java,v 1.5 2004/03/05 13:01:59
bdelacretaz Exp $
+ * @version CVS $Id$
*/
public class SearchGenerator extends ServiceableGenerator
implements Contextualizable, Initializable, Disposable
@@ -738,7 +738,7 @@
} catch (IOException ioe) {
throw new ProcessingException("IOException in search", ioe);
} catch (ServiceException ce) {
- throw new ProcessingException("ComponentException in search",
ce);
+ throw new ProcessingException("ServiceException in search",
ce);
} finally {
if (lcs != null) {
this.manager.release(lcs);
Modified: cocoon/trunk/src/blocks/lucene/samples/create-index.xsp
==============================================================================
--- cocoon/trunk/src/blocks/lucene/samples/create-index.xsp (original)
+++ cocoon/trunk/src/blocks/lucene/samples/create-index.xsp Sat Oct 23
12:11:55 2004
@@ -21,7 +21,7 @@
<xsp:structure>
<xsp:include>org.apache.avalon.framework.context.ContextException</xsp:include>
-
<xsp:include>org.apache.avalon.framework.component.ComponentException</xsp:include>
+
<xsp:include>org.apache.avalon.framework.service.ServiceException</xsp:include>
<xsp:include>org.apache.cocoon.ProcessingException</xsp:include>
<xsp:include>java.net.URL</xsp:include>
<xsp:include>java.net.MalformedURLException</xsp:include>
@@ -56,9 +56,9 @@
} catch (IOException ioe) {
// ignore ??
throw new ProcessingException( "IOException in createIndex()!", ioe );
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
// ignore ??
- throw new ProcessingException( "ComponentException in createIndex()!",
ce );
+ throw new ProcessingException( "ServiceException in createIndex()!", ce
);
} finally {
if (lcii != null) {
this.manager.release( lcii );
Modified: cocoon/trunk/src/blocks/lucene/samples/document-files.xsp
==============================================================================
--- cocoon/trunk/src/blocks/lucene/samples/document-files.xsp (original)
+++ cocoon/trunk/src/blocks/lucene/samples/document-files.xsp Sat Oct 23
12:11:55 2004
@@ -21,7 +21,7 @@
<xsp:structure>
<xsp:include>org.apache.avalon.framework.context.ContextException</xsp:include>
-
<xsp:include>org.apache.avalon.framework.component.ComponentException</xsp:include>
+
<xsp:include>org.apache.avalon.framework.service.ServiceException</xsp:include>
<xsp:include>org.apache.cocoon.ProcessingException</xsp:include>
<xsp:include>java.net.URL</xsp:include>
<xsp:include>java.net.MalformedURLException</xsp:include>
Modified: cocoon/trunk/src/blocks/lucene/samples/search-index.xsp
==============================================================================
--- cocoon/trunk/src/blocks/lucene/samples/search-index.xsp (original)
+++ cocoon/trunk/src/blocks/lucene/samples/search-index.xsp Sat Oct 23
12:11:55 2004
@@ -21,7 +21,7 @@
<xsp:structure>
<xsp:include>org.apache.avalon.framework.context.ContextException</xsp:include>
-
<xsp:include>org.apache.avalon.framework.component.ComponentException</xsp:include>
+
<xsp:include>org.apache.avalon.framework.service.ServiceException</xsp:include>
<xsp:include>org.apache.cocoon.ProcessingException</xsp:include>
<xsp:include>org.apache.cocoon.components.language.markup.xsp.XSPUtil</xsp:include>
@@ -72,9 +72,9 @@
} else {
throw new ProcessingException( "ProcessingException in search", pe );
}
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
// ignore ??
- throw new ProcessingException( "ComponentException in search", ce );
+ throw new ProcessingException( "ServiceException in search", ce );
} finally {
if (lcs != null) {
this.manager.release( lcs );
Modified:
cocoon/trunk/src/blocks/mail/java/org/apache/cocoon/components/language/markup/xsp/java/sendmail.xsl
==============================================================================
---
cocoon/trunk/src/blocks/mail/java/org/apache/cocoon/components/language/markup/xsp/java/sendmail.xsl
(original)
+++
cocoon/trunk/src/blocks/mail/java/org/apache/cocoon/components/language/markup/xsp/java/sendmail.xsl
Sat Oct 23 12:11:55 2004
@@ -98,7 +98,7 @@
org.apache.cocoon.mail.MailSender _sendmail_mms = null;
try {
_sendmail_mms = (org.apache.cocoon.mail.MailSender)
this.manager.lookup(org.apache.cocoon.mail.MailSender.ROLE);
- } catch (org.apache.avalon.framework.component.ComponentException e) {
+ } catch (org.apache.avalon.framework.service.ServiceException e) {
throw new ProcessingException("Could not setup mail components.", e);
}
Modified: cocoon/trunk/src/blocks/ojb/samples/forms/success.xsp
==============================================================================
--- cocoon/trunk/src/blocks/ojb/samples/forms/success.xsp (original)
+++ cocoon/trunk/src/blocks/ojb/samples/forms/success.xsp Sat Oct 23
12:11:55 2004
@@ -53,7 +53,7 @@
bean.setId(((Integer)fid.getValue()).intValue());
dao.retrieve(bean, factory);
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new ProcessingException("Could not lookup JDO
PersistanceManagerFactory", ce);
} finally {
if (factory != null) {
Modified: cocoon/trunk/src/blocks/ojb/samples/jdo/xsp/demo1.xsp
==============================================================================
--- cocoon/trunk/src/blocks/ojb/samples/jdo/xsp/demo1.xsp (original)
+++ cocoon/trunk/src/blocks/ojb/samples/jdo/xsp/demo1.xsp Sat Oct 23
12:11:55 2004
@@ -49,7 +49,7 @@
try {
pmf = (JdoPMF)
manager.lookup(JdoPMF.ROLE);
persistenceManager =
pmf.getPersistenceManager();
- } catch (ComponentException cme) {
+ } catch (ServiceException cme) {
getLogger().error("Could not look up
the PersistenceManager", cme);
}
<!-- Setting up the Bean -->
Modified: cocoon/trunk/src/blocks/ojb/samples/odmg/xsp/demo1.xsp
==============================================================================
--- cocoon/trunk/src/blocks/ojb/samples/odmg/xsp/demo1.xsp (original)
+++ cocoon/trunk/src/blocks/ojb/samples/odmg/xsp/demo1.xsp Sat Oct 23
12:11:55 2004
@@ -49,7 +49,7 @@
try {
odmgImpl = (OdmgImplementation)manager.lookup(
OdmgImplementation.ROLE );
impl = odmgImpl.getInstance( "personnel" );
- } catch (ComponentException cme) {
+ } catch (ServiceException cme) {
getLogger().error("Could not look up
the ODMG Implementation", cme);
} catch (ODMGException oe) {
getLogger().error("Failed to
instantiate ODMG Implementation", oe);
Modified:
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input/CopletModule.java
==============================================================================
---
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input/CopletModule.java
(original)
+++
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input/CopletModule.java
Sat Oct 23 12:11:55 2004
@@ -61,7 +61,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Björn Lütkemeier</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Id: CopletModule.java,v 1.11 2004/03/05 13:02:10 bdelacretaz
Exp $
+ * @version CVS $Id$
*/
public class CopletModule
implements InputModule, Serviceable, ThreadSafe {
@@ -120,7 +120,7 @@
return value.toString();
} catch (ServiceException e) {
- throw new ConfigurationException("ComponentException ", e);
+ throw new ConfigurationException("ServiceException ", e);
} finally {
this.manager.release(portalService);
}
Modified:
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input/LayoutModule.java
==============================================================================
---
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input/LayoutModule.java
(original)
+++
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input/LayoutModule.java
Sat Oct 23 12:11:55 2004
@@ -37,7 +37,7 @@
* The syntax to use is LAYOUT_ID/PATH or LAYOUT_KEY:LAYOUT_ID/PATH
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Id: LayoutModule.java,v 1.2 2004/03/05 13:02:10 bdelacretaz
Exp $
+ * @version CVS $Id$
*/
public class LayoutModule
implements InputModule, Serviceable, ThreadSafe {
@@ -98,7 +98,7 @@
return value;
} catch (ServiceException e) {
- throw new ConfigurationException("ComponentException ", e);
+ throw new ConfigurationException("ServiceException ", e);
} finally {
this.manager.release(portalService);
}
Modified:
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/URICopletAdapter.java
==============================================================================
---
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/URICopletAdapter.java
(original)
+++
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/URICopletAdapter.java
Sat Oct 23 12:11:55 2004
@@ -53,7 +53,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Volker Schmitt</a>
*
- * @version CVS $Id: URICopletAdapter.java,v 1.14 2004/03/05 13:02:10
bdelacretaz Exp $
+ * @version CVS $Id$
*/
public class URICopletAdapter
extends AbstractCopletAdapter
@@ -132,7 +132,7 @@
} catch (ProcessingException pe) {
throw new SAXException("ProcessingException", pe);
} catch (ServiceException ce) {
- throw new SAXException("ComponentException", ce);
+ throw new SAXException("ServiceException", ce);
} finally {
this.resolver.release(copletSource);
this.manager.release(portalService);
Modified:
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java
==============================================================================
---
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java
(original)
+++
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java
Sat Oct 23 12:11:55 2004
@@ -157,7 +157,7 @@
component = handler.get();
} catch( final ServiceException ce ) {
- // Rethrow instead of wrapping a ComponentException with
another one
+ // Rethrow instead of wrapping a ServiceException with another
one
throw ce;
} catch( final Exception e ) {
final String message = "Could not access the Component";
Modified:
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceSelector.java
==============================================================================
---
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceSelector.java
(original)
+++
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceSelector.java
Sat Oct 23 12:11:55 2004
@@ -21,7 +21,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -451,7 +450,7 @@
* Set the ComponentLocatorImpl that allows access to a possible
* parent of this selector
* @param locator
- * @throws ComponentException
+ * @throws ServiceException
*/
public void setParentLocator(ServiceManager locator, String role)
throws ServiceException {
Modified: cocoon/trunk/src/documentation/xdocs/ctwig/ctwig-installing.xml
==============================================================================
--- cocoon/trunk/src/documentation/xdocs/ctwig/ctwig-installing.xml
(original)
+++ cocoon/trunk/src/documentation/xdocs/ctwig/ctwig-installing.xml Sat Oct
23 12:11:55 2004
@@ -59,7 +59,7 @@
<p>An important point is that if you are
running Tomcat as an NT service then you will need to change
{TOMCAT_HOME}\conf\wrapper.properties to reflect the classpath changes. Make
sure xerces is first in line, remove (or comment out) the jaxp and rename the
parser.jar reference. This is all done with the wrapper.class_path bit.</p>
<p>If you did run the second build.bat command
above or if you copy cocoon.war into {TOMCAT_HOME}\webapps then you can check
that C2 is working. Restart Tomcat and http://localhost:8080/cocoon should
work. Note at this point Apache is doing nothing - Tomcat is doing the http
serving. If there are any problems then check that the Tomcat classpath in
wrapper.properties is correct and you have done the work in {TOMCAT_HOME}\lib
as descibed above.</p>
<p>One other situation that came to light in C2
RC1 (and resolved in RC1a) was that the build file was including a reference to
the LDAP transformer classes and since the JAR is not included then you would
see an error when starting C2 along the lines of:</p>
- <p>org.apache.cocoon.ProcessingException:
Exception in Handler: org.apache.avalon.framework.component.ComponentException:
Could not set up Component for hint: org\apache\cocoon\www\sitemap_xmap</p>
+ <p>org.apache.cocoon.ProcessingException:
Exception in Handler: org.apache.avalon.framework.service.ServiceException:
Could not set up Component for hint: org\apache\cocoon\www\sitemap_xmap</p>
<p>This was resolved in C2 RC1a by making
changing the offending include line in build.xml. Have a look and see. You
will need to change this line if you want to use the LDAP transformer as per
the instructions in the build.xml file.</p>
<p>One other good point about testing,
especially if you are upgrading, is to delete the Cocoon working files in
{TOMCAT_HOME}\work. If left in between upgrades, you can easily get
precompiled code sent instead of the new pages being compiled and served.</p>
</s2>
Modified: cocoon/trunk/src/java/org/apache/cocoon/i18n/BundleFactory.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/i18n/BundleFactory.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/i18n/BundleFactory.java Sat Oct
23 12:11:55 2004
@@ -48,7 +48,7 @@
* @param bundleName bundle name
* @param locale locale name
* @return the bundle
- * @exception ComponentException if a bundle is not found
+ * @exception Exception if a bundle is not found
*/
Bundle select(String base, String bundleName, String locale) throws
Exception;
@@ -60,7 +60,7 @@
* @param bundleName bundle name
* @param locale locale
* @return the bundle
- * @exception ComponentException if a bundle is not found
+ * @exception Exception if a bundle is not found
*/
Bundle select(String base, String bundleName, Locale locale) throws
Exception;
@@ -72,7 +72,7 @@
* @param bundleName bundle name
* @param locale locale
* @return the bundle
- * @exception ComponentException if a bundle is not found
+ * @exception Exception if a bundle is not found
*/
Bundle select(String[] directories, String bundleName, Locale locale)
throws Exception;
@@ -83,7 +83,7 @@
* @param bundleName bundle name
* @param locale locale name
* @return the bundle
- * @exception ComponentException if a bundle is not found
+ * @exception Exception if a bundle is not found
*/
Bundle select(String bundleName, String locale) throws Exception;
@@ -94,7 +94,7 @@
* @param bundleName bundle name
* @param locale locale
* @return the bundle
- * @exception ComponentException if a bundle is not found
+ * @exception Exception if a bundle is not found
*/
Bundle select(String bundleName, Locale locale) throws Exception;
Modified:
cocoon/trunk/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java
Sat Oct 23 12:11:55 2004
@@ -24,7 +24,6 @@
import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -168,9 +167,9 @@
* @param name bundle name
* @param locale locale name
* @return the bundle
- * @exception ComponentException if a bundle is not found
+ * @exception Exception if a bundle is not found
*/
- public Bundle select(String name, String locale) throws ComponentException
{
+ public Bundle select(String name, String locale) throws Exception {
return select(getDirectory(), name, locale);
}
@@ -180,9 +179,9 @@
* @param name bundle name
* @param locale locale
* @return the bundle
- * @exception ComponentException if a bundle is not found
+ * @exception Exception if a bundle is not found
*/
- public Bundle select(String name, Locale locale) throws ComponentException
{
+ public Bundle select(String name, Locale locale) throws Exception {
return select(getDirectory(), name, locale);
}
@@ -194,9 +193,9 @@
* @param name bundle name
* @param localeName locale name
* @return the bundle
- * @exception ComponentException if a bundle is not found
+ * @exception Exception if a bundle is not found
*/
- public Bundle select(String directory, String name, String localeName)
throws ComponentException {
+ public Bundle select(String directory, String name, String localeName)
throws Exception {
return select(directory, name, new Locale(localeName, localeName));
}
@@ -208,9 +207,9 @@
* @param name bundle name
* @param locale locale
* @return the bundle
- * @exception ComponentException if a bundle is not found
+ * @exception Exception if a bundle is not found
*/
- public Bundle select(String directory, String name, Locale locale) throws
ComponentException {
+ public Bundle select(String directory, String name, Locale locale) throws
Exception {
String []directories = new String[1];
directories[0] = directory;
return select(directories, name, locale);
@@ -224,13 +223,13 @@
* @param name bundle name
* @param locale locale
* @return the bundle
- * @exception ComponentException if a bundle is not found
+ * @exception Exception if a bundle is not found
*/
public Bundle select(String[] directories, String name, Locale locale)
- throws ComponentException {
+ throws Exception {
Bundle bundle = _select(directories, 0, name, locale);
if (bundle == null) {
- throw new ComponentException(name, "Unable to locate resource: " +
name);
+ throw new Exception("Unable to locate resource: " + name);
}
return bundle;
}
