Author: alexsmirnov
Date: 2007-12-06 17:24:21 -0500 (Thu, 06 Dec 2007)
New Revision: 4578
Modified:
trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java
trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
Log:
Fix names for a common JavaScript files.
Modified:
trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java
===================================================================
---
trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java 2007-12-06
21:00:43 UTC (rev 4577)
+++
trunk/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java 2007-12-06
22:24:21 UTC (rev 4578)
@@ -40,8 +40,9 @@
private static final Log log = LogFactory.getLog(InternetResourceBuilder.class);
public static final String LOAD_NONE = "NONE";
public static final String LOAD_ALL = "ALL";
- public static final String COMMON_SCRIPT =
"/org/richfaces/compressedScript.js";
- public static final String COMMON_STYLE = "/org/richfaces/commonStyle.xcss";
+ public static final String COMMON_FRAMEWORK_SCRIPT =
"/org/ajax4jsf/framework.pack.js";
+ public static final String COMMON_UI_SCRIPT = "/org/richfaces/ui.pack.js";
+ public static final String COMMON_STYLE = "/org/richfaces/skin.xcss";
public static final String LOAD_STYLE_STRATEGY_PARAM =
"org.richfaces.LoadStyleStrategy";
public static final String LOAD_SCRIPT_STRATEGY_PARAM =
"org.richfaces.LoadScriptStrategy";
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
===================================================================
---
trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2007-12-06
21:00:43 UTC (rev 4577)
+++
trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2007-12-06
22:24:21 UTC (rev 4578)
@@ -28,13 +28,11 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.LinkedHashSet;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import javax.faces.FacesException;
-import javax.faces.FactoryFinder;
import javax.faces.application.Application;
import javax.faces.application.StateManager;
import javax.faces.application.ViewHandler;
@@ -47,8 +45,6 @@
import javax.faces.context.ResponseWriter;
import javax.faces.event.AbortProcessingException;
import javax.faces.render.RenderKit;
-import javax.faces.render.RenderKitFactory;
-import javax.faces.render.Renderer;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
@@ -58,9 +54,7 @@
import org.ajax4jsf.component.AjaxViewRoot;
import org.ajax4jsf.renderkit.AjaxContainerRenderer;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
-import org.ajax4jsf.renderkit.HeaderResourceProducer;
import org.ajax4jsf.renderkit.RendererUtils;
-import org.ajax4jsf.renderkit.UserResourceRenderer;
import org.ajax4jsf.renderkit.RendererUtils.HTML;
import org.ajax4jsf.resource.InternetResourceBuilder;
import org.ajax4jsf.webapp.BaseFilter;
@@ -386,7 +380,8 @@
viewResources.setProcessScripts(false);
} else if (InternetResourceBuilder.LOAD_ALL.equals(scriptStrategy)) {
viewResources.setProcessScripts(false);
- viewResources.addScript(internetResourceBuilder.createResource(this,
InternetResourceBuilder.COMMON_SCRIPT).getUri(context, null));
+ viewResources.addScript(internetResourceBuilder.createResource(this,
InternetResourceBuilder.COMMON_FRAMEWORK_SCRIPT).getUri(context, null));
+ viewResources.addScript(internetResourceBuilder.createResource(this,
InternetResourceBuilder.COMMON_UI_SCRIPT).getUri(context, null));
}
}
String styleStrategy =
externalContext.getInitParameter(InternetResourceBuilder.LOAD_STYLE_STRATEGY_PARAM);
Show replies by date