[richfaces-svn-commits] JBoss Rich Faces SVN: r4368 - in branches/3.1.x/ui/componentControl/src: main/java/org/richfaces and 4 other directories.

Author: nbelaevski Date: 2007-11-29 19:50:10 -0500 (Thu, 29 Nov 2007) New Revision: 4368 Added: branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/component/ Removed: branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/sandbox/ Modified: branches/3.1.x/ui/componentControl/src/main/config/component/componentControl.xml branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/renderkit/ComponentControlRendererBase.java branches/3.1.x/ui/componentControl/src/main/templates/htmlComponentControl.jspx branches/3.1.x/ui/componentControl/src/test/java/org/richfaces/component/ComponentControlTest.java Log: invalid package refactored in componentControl Modified: branches/3.1.x/ui/componentControl/src/main/config/component/componentControl.xml =================================================================== --- branches/3.1.x/ui/componentControl/src/main/config/component/componentControl.xml 2007-11-30 00:39:08 UTC (rev 4367) +++ branches/3.1.x/ui/componentControl/src/main/config/component/componentControl.xml 2007-11-30 00:50:10 UTC (rev 4368) @@ -2,21 +2,21 @@ <!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "https://ajax4jsf.dev.java.net/nonav/dtds/component-config.dtd" > <components> <component> - <name>org.richfaces.sandbox.ComponentControl</name> - <family>org.richfaces.sandbox.ComponentControl</family> - <classname>org.richfaces.sandbox.component.html.HtmlComponentControl</classname> - <superclass>org.richfaces.sandbox.component.UIComponentControl</superclass> + <name>org.richfaces.ComponentControl</name> + <family>org.richfaces.ComponentControl</family> + <classname>org.richfaces.component.html.HtmlComponentControl</classname> + <superclass>org.richfaces.component.UIComponentControl</superclass> <description> <![CDATA[ ]]> </description> <renderer generate="true" override="true"> - <name>org.richfaces.sandbox.ComponentControlRenderer</name> + <name>org.richfaces.ComponentControlRenderer</name> <template>htmlComponentControl.jspx</template> </renderer> <tag> <name>componentControl</name> - <classname>org.richfaces.sandbox.taglib.ComponentControlTag</classname> + <classname>org.richfaces.taglib.ComponentControlTag</classname> <superclass> org.ajax4jsf.webapp.taglib.HtmlComponentTagBase </superclass> Copied: branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/component (from rev 4347, branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/sandbox/component) Modified: branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java =================================================================== --- branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/sandbox/component/UIComponentControl.java 2007-11-29 14:06:11 UTC (rev 4347) +++ branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java 2007-11-30 00:50:10 UTC (rev 4368) @@ -2,7 +2,7 @@ * */ -package org.richfaces.sandbox.component; +package org.richfaces.component; import java.util.Iterator; @@ -28,9 +28,9 @@ */ public abstract class UIComponentControl extends UIComponentBase implements AjaxSupport { - public static final String COMPONENT_TYPE = "org.richfaces.sandbox.ComponentControl"; + public static final String COMPONENT_TYPE = "org.richfaces.ComponentControl"; - public static final String COMPONENT_FAMILY = "org.richfaces.sandbox.ComponentControl"; + public static final String COMPONENT_FAMILY = "org.richfaces.ComponentControl"; private static final Log log = LogFactory.getLog(UIComponentControl.class); Modified: branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/renderkit/ComponentControlRendererBase.java =================================================================== --- branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/renderkit/ComponentControlRendererBase.java 2007-11-30 00:39:08 UTC (rev 4367) +++ branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/renderkit/ComponentControlRendererBase.java 2007-11-30 00:50:10 UTC (rev 4368) @@ -5,8 +5,8 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.renderkit.HeaderResourcesRendererBase; +import org.richfaces.component.UIComponentControl; import org.richfaces.component.util.HtmlUtil; -import org.richfaces.sandbox.component.UIComponentControl; public class ComponentControlRendererBase extends HeaderResourcesRendererBase { Modified: branches/3.1.x/ui/componentControl/src/main/templates/htmlComponentControl.jspx =================================================================== --- branches/3.1.x/ui/componentControl/src/main/templates/htmlComponentControl.jspx 2007-11-30 00:39:08 UTC (rev 4367) +++ branches/3.1.x/ui/componentControl/src/main/templates/htmlComponentControl.jspx 2007-11-30 00:50:10 UTC (rev 4368) @@ -5,9 +5,9 @@ xmlns:ui=" http://ajax4jsf.org/cdk/ui" xmlns:u=" http://ajax4jsf.org/cdk/u" xmlns:x=" http://ajax4jsf.org/cdk/x" - class="org.richfaces.sandbox.renderkit.html.ComponentControlRenderer" + class="org.richfaces.renderkit.html.ComponentControlRenderer" baseclass="org.richfaces.renderkit.ComponentControlRendererBase" - component="org.richfaces.sandbox.component.UIComponentControl" + component="org.richfaces.component.UIComponentControl" <h:scripts>/org/richfaces/renderkit/html/scripts/jquery/jquery.js,/org/richfaces/renderkit/html/script/controlUtils.js</h:scripts> Modified: branches/3.1.x/ui/componentControl/src/test/java/org/richfaces/component/ComponentControlTest.java =================================================================== --- branches/3.1.x/ui/componentControl/src/test/java/org/richfaces/component/ComponentControlTest.java 2007-11-30 00:39:08 UTC (rev 4367) +++ branches/3.1.x/ui/componentControl/src/test/java/org/richfaces/component/ComponentControlTest.java 2007-11-30 00:50:10 UTC (rev 4368) @@ -30,7 +30,7 @@ import javax.faces.component.html.HtmlForm; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; -import org.richfaces.sandbox.component.UIComponentControl; +import org.richfaces.component.UIComponentControl; import com.gargoylesoftware.htmlunit.html.HtmlInput; import com.gargoylesoftware.htmlunit.html.HtmlPage; @@ -58,7 +58,7 @@ public void setUp() throws Exception { super.setUp(); - application.addComponent(UIComponentControl.COMPONENT_TYPE, "org.richfaces.sandbox.component.html.HtmlComponentControl"); + application.addComponent(UIComponentControl.COMPONENT_TYPE, "org.richfaces.component.html.HtmlComponentControl"); form = new HtmlForm(); form.setId("form");