primefaces#3392

Author: tandraschko

src/main/java/org/primefaces/application/resource/DynamicResourcesPhaseListener.java

@@ -54,7 +54,7 @@ public void afterPhase(PhaseEvent event) {
         }
 
         // JSF 2.3 contains a own dynamic resource handling
-        if (PrimeApplicationContext.getCurrentInstance(context).getConfig().isAtLeastJSF23()) {
+        if (PrimeApplicationContext.getCurrentInstance(context).getEnvironment().isAtLeastJsf23()) {
             return;
         }
 

src/main/java/org/primefaces/application/resource/PrimeResource.java

@@ -31,7 +31,7 @@ public class PrimeResource extends ResourceWrapper {
     public PrimeResource(final Resource resource) {
         super();
         wrapped = resource;
-        version = "&v=" + PrimeApplicationContext.getCurrentInstance(FacesContext.getCurrentInstance()).getConfig().getBuildVersion();
+        version = "&v=" + PrimeApplicationContext.getCurrentInstance(FacesContext.getCurrentInstance()).getEnvironment().getBuildVersion();
     }
 
     @Override

src/main/java/org/primefaces/behavior/ajax/AjaxBehaviorRenderer.java

@@ -27,7 +27,7 @@
 import javax.faces.render.ClientBehaviorRenderer;
 import org.primefaces.component.api.ClientBehaviorRenderingMode;
 
-import org.primefaces.context.RequestContext;
+import org.primefaces.context.PrimeRequestContext;
 import org.primefaces.expression.SearchExpressionFacade;
 import org.primefaces.util.AjaxRequestBuilder;
 
@@ -75,7 +75,7 @@ public String getScript(ClientBehaviorContext behaviorContext, ClientBehavior be
             process = "@this";
         }
 
-        AjaxRequestBuilder builder = RequestContext.getCurrentInstance().getAjaxRequestBuilder();
+        AjaxRequestBuilder builder = PrimeRequestContext.getCurrentInstance().getAjaxRequestBuilder();
 
         String request = builder.init()
                 .source(source)

src/main/java/org/primefaces/behavior/base/AbstractBehaviorHandler.java

@@ -204,7 +204,7 @@ public String getFor() {
     protected void addAttachedObjectHandlerToMojarra(UIComponent component) {
 
         String key = MOJARRA_ATTACHED_OBJECT_HANDLERS_KEY;
-        if (PrimeApplicationContext.getCurrentInstance(FacesContext.getCurrentInstance()).getConfig().isAtLeastJSF22()) {
+        if (PrimeApplicationContext.getCurrentInstance(FacesContext.getCurrentInstance()).getEnvironment().isAtLeastJsf22()) {
             key = MOJARRA_22_ATTACHED_OBJECT_HANDLERS_KEY;
         }
 

src/main/java/org/primefaces/component/fileupload/FileUploadRenderer.java

@@ -22,7 +22,6 @@
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import javax.faces.convert.ConverterException;
-import org.primefaces.config.PrimeConfiguration;
 import org.primefaces.context.PrimeApplicationContext;
 import org.primefaces.expression.SearchExpressionFacade;
 import org.primefaces.renderkit.CoreRenderer;
@@ -41,9 +40,9 @@ public void decode(FacesContext context, UIComponent component) {
         FileUpload fileUpload = (FileUpload) component;
 
         if (!fileUpload.isDisabled()) {
-            PrimeConfiguration cc = PrimeApplicationContext.getCurrentInstance(context).getConfig();
-            String uploader = cc.getUploader();
-            boolean isAtLeastJSF22 = cc.isAtLeastJSF22();
+            PrimeApplicationContext applicationContext = PrimeApplicationContext.getCurrentInstance(context);
+            String uploader = applicationContext.getConfig().getUploader();
+            boolean isAtLeastJSF22 = applicationContext.getEnvironment().isAtLeastJsf22();
             String inputToDecodeId = getSimpleInputDecodeId(fileUpload, context);
 
             if (uploader.equals("auto")) {

src/main/java/org/primefaces/component/outputlabel/OutputLabelRenderer.java

@@ -32,7 +32,6 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.metadata.ConstraintDescriptor;
 import org.primefaces.component.api.InputHolder;
-import org.primefaces.config.PrimeConfiguration;
 import org.primefaces.context.PrimeApplicationContext;
 import org.primefaces.el.ValueExpressionAnalyzer;
 import org.primefaces.expression.SearchExpressionFacade;
@@ -112,8 +111,8 @@ public void invokeContextCallback(FacesContext context, UIComponent target) {
 
                             // fallback if required=false
                             if (!state.isRequired()) {
-                                PrimeConfiguration config = PrimeApplicationContext.getCurrentInstance(context).getConfig();
-                                if (config.isBeanValidationAvailable() && isBeanValidationDefined(input, context)) {
+                                PrimeApplicationContext applicationContext = PrimeApplicationContext.getCurrentInstance(context);
+                                if (applicationContext.getConfig().isBeanValidationEnabled() && isBeanValidationDefined(input, context)) {
                                     state.setRequired(true);
                                 }
                             }