You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2013/11/01 17:47:10 UTC

svn commit: r1537983 - in /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces: config/annotation/DefaultLifecycleProviderFactory.java spi/impl/DefaultInjectionProviderFactory.java webapp/AbstractFacesInitializer.java

Author: lu4242
Date: Fri Nov  1 16:47:09 2013
New Revision: 1537983

URL: http://svn.apache.org/r1537983
Log:
Small fix user reflection for InitialContext lookup to avoid restricted API in GAE

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultInjectionProviderFactory.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java?rev=1537983&r1=1537982&r2=1537983&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java Fri Nov  1 16:47:09 2013
@@ -296,7 +296,7 @@ public class DefaultLifecycleProviderFac
             //On Google App Engine, javax.naming.Context is a restricted class.
             //In that case, NoClassDefFoundError is thrown. stageName needs to be configured
             //below by context parameter.
-            log.log(Level.SEVERE, "No InitialContext class found. Using NoInjectionAnnotationProcessor.", e);
+            log.log(Level.SEVERE, "No InitialContext class definition found. Using NoInjectionAnnotationProcessor.");
             return new NoInjectionAnnotationLifecycleProvider();
         }
     }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultInjectionProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultInjectionProviderFactory.java?rev=1537983&r1=1537982&r2=1537983&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultInjectionProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultInjectionProviderFactory.java Fri Nov  1 16:47:09 2013
@@ -322,7 +322,7 @@ public class DefaultInjectionProviderFac
             //On Google App Engine, javax.naming.Context is a restricted class.
             //In that case, NoClassDefFoundError is thrown. stageName needs to be configured
             //below by context parameter.
-            log.log(Level.SEVERE, "No InitialContext class found. Using NoInjectionAnnotationProcessor.", e);
+            log.log(Level.SEVERE, "No InitialContext class definition found. Using NoInjectionAnnotationProcessor.");
             return new NoInjectionAnnotationInjectionProvider();
         }
     }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java?rev=1537983&r1=1537982&r2=1537983&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java Fri Nov  1 16:47:09 2013
@@ -591,6 +591,12 @@ public abstract class AbstractFacesIniti
                 {
                     // silently ignore
                 }
+                catch (NoClassDefFoundError e)
+                {
+                    //On Google App Engine, javax.naming.Context is a restricted class.
+                    //In that case, NoClassDefFoundError is thrown. stageName needs to be configured
+                    //below by context parameter.
+                }
 
                 if (beanManager == null)
                 {
@@ -604,6 +610,12 @@ public abstract class AbstractFacesIniti
                     {
                         // silently ignore
                     }
+                    catch (NoClassDefFoundError e)
+                    {
+                        //On Google App Engine, javax.naming.Context is a restricted class.
+                        //In that case, NoClassDefFoundError is thrown. stageName needs to be configured
+                        //below by context parameter.
+                    }
                 }
             }
         }