dev@javaserverfaces.java.net

Re: [REVIEW] Minor cleanup to jar ordering change

From: Roger Kitain <Roger.Kitain_at_Sun.COM>
Date: Thu, 08 Dec 2005 14:46:18 -0500

r=rogerk

Ryan Lubke wrote:

> SECTION: Modified Files
> ----------------------------
> M src/com/sun/faces/config/ConfigureListener.java
> - remove misleading error message. Wrap IOException
> as FacesException and throw it.
>
>
> SECTION: Diffs
> ----------------------------
> Index: src/com/sun/faces/config/ConfigureListener.java
> ===================================================================
> RCS file:
> /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/config/ConfigureListener.java,v
>
> retrieving revision 1.56
> diff -u -r1.56 ConfigureListener.java
> --- src/com/sun/faces/config/ConfigureListener.java 3 Dec 2005
> 20:30:21 -0000 1.56
> +++ src/com/sun/faces/config/ConfigureListener.java 8 Dec 2005
> 19:03:36 -0000
> @@ -455,24 +455,12 @@
> unsortedResourceList.add(0, nextElement);
> }
> }
> - } catch (IOException e) {
> - String message = null;
> - try {
> - message = Util.getExceptionMessageString
> - (Util.CANT_PARSE_FILE_ERROR_MESSAGE_ID,
> - new Object[]{ META_INF_RESOURCES });
> - } catch (Exception ee) {
> - message = "Can't parse configuration file:" +
> - META_INF_RESOURCES;
> - }
> - if ( logger.isLoggable(Level.WARNING)) {
> - logger.log(Level.WARNING, message, e);
> - }
> - throw new FacesException(message, e);
> + } catch (IOException e) { + throw new
> FacesException(e);
> }
> // Load the sorted resources first:
> - Iterator<Map.Entry<String,URL>> sortedResources =
> - sortedJarMap.entrySet().iterator();
> + Iterator<Map.Entry<String,URL>> sortedResources =
> + sortedJarMap.entrySet().iterator();
> while (sortedResources.hasNext()) {
> url = sortedResources.next().getValue();
> parse(digester, url, fcb);
> @@ -2064,10 +2052,9 @@
>
>
> /**
> - * <p>Return <code>true</code> if the
> <code>WebXmlProcessor</code>
> + * @return <code>true</code> if the <code>WebXmlProcessor</code>
> * detected a <code>FacesServlet</code> entry, otherwise return
> - * <code>false</code>.</p>
> - * @return
> + * <code>false</code>.</p> */
> boolean isFacesServletPresent() {
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_javaserverfaces.dev.java.net
> For additional commands, e-mail: dev-help_at_javaserverfaces.dev.java.net
>