Author: alexsmirnov Date: 2007-07-05 14:53:58 -0400 (Thu, 05 Jul 2007) New Revision: 1502 Added: trunk/framework/impl/src/main/resources/META-INF/services/org.ajax4jsf.resource.InternetResourceBuilder trunk/framework/impl/src/main/resources/META-INF/services/org.richfaces.skin.SkinFactory Removed: trunk/framework/impl/src/main/resources/META-INF/services/org.ajax4jsf.framework.resource.InternetResourceBuilder trunk/framework/impl/src/main/resources/META-INF/services/org.ajax4jsf.framework.skin.SkinFactory Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/HeaderResourceElement.java trunk/cdk/generator/src/test/config/faces-config.ent trunk/docs/userguide/en/src/main/docbook/master.xml trunk/docs/userguide/pom.xml trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/cached/CachedResourceBuilder.java trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx trunk/ui/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarItemRendererBase.java trunk/ui/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarRendererBase.java Log: restore project build with refactored API Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/HeaderResourceElement.java =================================================================== --- trunk/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/HeaderResourceElement.java 2007-07-05 18:43:20 UTC (rev 1501) +++ trunk/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/vcp/HeaderResourceElement.java 2007-07-05 18:53:58 UTC (rev 1502) @@ -94,7 +94,7 @@ this.resourcePaths = (String[]) paths.toArray(new String[paths.size()]); } componentBean - .addToImport("org.ajax4jsf.framework.resource.InternetResource"); + .addToImport("org.ajax4jsf.resource.InternetResource"); componentBean.addToDeclaration(getContent()); } Modified: trunk/cdk/generator/src/test/config/faces-config.ent =================================================================== --- trunk/cdk/generator/src/test/config/faces-config.ent 2007-07-05 18:43:20 UTC (rev 1501) +++ trunk/cdk/generator/src/test/config/faces-config.ent 2007-07-05 18:53:58 UTC (rev 1502) @@ -2,8 +2,8 @@ <render-kit-factory>com.exadel.vcp.framework.renderer.ChameleonRenderKitFactory</render-kit-factory> </factory> <application> - <variable-resolver>com.exadel.vcp.framework.skin.SkinVariableResolver</variable-resolver> - <property-resolver>com.exadel.vcp.framework.skin.SkinPropertyResolver</property-resolver> + <variable-resolver>org.richfaces.skin.SkinVariableResolver</variable-resolver> + <property-resolver>org.richfaces.skin.SkinPropertyResolver</property-resolver> </application> <lifecycle> <phase-listener>com.exadel.vcp.framework.renderer.BeforeRenderListener</phase-listener> Modified: trunk/docs/userguide/en/src/main/docbook/master.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/master.xml 2007-07-05 18:43:20 UTC (rev 1501) +++ trunk/docs/userguide/en/src/main/docbook/master.xml 2007-07-05 18:53:58 UTC (rev 1502) @@ -68,8 +68,9 @@ <title>The RichFaces Components</title> <para>The library encompasses ready-made components built based on the <emphasis role="italic"><property>Ajax4jsf Component Factory</property></emphasis>. To find out more about the Component Factory, go to the <ulink url="http://www.jboss.org/projects/jbossajax4jsf">Ajax4jsf project</ulink>.</para> +<!-- &richfaces_table; -<!-- + --> &dataFilterSlider_table; &dataScroller_table; &dataTable_table; @@ -91,7 +92,6 @@ &tree_table; &dropDownMenu_table; &menuComponents_table; - --> </chapter> &rfcidesupport; Modified: trunk/docs/userguide/pom.xml =================================================================== --- trunk/docs/userguide/pom.xml 2007-07-05 18:43:20 UTC (rev 1501) +++ trunk/docs/userguide/pom.xml 2007-07-05 18:53:58 UTC (rev 1502) @@ -70,6 +70,168 @@ </version> </artifactItem> <artifactItem> + <groupId>org.richfaces.ui</groupId> + <artifactId> + drag-drop + </artifactId> + <version> + ${project.version} + </version> + </artifactItem> + <artifactItem> + <groupId>org.richfaces.ui</groupId> + <artifactId> + dropdown-menu + </artifactId> + <version> + ${project.version} + </version> + </artifactItem> + <artifactItem> + <groupId>org.richfaces.ui</groupId> + <artifactId> + gmap + </artifactId> + <version> + ${project.version} + </version> + </artifactItem> + <artifactItem> + <groupId>org.richfaces.ui</groupId> + <artifactId> + inputnumber-slider + </artifactId> + <version> + ${project.version} + </version> + </artifactItem> + <artifactItem> + <groupId>org.richfaces.ui</groupId> + <artifactId> + inputnumber-spinner + </artifactId> + <version> + ${project.version} + </version> + </artifactItem> + <artifactItem> + <groupId>org.richfaces.ui</groupId> + <artifactId> + menu-components + </artifactId> + <version> + ${project.version} + </version> + </artifactItem> + <artifactItem> + <groupId>org.richfaces.ui</groupId> + <artifactId> + modal-panel + </artifactId> + <version> + ${project.version} + </version> + </artifactItem> + <artifactItem> + <groupId>org.richfaces.ui</groupId> + <artifactId> + paint2D + </artifactId> + <version> + ${project.version} + </version> + </artifactItem> + <artifactItem> + <groupId>org.richfaces.ui</groupId> + <artifactId> + panel + </artifactId> + <version> + ${project.version} + </version> + </artifactItem> + <artifactItem> + <groupId>org.richfaces.ui</groupId> + <artifactId> + panelbar + </artifactId> + <version> + ${project.version} + </version> + </artifactItem> + <artifactItem> + <groupId>org.richfaces.ui</groupId> + <artifactId> + simpleTogglePanel + </artifactId> + <version> + ${project.version} + </version> + </artifactItem> + <artifactItem> + <groupId>org.richfaces.ui</groupId> + <artifactId> + separator + </artifactId> + <version> + ${project.version} + </version> + </artifactItem> + <artifactItem> + <groupId>org.richfaces.ui</groupId> + <artifactId> + spacer + </artifactId> + <version> + ${project.version} + </version> + </artifactItem> + <artifactItem> + <groupId>org.richfaces.ui</groupId> + <artifactId> + suggestionbox + </artifactId> + <version> + ${project.version} + </version> + </artifactItem> + <artifactItem> + <groupId>org.richfaces.ui</groupId> + <artifactId> + tabPanel + </artifactId> + <version> + ${project.version} + </version> + </artifactItem> + <artifactItem> + <groupId>org.richfaces.ui</groupId> + <artifactId> + togglePanel + </artifactId> + <version> + ${project.version} + </version> + </artifactItem> + <artifactItem> + <groupId>org.richfaces.ui</groupId> + <artifactId> + toolBar + </artifactId> + <version> + ${project.version} + </version> + </artifactItem> + <artifactItem> + <groupId>org.richfaces.ui</groupId> + <artifactId> + tree + </artifactId> + <version> + ${project.version} + </version> + </artifactItem> + <artifactItem> <groupId> org.richfaces.docs </groupId> Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/cached/CachedResourceBuilder.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/cached/CachedResourceBuilder.java 2007-07-05 18:43:20 UTC (rev 1501) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/framework/resource/cached/CachedResourceBuilder.java 2007-07-05 18:53:58 UTC (rev 1502) @@ -29,12 +29,7 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.Messages; -import org.ajax4jsf.framework.resource.CachedResourceBuilder; -import org.ajax4jsf.framework.resource.DualLRUMap; -import org.ajax4jsf.framework.resource.ResourceBean; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; -import org.ajax4jsf.framework.resource.ResourceBytesDataBean; -import org.ajax4jsf.framework.resource.ResourceDataBean; import org.ajax4jsf.resource.InternetResource; import org.ajax4jsf.resource.ResourceNotFoundException; import org.apache.commons.logging.Log; Deleted: trunk/framework/impl/src/main/resources/META-INF/services/org.ajax4jsf.framework.resource.InternetResourceBuilder =================================================================== --- trunk/framework/impl/src/main/resources/META-INF/services/org.ajax4jsf.framework.resource.InternetResourceBuilder 2007-07-05 18:43:20 UTC (rev 1501) +++ trunk/framework/impl/src/main/resources/META-INF/services/org.ajax4jsf.framework.resource.InternetResourceBuilder 2007-07-05 18:53:58 UTC (rev 1502) @@ -1 +0,0 @@ -org.ajax4jsf.framework.resource.ResourceBuilderImpl Deleted: trunk/framework/impl/src/main/resources/META-INF/services/org.ajax4jsf.framework.skin.SkinFactory =================================================================== --- trunk/framework/impl/src/main/resources/META-INF/services/org.ajax4jsf.framework.skin.SkinFactory 2007-07-05 18:43:20 UTC (rev 1501) +++ trunk/framework/impl/src/main/resources/META-INF/services/org.ajax4jsf.framework.skin.SkinFactory 2007-07-05 18:53:58 UTC (rev 1502) @@ -1 +0,0 @@ -org.ajax4jsf.framework.skin.SkinFactoryImpl Copied: trunk/framework/impl/src/main/resources/META-INF/services/org.ajax4jsf.resource.InternetResourceBuilder (from rev 1483, trunk/framework/impl/src/main/resources/META-INF/services/org.ajax4jsf.framework.resource.InternetResourceBuilder) =================================================================== --- trunk/framework/impl/src/main/resources/META-INF/services/org.ajax4jsf.resource.InternetResourceBuilder (rev 0) +++ trunk/framework/impl/src/main/resources/META-INF/services/org.ajax4jsf.resource.InternetResourceBuilder 2007-07-05 18:53:58 UTC (rev 1502) @@ -0,0 +1 @@ +org.ajax4jsf.framework.resource.ResourceBuilderImpl Copied: trunk/framework/impl/src/main/resources/META-INF/services/org.richfaces.skin.SkinFactory (from rev 1483, trunk/framework/impl/src/main/resources/META-INF/services/org.ajax4jsf.framework.skin.SkinFactory) =================================================================== --- trunk/framework/impl/src/main/resources/META-INF/services/org.richfaces.skin.SkinFactory (rev 0) +++ trunk/framework/impl/src/main/resources/META-INF/services/org.richfaces.skin.SkinFactory 2007-07-05 18:53:58 UTC (rev 1502) @@ -0,0 +1 @@ +org.ajax4jsf.framework.skin.SkinFactoryImpl Modified: trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java =================================================================== --- trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2007-07-05 18:43:20 UTC (rev 1501) +++ trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2007-07-05 18:53:58 UTC (rev 1502) @@ -33,7 +33,7 @@ import org.ajax4jsf.framework.renderer.ComponentVariables; import org.ajax4jsf.framework.renderer.ComponentsVariableResolver; import org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase; -import org.ajax4jsf.framework.util.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunction; import org.richfaces.component.UIDatascroller; import org.richfaces.event.DataScrollerEvent; Modified: trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx =================================================================== --- trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2007-07-05 18:43:20 UTC (rev 1501) +++ trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2007-07-05 18:53:58 UTC (rev 1502) @@ -39,7 +39,7 @@ variables.setVariable("facet", component.FIRST_FACET_NAME); facet=component.FIRST_FACET_NAME; }else{ - variables.setVariable("color", "color: " + org.ajax4jsf.framework.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";"); + variables.setVariable("color", "color: " + org.richfaces.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";"); variables.setVariable("onclick", ""); variables.setVariable("facet", component.FIRST_DISABLED_FACET_NAME); facet=component.FIRST_DISABLED_FACET_NAME; @@ -79,7 +79,7 @@ variables.setVariable("facet", component.FAST_REWIND_FACET_NAME); facet=component.FAST_REWIND_FACET_NAME; }else{ - variables.setVariable("color", "color: " + org.ajax4jsf.framework.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";"); + variables.setVariable("color", "color: " + org.richfaces.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";"); variables.setVariable("onclick", ""); variables.setVariable("facet", component.FAST_REWIND_DISABLED_FACET_NAME); facet=component.FAST_REWIND_DISABLED_FACET_NAME; @@ -121,7 +121,7 @@ facet=component.PREVIOUS_FACET_NAME; }else{ variables.setVariable("onclick", ""); - variables.setVariable("color", "color: " + org.ajax4jsf.framework.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";"); + variables.setVariable("color", "color: " + org.richfaces.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";"); variables.setVariable("facet", component.PREVIOUS_DISABLED_FACET_NAME); facet=component.PREVIOUS_DISABLED_FACET_NAME; } @@ -175,7 +175,7 @@ facet=component.NEXT_FACET_NAME; }else{ variables.setVariable("onclick", ""); - variables.setVariable("color", "color: " + org.ajax4jsf.framework.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";"); + variables.setVariable("color", "color: " + org.richfaces.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";"); variables.setVariable("facet", component.NEXT_DISABLED_FACET_NAME); facet=component.NEXT_DISABLED_FACET_NAME; } @@ -215,7 +215,7 @@ } else{ variables.setVariable("onclick", ""); - variables.setVariable("color", "color: " + org.ajax4jsf.framework.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";"); + variables.setVariable("color", "color: " + org.richfaces.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";"); variables.setVariable("facet", component.FAST_FORWARD_DISABLED_FACET_NAME); facet=component.FAST_FORWARD_DISABLED_FACET_NAME; } @@ -256,7 +256,7 @@ facet=component.LAST_FACET_NAME; }else{ variables.setVariable("onclick", ""); - variables.setVariable("color", "color: " + org.ajax4jsf.framework.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";"); + variables.setVariable("color", "color: " + org.richfaces.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";"); variables.setVariable("facet", component.LAST_DISABLED_FACET_NAME); facet=component.LAST_DISABLED_FACET_NAME; } Modified: trunk/ui/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarItemRendererBase.java =================================================================== --- trunk/ui/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarItemRendererBase.java 2007-07-05 18:43:20 UTC (rev 1501) +++ trunk/ui/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarItemRendererBase.java 2007-07-05 18:53:58 UTC (rev 1502) @@ -21,14 +21,7 @@ package org.richfaces.renderkit.html; -import java.io.IOException; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; - import org.ajax4jsf.framework.renderer.RendererBase; -import org.ajax4jsf.framework.skin.Skin; -import org.ajax4jsf.framework.skin.SkinFactory; -import org.ajax4jsf.framework.util.HtmlDimensions; import org.richfaces.component.UIPanelBarItem; public abstract class PanelBarItemRendererBase extends RendererBase { Modified: trunk/ui/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarRendererBase.java =================================================================== --- trunk/ui/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarRendererBase.java 2007-07-05 18:43:20 UTC (rev 1501) +++ trunk/ui/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarRendererBase.java 2007-07-05 18:53:58 UTC (rev 1502) @@ -32,17 +32,13 @@ import org.ajax4jsf.framework.ajax.AjaxScript; import org.ajax4jsf.framework.ajax.ImageCacheScript; - import org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase; - -import org.ajax4jsf.framework.resource.InternetResource; import org.ajax4jsf.framework.resource.PrototypeScript; +import org.ajax4jsf.resource.InternetResource; import org.richfaces.component.UIPanelBar; import org.richfaces.component.UIPanelBarItem; import org.richfaces.event.SwitchablePanelSwitchEvent; -import com.sun.org.apache.bcel.internal.generic.INSTANCEOF; - public abstract class PanelBarRendererBase extends HeaderResourcesRendererBase { public static final String PANEL_BAR_RESOURCES = "PANEL_BAR_RESOURCES";