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/02/12 16:37:45 UTC
svn commit: r1445199 - in /myfaces/core/branches/2.2.x:
api/src/main/java/javax/faces/context/
impl/src/main/java/org/apache/myfaces/context/servlet/
Author: lu4242
Date: Tue Feb 12 15:37:45 2013
New Revision: 1445199
URL: http://svn.apache.org/r1445199
Log:
MYFACES-3693 Implement ExternalContext.getApplicationContextPath() (Thanks to Paul Nicolucci for provide this patch)
Modified:
myfaces/core/branches/2.2.x/api/src/main/java/javax/faces/context/ExternalContext.java
myfaces/core/branches/2.2.x/api/src/main/java/javax/faces/context/ExternalContextWrapper.java
myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImplBase.java
Modified: myfaces/core/branches/2.2.x/api/src/main/java/javax/faces/context/ExternalContext.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.2.x/api/src/main/java/javax/faces/context/ExternalContext.java?rev=1445199&r1=1445198&r2=1445199&view=diff
==============================================================================
--- myfaces/core/branches/2.2.x/api/src/main/java/javax/faces/context/ExternalContext.java (original)
+++ myfaces/core/branches/2.2.x/api/src/main/java/javax/faces/context/ExternalContext.java Tue Feb 12 15:37:45 2013
@@ -792,4 +792,20 @@ public abstract class ExternalContext
return ctx.getSessionId(create);
}
+
+ /**
+ * @since 2.2
+ * @return
+ */
+ public String getApplicationContextPath()
+ {
+ ExternalContext ctx = _MyFacesExternalContextHelper.firstInstance.get();
+
+ if (ctx == null)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ return ctx.getApplicationContextPath();
+ }
}
Modified: myfaces/core/branches/2.2.x/api/src/main/java/javax/faces/context/ExternalContextWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.2.x/api/src/main/java/javax/faces/context/ExternalContextWrapper.java?rev=1445199&r1=1445198&r2=1445199&view=diff
==============================================================================
--- myfaces/core/branches/2.2.x/api/src/main/java/javax/faces/context/ExternalContextWrapper.java (original)
+++ myfaces/core/branches/2.2.x/api/src/main/java/javax/faces/context/ExternalContextWrapper.java Tue Feb 12 15:37:45 2013
@@ -496,4 +496,10 @@ public abstract class ExternalContextWra
{
return getWrapped().getSessionId(create);
}
+
+ @Override
+ public String getApplicationContextPath()
+ {
+ return getWrapped().getApplicationContextPath();
+ }
}
Modified: myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImplBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImplBase.java?rev=1445199&r1=1445198&r2=1445199&view=diff
==============================================================================
--- myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImplBase.java (original)
+++ myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImplBase.java Tue Feb 12 15:37:45 2013
@@ -174,6 +174,13 @@ public abstract class ServletExternalCon
_clientWindow = window;
}
+ @Override
+ public String getApplicationContextPath()
+ {
+ return _servletContext.getContextPath();
+
+ }
+
// ~ Methods which verify some required behavior---------------------------
protected void checkNull(final Object o, final String param)