myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwald...@apache.org
Subject svn commit: r1137848 - in /myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin: StyleSheetEntry.java StyleSheetNameResolver.java
Date Tue, 21 Jun 2011 02:31:32 GMT
Author: jwaldman
Date: Tue Jun 21 02:31:32 2011
New Revision: 1137848

URL: http://svn.apache.org/viewvc?rev=1137848&view=rev
Log:
Bug 11710811 - backport 9380599 to ps5 - filenotfoundexception in o.adfinternal.view.faces.re
commit to 1.2.12.6-branch

Modified:
    myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java
    myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java

Modified: myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java?rev=1137848&r1=1137847&r2=1137848&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java
(original)
+++ myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java
Tue Jun 21 02:31:32 2011
@@ -349,9 +349,9 @@ class StyleSheetEntry
     }
     catch (IOException e)
     {
-      if (_LOG.isSevere())
-        _LOG.severe("CANNOT_LOAD_STYLESHEET", styleSheetName);
-        _LOG.severe(e);
+      if (_LOG.isWarning())
+        _LOG.warning("CANNOT_LOAD_STYLESHEET", styleSheetName);
+        _LOG.warning(e.getMessage());
     }
     if (resolver == null)
     {
@@ -386,7 +386,7 @@ class StyleSheetEntry
    * @return NameResolver - either a StyleSheetNameResolver or the META-INF/services NameResolver
    * implementation. The META-INF/services NameResolver implementation is the way a third
party
    * can customize the way they find and load files.
-   * @throws IOException when the file could not be found in all of the ways we tried to
find it.
+   * @throws FileNotFoundException when the file could not be found in all of the ways we
tried to find it.
    */
   private static NameResolver _getNameResolverForStyleSheetFile(
     StyleContext context, 
@@ -547,7 +547,7 @@ class StyleSheetEntry
   private static String _getFileNotFoundMessage(File localStylesDir, String name)
   {
     StringBuffer buffer = new StringBuffer();
-    buffer.append("Unable to locate style sheet \"");
+    buffer.append("Unable to locate the skin's style sheet \"");
     buffer.append(name);
     buffer.append("\" in ");
 

Modified: myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java?rev=1137848&r1=1137847&r2=1137848&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java
(original)
+++ myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java
Tue Jun 21 02:31:32 2011
@@ -19,23 +19,14 @@
 package org.apache.myfaces.trinidadinternal.skin;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 
-import java.net.MalformedURLException;
 import java.net.URL;
 
-import javax.faces.context.FacesContext;
-
-import org.apache.myfaces.trinidad.util.ClassLoaderUtils;
-
-import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 import org.apache.myfaces.trinidad.share.io.InputStreamProvider;
 import org.apache.myfaces.trinidad.share.io.NameResolver;
 
 import org.apache.myfaces.trinidadinternal.share.io.DefaultNameResolver;
-import org.apache.myfaces.trinidadinternal.share.io.FileInputStreamProvider;
-import org.apache.myfaces.trinidadinternal.share.io.URLInputStreamProvider;
 
 import org.apache.myfaces.trinidadinternal.style.StyleContext;
 
@@ -133,8 +124,6 @@ class StyleSheetNameResolver implements 
 
   private File _localStylesDir;
   private InputStreamProvider _provider;
-  private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(StyleSheetNameResolver.class);
-  private static final String _SERVICES_PROVIDER_KEY =
-    "org.apache.myfaces.trinidadinternal.skin.SERVICES_PROVIDER_KEY";
+  
 }
 



Mime
View raw message