Author: nbelaevski Date: 2009-12-29 14:16:11 -0500 (Tue, 29 Dec 2009) New Revision: 16225 Removed: root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/CommandRendererBase.java root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.jspx root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.jspx root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.jspx Modified: root/examples/trunk/pom.xml Log: Removed legacy code from components/core JSTL scope for "examples" changed from "provided" to "compile" Modified: root/examples/trunk/pom.xml =================================================================== --- root/examples/trunk/pom.xml 2009-12-29 19:11:56 UTC (rev 16224) +++ root/examples/trunk/pom.xml 2009-12-29 19:16:11 UTC (rev 16225) @@ -83,7 +83,6 @@ <groupId>jstl</groupId> <artifactId>jstl</artifactId> <version>1.2</version> - <scope>provided</scope> </dependency> </dependencies> Deleted: root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/CommandRendererBase.java =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/CommandRendererBase.java 2009-12-29 19:11:56 UTC (rev 16224) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/CommandRendererBase.java 2009-12-29 19:16:11 UTC (rev 16225) @@ -1,46 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library 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 library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.renderkit; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.render.Renderer; - -/** - * @author Nick Belaevski - * - */ -public class CommandRendererBase extends Renderer { - - /* - * (non-Javadoc) - * @see javax.faces.render.Renderer#decode(javax.faces.context.FacesContext, javax.faces.component.UIComponent) - */ - @Override - public void decode(FacesContext context, UIComponent component) { - - // TODO Auto-generated method stub - super.decode(context, component); - } -} Deleted: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.jspx =================================================================== --- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.jspx 2009-12-29 19:11:56 UTC (rev 16224) +++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.jspx 2009-12-29 19:16:11 UTC (rev 16225) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:root - xmlns:f="http://jsf.exadel.com/template" - xmlns:c=" http://java.sun.com/jsf/core" - xmlns:ui=" http://jsf.exadel.com/ui" - xmlns:vcp=" http://jsf.exadel.com/vcp" - xmlns:u=" http://jsf.exadel.com/vcp" - xmlns:x=" http://jsf.exadel.com/vcp" - class="org.ajax4jsf.renderkit.html.CommandButtonRenderer" - baseclass="org.ajax4jsf.renderkit.AjaxCommandRendererBase" - component="org.ajax4jsf.component.UIAjaxCommandButton" - xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0" > - <jsp:directive.page import="javax.faces.context.FacesContext,javax.faces.component.UIComponent"/> - <f:clientid var="clientId"/> - <jsp:declaration><![CDATA[ - public void encodeTypeAndImage(FacesContext context, UIComponent uiComponent) throws IOException { - ResponseWriter writer = context.getResponseWriter(); - String type = (String)uiComponent.getAttributes().get("type"); - String image = (String)uiComponent.getAttributes().get("image"); - if(image != null){ - image = context.getApplication().getViewHandler().getResourceURL(context,image); - image = context.getExternalContext().encodeResourceURL(image); - writer.writeAttribute("type","image","image"); - writer.writeURIAttribute("src",image,"image"); - Object value; - if (null == uiComponent.getAttributes().get("alt") && null != (value = uiComponent.getAttributes().get("value")) ) { - writer.writeAttribute("alt",value,"value"); - } - } else { - if(null != type ){ - writer.writeAttribute("type",type.toLowerCase(),"type"); - } else { - writer.writeAttribute("type","button","type"); - } - } - } - ]]></jsp:declaration> - <input - id="#{clientId}" - name="#{clientId}" - value="" - x:value="#{this:getValue(component)}" - x:passThruWithExclusions="value,name,onclick,type,id,class" - onclick="#{this:getOnClick(context,component)}" - class="#{component.attributes['styleClass']}" - > - <jsp:scriptlet>encodeTypeAndImage(context,component);</jsp:scriptlet> -</input> - -</f:root> Deleted: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.jspx =================================================================== --- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.jspx 2009-12-29 19:11:56 UTC (rev 16224) +++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.jspx 2009-12-29 19:16:11 UTC (rev 16225) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:root - xmlns:f="http://jsf.exadel.com/template" - xmlns:c=" http://java.sun.com/jsf/core" - xmlns:ui=" http://jsf.exadel.com/ui" - xmlns:vcp=" http://jsf.exadel.com/vcp" - xmlns:u=" http://jsf.exadel.com/vcp" - xmlns:x=" http://jsf.exadel.com/vcp" - class="org.ajax4jsf.renderkit.html.FunctionRenderer" - baseclass="org.ajax4jsf.renderkit.AjaxFunctionRendererBase" - component="org.ajax4jsf.component.UIAjaxFunction" - xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0" > - <jsp:directive.page import="javax.faces.context.FacesContext,javax.faces.component.UIComponent"/> - <f:clientid var="clientId"/> - <script - id="#{clientId}" - type="text/javascript" - > - <vcp:body /> - //<![CDATA[ - #{this:getFunction(context,component)}; - //]]> - </script> -</f:root> Deleted: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.jspx =================================================================== --- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.jspx 2009-12-29 19:11:56 UTC (rev 16224) +++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.jspx 2009-12-29 19:16:11 UTC (rev 16225) @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:root - xmlns:f="http://jsf.exadel.com/template" - xmlns:c=" http://java.sun.com/jsf/core" - xmlns:ui=" http://jsf.exadel.com/ui" - xmlns:vcp=" http://jsf.exadel.com/vcp" - xmlns:u=" http://jsf.exadel.com/vcp" - xmlns:x=" http://jsf.exadel.com/vcp" - class="org.ajax4jsf.renderkit.html.CommandLinkRenderer" - baseclass="org.ajax4jsf.renderkit.AjaxCommandRendererBase" - component="org.ajax4jsf.component.UIAjaxCommandLink" - xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0" > - <jsp:directive.page import="javax.faces.context.FacesContext,javax.faces.component.UIComponent"/> - <f:clientid var="clientId"/> - <a - id="#{clientId}" - name="#{clientId}" - type="#{component.attributes['type']}" - x:passThruWithExclusions="value,name,onclick,type,href,id" - onclick="#{this:getOnClick(context,component)}" - href="#" - class="#{component.attributes['styleClass']}" - > - #{this:getValue(component)} - <vcp:body> - <f:call name="renderChildren" /> - </vcp:body> - </a> - -</f:root>