Author: nbelaevski Date: 2010-09-09 20:16:28 -0400 (Thu, 09 Sep 2010) New Revision: 19152 Added: trunk/ui/common/ui/src/main/java/org/richfaces/application/ trunk/ui/common/ui/src/main/java/org/richfaces/application/CommonComponentsConfiguration.java trunk/ui/common/ui/src/main/java/org/richfaces/resource/ trunk/ui/common/ui/src/main/java/org/richfaces/resource/AjaxResourceLibrary.java trunk/ui/common/ui/src/main/resources/ trunk/ui/common/ui/src/main/resources/META-INF/ trunk/ui/common/ui/src/main/resources/META-INF/richfaces/ trunk/ui/common/ui/src/main/resources/META-INF/richfaces/org.richfaces/ trunk/ui/common/ui/src/main/resources/META-INF/richfaces/org.richfaces/ajax.library.properties trunk/ui/common/ui/src/main/resources/META-INF/richfaces/org.richfaces/base-component.library.properties Removed: trunk/ui/core/ui/src/main/java/org/richfaces/aplication/CoreComponentsConfiguration.java Modified: trunk/ui/core/ui/src/main/java/org/ajax4jsf/renderkit/AjaxBehaviorRenderer.java trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractAjaxLog.java trunk/ui/core/ui/src/main/java/org/richfaces/component/QueuePreRenderViewListener.java trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/AjaxCommandRendererBase.java trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPushRenderer.java trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxStatusRenderer.java trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java trunk/ui/input/ui/src/main/templates/inputnumberslider.template.xml trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelBaseRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java Log: - Added ajax & base-component resource libraries - Switched off queue options rendering if queue is turned off globally - Switched some components to use resource libraries Copied: trunk/ui/common/ui/src/main/java/org/richfaces/application/CommonComponentsConfiguration.java (from rev 19136, trunk/ui/core/ui/src/main/java/org/richfaces/aplication/CoreComponentsConfiguration.java) =================================================================== --- trunk/ui/common/ui/src/main/java/org/richfaces/application/CommonComponentsConfiguration.java (rev 0) +++ trunk/ui/common/ui/src/main/java/org/richfaces/application/CommonComponentsConfiguration.java 2010-09-10 00:16:28 UTC (rev 19152) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.application; + +import org.richfaces.application.configuration.ConfigurationItem; + +/** + * @author Nick Belaevski + * + */ +public final class CommonComponentsConfiguration { + + private CommonComponentsConfiguration() {} + + public enum Items { + + @ConfigurationItem(defaultValue = "true", names = "org.richfaces.queue.enabled", literal = true) + queueEnabled + + } + +} Added: trunk/ui/common/ui/src/main/java/org/richfaces/resource/AjaxResourceLibrary.java =================================================================== --- trunk/ui/common/ui/src/main/java/org/richfaces/resource/AjaxResourceLibrary.java (rev 0) +++ trunk/ui/common/ui/src/main/java/org/richfaces/resource/AjaxResourceLibrary.java 2010-09-10 00:16:28 UTC (rev 19152) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.resource; + +import static org.richfaces.application.configuration.ConfigurationServiceHelper.getBooleanConfigurationValue; + +import javax.faces.context.FacesContext; + +import org.richfaces.application.CommonComponentsConfiguration; + +import com.google.common.collect.ObjectArrays; + +/** + * @author Nick Belaevski + * + */ +public class AjaxResourceLibrary implements ResourceLibrary { + + private ResourceKey[] ajaxResourceKeys = new ResourceKey[] { + new ResourceKey("jsf.js", "javax.faces"), new ResourceKey("jquery.js", null), new ResourceKey("richfaces.js", null) + }; + + private ResourceKey[] ajaxQueueResourceKeys = ObjectArrays.concat(ajaxResourceKeys, new ResourceKey("richfaces-queue.js", null)); + + public ResourceKey[] getResources(FacesContext context) { + if (getBooleanConfigurationValue(context, CommonComponentsConfiguration.Items.queueEnabled)) { + return ajaxQueueResourceKeys; + } + + return ajaxResourceKeys; + } + +} Added: trunk/ui/common/ui/src/main/resources/META-INF/richfaces/org.richfaces/ajax.library.properties =================================================================== --- trunk/ui/common/ui/src/main/resources/META-INF/richfaces/org.richfaces/ajax.library.properties (rev 0) +++ trunk/ui/common/ui/src/main/resources/META-INF/richfaces/org.richfaces/ajax.library.properties 2010-09-10 00:16:28 UTC (rev 19152) @@ -0,0 +1 @@ +class=org.richfaces.resource.AjaxResourceLibrary \ No newline at end of file Added: trunk/ui/common/ui/src/main/resources/META-INF/richfaces/org.richfaces/base-component.library.properties =================================================================== --- trunk/ui/common/ui/src/main/resources/META-INF/richfaces/org.richfaces/base-component.library.properties (rev 0) +++ trunk/ui/common/ui/src/main/resources/META-INF/richfaces/org.richfaces/base-component.library.properties 2010-09-10 00:16:28 UTC (rev 19152) @@ -0,0 +1 @@ +resources=jquery.js, richfaces.js, richfaces-base-component.js \ No newline at end of file Modified: trunk/ui/core/ui/src/main/java/org/ajax4jsf/renderkit/AjaxBehaviorRenderer.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/ajax4jsf/renderkit/AjaxBehaviorRenderer.java 2010-09-09 23:54:09 UTC (rev 19151) +++ trunk/ui/core/ui/src/main/java/org/ajax4jsf/renderkit/AjaxBehaviorRenderer.java 2010-09-10 00:16:28 UTC (rev 19152) @@ -24,7 +24,6 @@ import static org.richfaces.renderkit.AjaxConstants.BEHAVIOR_EVENT_PARAMETER; -import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; import javax.faces.component.ActionSource; import javax.faces.component.EditableValueHolder; @@ -52,13 +51,7 @@ @FacesBehaviorRenderer(rendererType = "org.ajax4jsf.behavior.Ajax", renderKitId = RenderKitFactory.HTML_BASIC_RENDER_KIT) -@ResourceDependencies( - {@ResourceDependency(library = "javax.faces", name = "jsf.js"), - @ResourceDependency(name = "jquery.js", target = "head"), - @ResourceDependency(name = "richfaces.js", target = "head") - } -) - +@ResourceDependency(library = "org.richfaces", name = "ajax.reslib") public class AjaxBehaviorRenderer extends ClientBehaviorRenderer { private final RendererUtils utils = RendererUtils.getInstance(); Deleted: trunk/ui/core/ui/src/main/java/org/richfaces/aplication/CoreComponentsConfiguration.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/aplication/CoreComponentsConfiguration.java 2010-09-09 23:54:09 UTC (rev 19151) +++ trunk/ui/core/ui/src/main/java/org/richfaces/aplication/CoreComponentsConfiguration.java 2010-09-10 00:16:28 UTC (rev 19152) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.richfaces.aplication; - -import org.richfaces.application.configuration.ConfigurationItem; - -/** - * @author Nick Belaevski - * - */ -public final class CoreComponentsConfiguration { - - private CoreComponentsConfiguration() {} - - public enum Items { - - @ConfigurationItem(defaultValue = "true", names = "org.richfaces.queue.enabled", literal = true) - queueEnabled - - } - -} Modified: trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractAjaxLog.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractAjaxLog.java 2010-09-09 23:54:09 UTC (rev 19151) +++ trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractAjaxLog.java 2010-09-10 00:16:28 UTC (rev 19152) @@ -38,9 +38,7 @@ * */ @ResourceDependencies(value = { - @ResourceDependency(name = "jquery.js"), - @ResourceDependency(name = "richfaces.js") , - @ResourceDependency(name = "richfaces-base-component.js") , + @ResourceDependency(library = "org.richfaces", name = "base-component.reslib"), @ResourceDependency(library = "org.richfaces", name = "log.js"), @ResourceDependency(library = "org.richfaces", name = "log.ecss") }) Modified: trunk/ui/core/ui/src/main/java/org/richfaces/component/QueuePreRenderViewListener.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/component/QueuePreRenderViewListener.java 2010-09-09 23:54:09 UTC (rev 19151) +++ trunk/ui/core/ui/src/main/java/org/richfaces/component/QueuePreRenderViewListener.java 2010-09-10 00:16:28 UTC (rev 19152) @@ -32,7 +32,7 @@ import javax.faces.event.SystemEvent; import javax.faces.event.SystemEventListener; -import org.richfaces.aplication.CoreComponentsConfiguration; +import org.richfaces.application.CommonComponentsConfiguration; /** * @author Nick Belaevski @@ -50,7 +50,7 @@ FacesContext context = FacesContext.getCurrentInstance(); UIViewRoot viewRoot = context.getViewRoot(); - boolean queueEnabled = getBooleanConfigurationValue(context, CoreComponentsConfiguration.Items.queueEnabled); + boolean queueEnabled = getBooleanConfigurationValue(context, CommonComponentsConfiguration.Items.queueEnabled); if (queueEnabled) { Application application = context.getApplication(); UIComponent queueResourceComponent = application.createComponent(context, Modified: trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/AjaxCommandRendererBase.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/AjaxCommandRendererBase.java 2010-09-09 23:54:09 UTC (rev 19151) +++ trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/AjaxCommandRendererBase.java 2010-09-10 00:16:28 UTC (rev 19152) @@ -25,14 +25,13 @@ import java.util.Map; -import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.event.ActionEvent; -import org.richfaces.log.RichfacesLogger; import org.richfaces.log.Logger; +import org.richfaces.log.RichfacesLogger; import org.richfaces.renderkit.util.HandlersChain; /** @@ -40,8 +39,7 @@ * @version $Revision: 1.1.2.3 $ $Date: 2007/02/12 17:46:53 $ * */ -@ResourceDependencies({@ResourceDependency(library = "javax.faces", name = "jsf.js") , - @ResourceDependency(name = "jquery.js") , @ResourceDependency(name = "richfaces.js")}) +@ResourceDependency(library = "org.richfaces", name = "ajax.reslib") public abstract class AjaxCommandRendererBase extends RendererBase { private static final Logger LOG = RichfacesLogger.RENDERKIT.getLogger(); Modified: trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java 2010-09-09 23:54:09 UTC (rev 19151) +++ trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java 2010-09-10 00:16:28 UTC (rev 19152) @@ -25,7 +25,6 @@ import java.util.HashMap; import java.util.Map; -import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; @@ -45,10 +44,7 @@ /** * @author shura */ -@ResourceDependencies(value = { - @ResourceDependency(library = "javax.faces", name = "jsf.js"), - @ResourceDependency(name = "jquery.js"), - @ResourceDependency(name = "richfaces.js")}) +@ResourceDependency(library = "org.richfaces", name = "ajax.reslib") @JsfRenderer public class AjaxPollRenderer extends RendererBase { Modified: trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPushRenderer.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPushRenderer.java 2010-09-09 23:54:09 UTC (rev 19151) +++ trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPushRenderer.java 2010-09-10 00:16:28 UTC (rev 19152) @@ -25,7 +25,6 @@ import java.util.HashMap; import java.util.Map; -import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; @@ -45,8 +44,7 @@ /** * @author shura */ -@ResourceDependencies({@ResourceDependency(library = "javax.faces", name = "jsf.js") , - @ResourceDependency(name = "jquery.js") , @ResourceDependency(name = "richfaces.js")}) +@ResourceDependency(library = "org.richfaces", name = "ajax.reslib") @JsfRenderer public class AjaxPushRenderer extends RendererBase { Modified: trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxStatusRenderer.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxStatusRenderer.java 2010-09-09 23:54:09 UTC (rev 19151) +++ trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxStatusRenderer.java 2010-09-10 00:16:28 UTC (rev 19152) @@ -25,7 +25,6 @@ import java.util.HashMap; import java.util.Map; -import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; @@ -44,10 +43,7 @@ /** * @author Nick Belaevski */ -@ResourceDependencies({ - @ResourceDependency(library = "javax.faces", name = "jsf.js"), - @ResourceDependency(name = "jquery.js"), - @ResourceDependency(name = "richfaces.js")}) +@ResourceDependency(library = "org.richfaces", name = "ajax.reslib") @JsfRenderer(type = "org.richfaces.StatusRenderer", family = AbstractAjaxStatus.COMPONENT_FAMILY) public class AjaxStatusRenderer extends RendererBase { Modified: trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java 2010-09-09 23:54:09 UTC (rev 19151) +++ trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java 2010-09-10 00:16:28 UTC (rev 19152) @@ -23,7 +23,6 @@ import static org.richfaces.application.configuration.ConfigurationServiceHelper.getBooleanConfigurationValue; -import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; @@ -36,7 +35,7 @@ import javax.faces.event.PreRemoveFromViewEvent; import javax.faces.render.Renderer; -import org.richfaces.aplication.CoreComponentsConfiguration; +import org.richfaces.application.CommonComponentsConfiguration; import org.richfaces.component.QueueRegistry; import org.richfaces.log.Logger; import org.richfaces.log.RichfacesLogger; @@ -45,10 +44,7 @@ /** * @author Nick Belaevski Base class for rendering Queue */ -@ResourceDependencies(value = { - @ResourceDependency(library = "javax.faces", name = "jsf.js"), - @ResourceDependency(name = "jquery.js"), - @ResourceDependency(name = "richfaces.js")}) +@ResourceDependency(library = "org.richfaces", name = "ajax.reslib") @ListenersFor({ @ListenerFor(systemEventClass = PostAddToViewEvent.class), @ListenerFor(systemEventClass = PreRemoveFromViewEvent.class) @@ -62,7 +58,7 @@ public void processEvent(ComponentSystemEvent event) throws AbortProcessingException { FacesContext context = FacesContext.getCurrentInstance(); - if (!getBooleanConfigurationValue(context, CoreComponentsConfiguration.Items.queueEnabled)) { + if (!getBooleanConfigurationValue(context, CommonComponentsConfiguration.Items.queueEnabled)) { return; } Modified: trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java 2010-09-09 23:54:09 UTC (rev 19151) +++ trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java 2010-09-10 00:16:28 UTC (rev 19152) @@ -21,12 +21,13 @@ */ package org.richfaces.renderkit.html; +import static org.richfaces.application.configuration.ConfigurationServiceHelper.getBooleanConfigurationValue; + import java.io.IOException; import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; -import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; import javax.faces.component.UIComponent; import javax.faces.component.UIOutput; @@ -35,6 +36,7 @@ import javax.faces.render.Renderer; import org.ajax4jsf.javascript.ScriptUtils; +import org.richfaces.application.CommonComponentsConfiguration; import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.component.QueueRegistry; import org.richfaces.renderkit.HtmlConstants; @@ -45,11 +47,7 @@ * */ @JsfRenderer(type = "org.richfaces.QueueResourceComponentRenderer", family = UIOutput.COMPONENT_FAMILY) -@ResourceDependencies(value = { - @ResourceDependency(library = "javax.faces", name = "jsf.js"), - @ResourceDependency(name = "jquery.js"), - @ResourceDependency(name = "richfaces.js"), - @ResourceDependency(name = "richfaces-queue.js")}) +@ResourceDependency(library = "org.richfaces", name = "ajax.reslib") public class QueueResourceComponentRenderer extends Renderer { private static final String FUNCTION_NAME = "RichFaces.queue.setQueueOptions"; @@ -75,6 +73,10 @@ public void encodeEnd(FacesContext context, UIComponent component) throws IOException { super.encodeEnd(context, component); + if (!getBooleanConfigurationValue(context, CommonComponentsConfiguration.Items.queueEnabled)) { + return; + } + QueueRegistry registry = QueueRegistry.getInstance(context); if (registry != null && registry.hasQueuesToEncode()) { ResponseWriter writer = context.getResponseWriter(); Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java 2010-09-09 23:54:09 UTC (rev 19151) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java 2010-09-10 00:16:28 UTC (rev 19152) @@ -61,10 +61,11 @@ * @author Nick Belaevski * */ -@ResourceDependencies({ @ResourceDependency(library = "javax.faces", name = "jsf.js"), - @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "jquery.position.js"), - @ResourceDependency(name = "richfaces.js"), @ResourceDependency(name = "richfaces-event.js"), - @ResourceDependency(name = "richfaces-base-component.js"), @ResourceDependency(name = "richfaces-selection.js"), +@ResourceDependencies({ + @ResourceDependency(library = "org.richfaces", name = "ajax.reslib"), + @ResourceDependency(library = "org.richfaces", name = "base-component.reslib"), + @ResourceDependency(name = "jquery.position.js"), @ResourceDependency(name = "richfaces-event.js"), + @ResourceDependency(name = "richfaces-selection.js"), @ResourceDependency(library = "org.richfaces", name = "AutocompleteBase.js"), @ResourceDependency(library = "org.richfaces", name = "Autocomplete.js"), @ResourceDependency(library = "org.richfaces", name = "Autocomplete.ecss") Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2010-09-09 23:54:09 UTC (rev 19151) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2010-09-10 00:16:28 UTC (rev 19152) @@ -43,10 +43,10 @@ * @author Anton Belevich * */ -@ResourceDependencies({ @ResourceDependency(library = "javax.faces", name = "jsf.js"), - @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js"), +@ResourceDependencies({ + @ResourceDependency(library = "javax.faces", name = "jsf.js"), + @ResourceDependency(library = "org.richfaces", name = "base-component.reslib"), @ResourceDependency(name = "richfaces-event.js"), - @ResourceDependency(name = "richfaces-base-component.js"), @ResourceDependency(library="org.richfaces", name = "inplaceInput.js"), @ResourceDependency(library="org.richfaces", name = "inplaceInput.ecss") }) public class InplaceInputBaseRenderer extends InputRendererBase { Modified: trunk/ui/input/ui/src/main/templates/inputnumberslider.template.xml =================================================================== --- trunk/ui/input/ui/src/main/templates/inputnumberslider.template.xml 2010-09-09 23:54:09 UTC (rev 19151) +++ trunk/ui/input/ui/src/main/templates/inputnumberslider.template.xml 2010-09-10 00:16:28 UTC (rev 19152) @@ -32,11 +32,8 @@ <cdk:component-family>javax.faces.Input</cdk:component-family> <cdk:renderer-type>org.richfaces.InputNumberSliderRenderer</cdk:renderer-type> <cdk:resource-dependency library="org.richfaces" name="inputNumberSlider.ecss" /> - <cdk:resource-dependency library="javax.faces" name="jsf.js" /> - <cdk:resource-dependency name="jquery.js" /> + <cdk:resource-dependency library="org.richfaces" name="base-component.reslib" /> <cdk:resource-dependency name="jquery.position.js" /> - <cdk:resource-dependency name="richfaces.js" /> - <cdk:resource-dependency name="richfaces-base-component.js" /> <cdk:resource-dependency library="org.richfaces" name="inputNumberSlider.js" /> </cc:interface> <cc:implementation> Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java 2010-09-09 23:54:09 UTC (rev 19151) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java 2010-09-10 00:16:28 UTC (rev 19152) @@ -41,10 +41,10 @@ import org.richfaces.event.DataScrollerEvent; import org.richfaces.renderkit.util.AjaxRendererUtils; -@ResourceDependencies( { @ResourceDependency(library = "javax.faces", name = "jsf-uncompressed.js"), - @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js"), +@ResourceDependencies( { + @ResourceDependency(library = "org.richfaces", name = "ajax.reslib"), + @ResourceDependency(library = "org.richfaces", name = "base-component.reslib"), @ResourceDependency(name = "richfaces-event.js"), - @ResourceDependency(name = "richfaces-base-component.js"), @ResourceDependency(library = "org.richfaces", name = "datascroller.js"), @ResourceDependency(library = "org.richfaces", name = "datascroller.ecss") Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2010-09-09 23:54:09 UTC (rev 19151) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2010-09-10 00:16:28 UTC (rev 19152) @@ -49,9 +49,7 @@ @JsfRenderer(type = "org.richfaces.DataTableRenderer", family = AbstractDataTable.COMPONENT_FAMILY) @ResourceDependencies({ - @ResourceDependency(name = "jquery.js"), - @ResourceDependency(name = "richfaces.js"), - @ResourceDependency(name = "richfaces-base-component.js"), + @ResourceDependency(library = "org.richfaces", name = "base-component.reslib"), @ResourceDependency(library="org.richfaces", name = "datatable.js"), @ResourceDependency(library="org.richfaces", name = "datatable.ecss") }) Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelBaseRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelBaseRenderer.java 2010-09-09 23:54:09 UTC (rev 19151) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelBaseRenderer.java 2010-09-10 00:16:28 UTC (rev 19152) @@ -34,7 +34,6 @@ * @author amarkhel * @since Jun 14, 2010 */ -//TODO nick - JSF have concept of library, it should be used instead of '/' in resource names @ResourceDependency(library = "org.richfaces", name = "panel.ecss") public class PanelBaseRenderer extends RendererBase { Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java 2010-09-09 23:54:09 UTC (rev 19151) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java 2010-09-10 00:16:28 UTC (rev 19152) @@ -5,8 +5,8 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; -import java.util.Map.Entry; import javax.faces.FacesException; import javax.faces.application.ResourceDependencies; @@ -23,8 +23,8 @@ import org.richfaces.renderkit.util.RendererUtils; //TODO nick - JSF have concept of library, it should be used instead of '/' in resource names -@ResourceDependencies( { @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js"), - @ResourceDependency(name = "richfaces-base-component.js"), +@ResourceDependencies( { + @ResourceDependency(library = "org.richfaces", name = "base-component.reslib"), @ResourceDependency(library = "org.richfaces", name = "popupPanel.js"), @ResourceDependency(library = "org.richfaces", name = "popupPanelBorders.js"), @ResourceDependency(library = "org.richfaces", name = "popupPanelSizer.js"),