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 2011/03/26 16:55:02 UTC

svn commit: r1085744 - in /myfaces/core/branches/2.1.x: api/src/main/java/javax/faces/context/ impl/src/main/java/org/apache/myfaces/context/servlet/

Author: lu4242
Date: Sat Mar 26 15:55:02 2011
New Revision: 1085744

URL: http://svn.apache.org/viewvc?rev=1085744&view=rev
Log:
MYFACES-3088 Implement ExternalContext.isSecure() and getSessionMaxInactiveInterval() method

Modified:
    myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/context/ExternalContext.java
    myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/context/ExternalContextWrapper.java
    myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java

Modified: myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/context/ExternalContext.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/context/ExternalContext.java?rev=1085744&r1=1085743&r2=1085744&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/context/ExternalContext.java (original)
+++ myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/context/ExternalContext.java Sat Mar 26 15:55:02 2011
@@ -685,4 +685,55 @@ public abstract class ExternalContext
         
         ctx.setResponseStatus(statusCode);
     }
+    
+    /**
+     * 
+     * @since 2.1
+     * @return
+     */
+    public boolean isSecure()
+    {
+        ExternalContext ctx = _MyFacesExternalContextHelper._firstInstance.get();
+        
+        if (ctx == null)
+        {
+            throw new UnsupportedOperationException();
+        }
+
+        return ctx.isSecure();
+    }
+    
+    /**
+     * 
+     * @since 2.1
+     * @return
+     */
+    public int getSessionMaxInactiveInterval()
+    {
+        ExternalContext ctx = _MyFacesExternalContextHelper._firstInstance.get();
+        
+        if (ctx == null)
+        {
+            throw new UnsupportedOperationException();
+        }
+
+        return ctx.getSessionMaxInactiveInterval();
+    }
+    
+    /**
+     * 
+     * @since 2.1
+     * @param interval
+     */
+    public void setSessionMaxInactiveInterval(int interval)
+    {
+        ExternalContext ctx = _MyFacesExternalContextHelper._firstInstance.get();
+        
+        if (ctx == null)
+        {
+            throw new UnsupportedOperationException();
+        }
+        
+        ctx.setSessionMaxInactiveInterval(interval);
+    }
 }

Modified: myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/context/ExternalContextWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/context/ExternalContextWrapper.java?rev=1085744&r1=1085743&r2=1085744&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/context/ExternalContextWrapper.java (original)
+++ myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/context/ExternalContextWrapper.java Sat Mar 26 15:55:02 2011
@@ -459,4 +459,22 @@ public abstract class ExternalContextWra
     {
         getWrapped().setResponseStatus(statusCode);
     }
+
+    @Override
+    public boolean isSecure()
+    {
+        return getWrapped().isSecure();
+    }
+
+    @Override
+    public int getSessionMaxInactiveInterval()
+    {
+        return getWrapped().getSessionMaxInactiveInterval();
+    }
+
+    @Override
+    public void setSessionMaxInactiveInterval(int interval)
+    {
+        getWrapped().setSessionMaxInactiveInterval(interval);
+    }
 }

Modified: myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java?rev=1085744&r1=1085743&r2=1085744&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java (original)
+++ myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java Sat Mar 26 15:55:02 2011
@@ -843,4 +843,22 @@ public final class ServletExternalContex
     {
         return FlashImpl.getCurrentInstance(this);
     }
+
+    @Override
+    public boolean isSecure()
+    {
+        return _servletRequest.isSecure();
+    }
+
+    @Override
+    public int getSessionMaxInactiveInterval()
+    {
+        throw new UnsupportedOperationException();
+    }
+    
+    @Override
+    public void setSessionMaxInactiveInterval(int interval)
+    {
+        throw new UnsupportedOperationException();
+    }
 }