You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2018/11/02 13:31:12 UTC
[myfaces] branch master updated: fixed naming
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/master by this push:
new 0e9df51 fixed naming
0e9df51 is described below
commit 0e9df51e3c8e58bc9e825105acf2fbdd51e84666
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Fri Nov 2 14:31:08 2018 +0100
fixed naming
---
.../org/apache/myfaces/cdi/view/ViewScopeBeanHolder.java | 6 +++---
.../apache/myfaces/context/FacesContextFactoryImpl.java | 10 +++++-----
...ExternalContext.java => ReleasableExternalContext.java} | 2 +-
...textFactory.java => ReleasableFacesContextFactory.java} | 2 +-
.../apache/myfaces/context/servlet/FacesContextImpl.java | 14 +++++++-------
.../myfaces/context/servlet/FacesContextImplBase.java | 8 ++++----
.../context/servlet/ServletExternalContextImplBase.java | 4 ++--
.../myfaces/context/servlet/StartupFacesContextImpl.java | 4 ++--
.../org/apache/myfaces/flow/cdi/FlowScopeBeanHolder.java | 4 ++--
.../apache/myfaces/webapp/AbstractFacesInitializer.java | 4 ++--
.../apache/myfaces/webapp/MyFacesHttpSessionListener.java | 4 ++--
11 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeBeanHolder.java b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeBeanHolder.java
index 543655c..7fd1974 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeBeanHolder.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeBeanHolder.java
@@ -32,10 +32,10 @@ import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.inject.Inject;
import javax.servlet.ServletContext;
-import org.apache.myfaces.context.ReleaseableExternalContext;
import org.apache.myfaces.context.servlet.StartupFacesContextImpl;
import org.apache.myfaces.context.servlet.StartupServletExternalContextImpl;
import org.apache.myfaces.context.ExceptionHandlerImpl;
+import org.apache.myfaces.context.ReleasableExternalContext;
/**
*
@@ -160,7 +160,7 @@ public class ViewScopeBeanHolder implements Serializable
ExternalContext externalContext = new StartupServletExternalContextImpl(servletContext, false);
ExceptionHandler exceptionHandler = new ExceptionHandlerImpl();
facesContext = new StartupFacesContextImpl(externalContext,
- (ReleaseableExternalContext) externalContext, exceptionHandler, false);
+ (ReleasableExternalContext) externalContext, exceptionHandler, false);
ViewScopeContextImpl.destroyAllActive(contextualStorage, facesContext);
}
finally
@@ -206,7 +206,7 @@ public class ViewScopeBeanHolder implements Serializable
ExternalContext externalContext = new StartupServletExternalContextImpl(servletContext, false);
ExceptionHandler exceptionHandler = new ExceptionHandlerImpl();
facesContext = new StartupFacesContextImpl(externalContext,
- (ReleaseableExternalContext) externalContext, exceptionHandler, false);
+ (ReleasableExternalContext) externalContext, exceptionHandler, false);
for (ViewScopeContextualStorage contextualStorage : oldWindowContextStorages.values())
{
ViewScopeContextImpl.destroyAllActive(contextualStorage, facesContext);
diff --git a/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java b/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java
index 9361afa..107f3cb 100755
--- a/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java
@@ -43,7 +43,7 @@ import org.apache.myfaces.shared.util.ClassUtils;
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public class FacesContextFactoryImpl extends FacesContextFactory implements ReleaseableFacesContextFactory
+public class FacesContextFactoryImpl extends FacesContextFactory implements ReleasableFacesContextFactory
{
private static final Logger log = Logger.getLogger(FacesContextFactoryImpl.class.getName());
@@ -170,16 +170,16 @@ public class FacesContextFactoryImpl extends FacesContextFactory implements Rele
//if (context instanceof ServletContext)
//{
FacesContext facesContext;
- if (externalContext instanceof ReleaseableExternalContext)
+ if (externalContext instanceof ReleasableExternalContext)
{
- facesContext = new FacesContextImpl(externalContext, (ReleaseableExternalContext) externalContext,
+ facesContext = new FacesContextImpl(externalContext, (ReleasableExternalContext) externalContext,
this, _applicationFactory, _renderKitFactory,
_partialViewContextFactory);
}
- else if (defaultExternalContext != null && defaultExternalContext instanceof ReleaseableExternalContext)
+ else if (defaultExternalContext != null && defaultExternalContext instanceof ReleasableExternalContext)
{
facesContext = new FacesContextImpl(externalContext,
- (ReleaseableExternalContext) defaultExternalContext, this,
+ (ReleasableExternalContext) defaultExternalContext, this,
_applicationFactory, _renderKitFactory,
_partialViewContextFactory);
}
diff --git a/impl/src/main/java/org/apache/myfaces/context/ReleaseableExternalContext.java b/impl/src/main/java/org/apache/myfaces/context/ReleasableExternalContext.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/context/ReleaseableExternalContext.java
rename to impl/src/main/java/org/apache/myfaces/context/ReleasableExternalContext.java
index f455e8c..a1992f4 100644
--- a/impl/src/main/java/org/apache/myfaces/context/ReleaseableExternalContext.java
+++ b/impl/src/main/java/org/apache/myfaces/context/ReleasableExternalContext.java
@@ -25,7 +25,7 @@ package org.apache.myfaces.context;
* @author Stan Silvert (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public interface ReleaseableExternalContext
+public interface ReleasableExternalContext
{
/**
* Release resources that the ExternalContext is holding onto.
diff --git a/impl/src/main/java/org/apache/myfaces/context/ReleaseableFacesContextFactory.java b/impl/src/main/java/org/apache/myfaces/context/ReleasableFacesContextFactory.java
similarity index 95%
rename from impl/src/main/java/org/apache/myfaces/context/ReleaseableFacesContextFactory.java
rename to impl/src/main/java/org/apache/myfaces/context/ReleasableFacesContextFactory.java
index 0692772..ff0196c 100644
--- a/impl/src/main/java/org/apache/myfaces/context/ReleaseableFacesContextFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/context/ReleasableFacesContextFactory.java
@@ -23,7 +23,7 @@ package org.apache.myfaces.context;
* @author Leonardo Uribe (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public interface ReleaseableFacesContextFactory
+public interface ReleasableFacesContextFactory
{
/**
* Release resources that the ExternalContext is holding onto.
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java b/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
index b9410b2..2b7e53f 100755
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
@@ -42,9 +42,9 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import org.apache.myfaces.cdi.scope.FacesScopeProvider;
-import org.apache.myfaces.context.ReleaseableExternalContext;
-import org.apache.myfaces.context.ReleaseableFacesContextFactory;
import org.apache.myfaces.util.ExternalSpecifications;
+import org.apache.myfaces.context.ReleasableFacesContextFactory;
+import org.apache.myfaces.context.ReleasableExternalContext;
/**
* @author Manfred Geiler (latest modification by $Author$)
@@ -69,7 +69,7 @@ public class FacesContextImpl extends FacesContextImplBase
private boolean _responseComplete = false;
private boolean _validationFailed = false;
private PartialViewContext _partialViewContext = null;
- private ReleaseableFacesContextFactory _facesContextFactory = null;
+ private ReleasableFacesContextFactory _facesContextFactory = null;
private PartialViewContextFactory _partialViewContextFactory = null;
private RenderKitFactory _renderKitFactory = null;
@@ -102,8 +102,8 @@ public class FacesContextImpl extends FacesContextImplBase
* @param facesContextFactory
*/
public FacesContextImpl(final ExternalContext externalContext,
- final ReleaseableExternalContext defaultExternalContext ,
- final ReleaseableFacesContextFactory facesContextFactory)
+ final ReleasableExternalContext defaultExternalContext ,
+ final ReleasableFacesContextFactory facesContextFactory)
{
// setCurrentInstance is called in constructor of super class
super(externalContext, defaultExternalContext);
@@ -112,8 +112,8 @@ public class FacesContextImpl extends FacesContextImplBase
}
public FacesContextImpl(final ExternalContext externalContext,
- final ReleaseableExternalContext defaultExternalContext ,
- final ReleaseableFacesContextFactory facesContextFactory,
+ final ReleasableExternalContext defaultExternalContext ,
+ final ReleasableFacesContextFactory facesContextFactory,
final ApplicationFactory applicationFactory,
final RenderKitFactory renderKitFactory,
final PartialViewContextFactory partialViewContextFactory)
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImplBase.java b/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImplBase.java
index 45ac60f..00d6655 100644
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImplBase.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImplBase.java
@@ -38,8 +38,8 @@ import javax.faces.context.FacesContext;
import javax.faces.render.RenderKit;
import javax.faces.render.RenderKitFactory;
-import org.apache.myfaces.context.ReleaseableExternalContext;
import org.apache.myfaces.el.unified.FacesELContext;
+import org.apache.myfaces.context.ReleasableExternalContext;
/**
* Provides a base implementation of the FacesContext for the use
@@ -54,7 +54,7 @@ public abstract class FacesContextImplBase extends FacesContext
private Application _application;
private ExternalContext _externalContext;
- private ReleaseableExternalContext _defaultExternalContext;
+ private ReleasableExternalContext _defaultExternalContext;
private UIViewRoot _viewRoot;
private RenderKitFactory _renderKitFactory;
private ELContext _elContext;
@@ -79,7 +79,7 @@ public abstract class FacesContextImplBase extends FacesContext
* Calls FacesContext.setCurrentInstance(this);
*/
public FacesContextImplBase(final ExternalContext externalContext,
- final ReleaseableExternalContext defaultExternalContext)
+ final ReleasableExternalContext defaultExternalContext)
{
_externalContext = externalContext;
_defaultExternalContext = defaultExternalContext;
@@ -90,7 +90,7 @@ public abstract class FacesContextImplBase extends FacesContext
}
public FacesContextImplBase(final ExternalContext externalContext,
- final ReleaseableExternalContext defaultExternalContext,
+ final ReleasableExternalContext defaultExternalContext,
final ApplicationFactory applicationFactory,
final RenderKitFactory renderKitFactory)
{
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImplBase.java b/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImplBase.java
index 0ab3de9..546d594 100644
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImplBase.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImplBase.java
@@ -28,7 +28,7 @@ import javax.faces.context.ExternalContext;
import javax.faces.lifecycle.ClientWindow;
import javax.servlet.ServletContext;
-import org.apache.myfaces.context.ReleaseableExternalContext;
+import org.apache.myfaces.context.ReleasableExternalContext;
/**
* Provides a base implementation of the ExternalContext for Servlet
@@ -39,7 +39,7 @@ import org.apache.myfaces.context.ReleaseableExternalContext;
* @version $Revision$ $Date$
*/
public abstract class ServletExternalContextImplBase extends ExternalContext
- implements ReleaseableExternalContext
+ implements ReleasableExternalContext
{
private static final String INIT_PARAMETER_MAP_ATTRIBUTE = InitParameterMap.class.getName();
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/StartupFacesContextImpl.java b/impl/src/main/java/org/apache/myfaces/context/servlet/StartupFacesContextImpl.java
index 5fa7356..feb61b8 100644
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/StartupFacesContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/StartupFacesContextImpl.java
@@ -29,7 +29,7 @@ import javax.faces.context.ResponseStream;
import javax.faces.context.ResponseWriter;
import javax.faces.event.PhaseId;
-import org.apache.myfaces.context.ReleaseableExternalContext;
+import org.apache.myfaces.context.ReleasableExternalContext;
/**
* A FacesContext implementation which will be set as the current instance
@@ -48,7 +48,7 @@ public class StartupFacesContextImpl extends FacesContextImplBase
public StartupFacesContextImpl(
ExternalContext externalContext,
- ReleaseableExternalContext defaultExternalContext,
+ ReleasableExternalContext defaultExternalContext,
ExceptionHandler exceptionHandler,
boolean startup)
{
diff --git a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeBeanHolder.java b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeBeanHolder.java
index 7f6383c..4b18a1b 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeBeanHolder.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeBeanHolder.java
@@ -42,12 +42,12 @@ import javax.servlet.ServletContext;
import org.apache.myfaces.cdi.util.ContextualInstanceInfo;
import org.apache.myfaces.cdi.util.ContextualStorage;
import org.apache.myfaces.cdi.JsfApplicationArtifactHolder;
-import org.apache.myfaces.context.ReleaseableExternalContext;
import org.apache.myfaces.context.servlet.StartupFacesContextImpl;
import org.apache.myfaces.context.servlet.StartupServletExternalContextImpl;
import org.apache.myfaces.flow.FlowUtils;
import org.apache.myfaces.config.MyfacesConfig;
import org.apache.myfaces.context.ExceptionHandlerImpl;
+import org.apache.myfaces.context.ReleasableExternalContext;
/**
@@ -240,7 +240,7 @@ public class FlowScopeBeanHolder implements Serializable
ExternalContext externalContext = new StartupServletExternalContextImpl(servletContext, false);
ExceptionHandler exceptionHandler = new ExceptionHandlerImpl();
facesContext = new StartupFacesContextImpl(externalContext,
- (ReleaseableExternalContext) externalContext, exceptionHandler, false);
+ (ReleasableExternalContext) externalContext, exceptionHandler, false);
for (ContextualStorage contextualStorage : oldWindowContextStorages.values())
{
FlowScopedContextImpl.destroyAllActive(contextualStorage);
diff --git a/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java b/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
index c0d7752..613f257 100644
--- a/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
+++ b/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
@@ -22,7 +22,6 @@ import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConf
import org.apache.myfaces.config.FacesConfigValidator;
import org.apache.myfaces.config.FacesConfigurator;
import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.context.ReleaseableExternalContext;
import org.apache.myfaces.context.servlet.StartupFacesContextImpl;
import org.apache.myfaces.context.servlet.StartupServletExternalContextImpl;
import org.apache.myfaces.shared.application.FacesServletMappingUtils;
@@ -73,6 +72,7 @@ import org.apache.myfaces.spi.FacesFlowProviderFactory;
import org.apache.myfaces.spi.ServiceProviderFinder;
import org.apache.myfaces.spi.ServiceProviderFinderFactory;
import org.apache.myfaces.view.facelets.ViewPoolProcessor;
+import org.apache.myfaces.context.ReleasableExternalContext;
/**
* Performs common initialization tasks.
@@ -503,7 +503,7 @@ public abstract class AbstractFacesInitializer implements FacesInitializer
ExternalContext externalContext = new StartupServletExternalContextImpl(servletContext, startup);
ExceptionHandler exceptionHandler = new ExceptionHandlerImpl();
FacesContext facesContext = new StartupFacesContextImpl(externalContext,
- (ReleaseableExternalContext) externalContext, exceptionHandler, startup);
+ (ReleasableExternalContext) externalContext, exceptionHandler, startup);
// If getViewRoot() is called during application startup or shutdown,
// it should return a new UIViewRoot with its locale set to Locale.getDefault().
diff --git a/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionListener.java b/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionListener.java
index d81a054..68cd145 100644
--- a/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionListener.java
+++ b/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionListener.java
@@ -25,11 +25,11 @@ import javax.servlet.ServletContext;
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
import org.apache.myfaces.context.ExceptionHandlerImpl;
-import org.apache.myfaces.context.ReleaseableExternalContext;
import org.apache.myfaces.context.servlet.StartupFacesContextImpl;
import org.apache.myfaces.context.servlet.StartupServletExternalContextImpl;
import org.apache.myfaces.spi.FacesFlowProvider;
import org.apache.myfaces.spi.ViewScopeProvider;
+import org.apache.myfaces.context.ReleasableExternalContext;
public class MyFacesHttpSessionListener implements HttpSessionListener
{
@@ -85,7 +85,7 @@ public class MyFacesHttpSessionListener implements HttpSessionListener
ExternalContext externalContext = new StartupServletExternalContextImpl(servletContext, false);
ExceptionHandler exceptionHandler = new ExceptionHandlerImpl();
facesContext = new StartupFacesContextImpl(externalContext,
- (ReleaseableExternalContext) externalContext, exceptionHandler, false);
+ (ReleasableExternalContext) externalContext, exceptionHandler, false);
if (viewScopeProvider != null)
{