Author: alexsmirnov
Date: 2007-07-10 20:20:34 -0400 (Tue, 10 Jul 2007)
New Revision: 1594
Added:
trunk/framework/impl/src/main/java/org/ajax4jsf/javascript/PrototypeScript.java
trunk/framework/impl/src/main/java/org/ajax4jsf/javascript/SmartPositionScript.java
trunk/framework/impl/src/main/resources/org/ajax4jsf/cache/
trunk/framework/impl/src/main/resources/org/ajax4jsf/cache/oscache.properties
trunk/framework/impl/src/main/resources/org/ajax4jsf/javascript/
trunk/framework/impl/src/main/resources/org/ajax4jsf/javascript/jsshell.html
trunk/framework/impl/src/main/resources/org/ajax4jsf/javascript/scripts/
trunk/framework/impl/src/main/resources/org/ajax4jsf/javascript/scripts/command.js
trunk/framework/impl/src/main/resources/org/ajax4jsf/javascript/scripts/form.js
trunk/framework/impl/src/main/resources/org/ajax4jsf/messages.properties
trunk/framework/impl/src/main/resources/org/ajax4jsf/webapp/
trunk/framework/impl/src/main/resources/org/ajax4jsf/webapp/output.properties
trunk/framework/impl/src/main/resources/org/ajax4jsf/webapp/tidy/
trunk/framework/impl/src/main/resources/org/ajax4jsf/webapp/tidy/tidy.properties
Removed:
trunk/framework/impl/src/main/java/org/ajax4jsf/resource/PrototypeScript.java
trunk/framework/impl/src/main/java/org/ajax4jsf/resource/SmartPositionScript.java
trunk/framework/impl/src/main/resources/org/ajax4jsf/framework/
trunk/framework/impl/src/main/resources/org/ajax4jsf/renderkit/
trunk/framework/impl/src/main/resources/org/ajax4jsf/webapp/tidy/tidy.properties
Modified:
trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/RendererBean.java
trunk/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/AbstractCompilationContext.java
trunk/cdk/generator/src/main/resources/META-INF/templates/renderer.vm
trunk/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/ComponentTemplate.vm
trunk/cdk/generator/src/main/resources/META-INF/templates12/renderer.vm
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/renderkit/portlet/PortletAjaxViewRootRenderer.java
trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java
trunk/framework/impl/generatescript.xml
trunk/framework/impl/src/main/java/org/ajax4jsf/javascript/DnDScript.java
trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/PrototypeBasedRendererBase.java
trunk/framework/impl/src/main/java/org/ajax4jsf/resource/ClientScript.java
trunk/framework/impl/src/main/resources/META-INF/resources-config.xml
trunk/framework/impl/src/main/resources/META-INF/services/org.richfaces.skin.SkinFactory
trunk/framework/test/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/NekkoParserTest.java
trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/WEB-INF/lib/ajax4jsf-1.1.2-SNAPSHOT.jar
trunk/sandbox/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java
trunk/sandbox/tooltip/src/main/templates/org/richfaces/htmltooltip.jspx
trunk/sandbox/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
trunk/sandbox/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
trunk/sandbox/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java
trunk/sandbox/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java
trunk/sandbox/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx
trunk/sandbox/ui/panelmenu/src/test/java/org/richfaces/component/PanelMenuComponentTest.java
trunk/sandbox/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/AjaxFunctionBuilder.java
trunk/sandbox/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/GridRendererState.java
trunk/sandbox/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java
trunk/sandbox/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java
trunk/sandbox/ui/scrollable-grid/src/main/java/org/richfaces/utils/TemplateLoader.java
trunk/sandbox/ui/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx
trunk/sandbox/ui/scrollable-grid/src/test/java/org/richfaces/renderkit/html/ScrollableGridRendererTest.java
trunk/sandbox/ui/simpleTogglePanel2/src/main/java/org/richfaces/component/UISimpleTogglePanel2.java
trunk/sandbox/ui/simpleTogglePanel2/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanel2Renderer.java
trunk/sandbox/ui/simpleTogglePanel2/src/main/templates/simpleTogglePanel2.jspx
trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java
trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx
trunk/ui/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractDefinitionListRenderer.java
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractListRenderer.java
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java
trunk/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java
trunk/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.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/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java
trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragIndicator.java
trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java
trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java
trunk/ui/drag-drop/src/main/templates/org/richfaces/htmlDragIndicator.jspx
trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java
trunk/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java
trunk/ui/gmap/src/main/templates/gmap.jspx
trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java
trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx
trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java
trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx
trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java
trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx
trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx
trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuSeparatorComponentTest.java
trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java
trunk/ui/panelbar/src/main/java/org/richfaces/component/UIPanelBar.java
trunk/ui/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarItemRendererBase.java
trunk/ui/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarRendererBase.java
trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java
trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx
trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java
trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java
trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java
trunk/ui/tabPanel/src/main/templates/tabPanel.jspx
trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java
trunk/ui/togglePanel/src/main/templates/toggleControl.jspx
trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java
trunk/ui/tree/src/main/templates/htmlTree.jspx
trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java
Log:
Finished packages and classes refactor in the "impl" project
Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/RendererBean.java
===================================================================
---
trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/RendererBean.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/RendererBean.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -64,7 +64,7 @@
*/
public RendererBean() {
super();
- setSuperclass("org.ajax4jsf.framework.renderer.RendererBase");
+ setSuperclass("org.ajax4jsf.renderkit.RendererBase");
}
/**
Modified:
trunk/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/AbstractCompilationContext.java
===================================================================
---
trunk/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/AbstractCompilationContext.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/builder/AbstractCompilationContext.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -57,7 +57,7 @@
final private static Pattern patternComponent = Pattern.compile(
regexComponent, Pattern.UNIX_LINES + Pattern.DOTALL);
- private final static String DEFAULT_BASE_CLASS =
"org.ajax4jsf.framework.renderer.RendererBase";
+ private final static String DEFAULT_BASE_CLASS =
"org.ajax4jsf.renderkit.ase";
private String packageName;
@@ -82,8 +82,8 @@
"java.io.IOException", "javax.faces.component.UIComponent",
"javax.faces.context.FacesContext",
"javax.faces.context.ResponseWriter",
- "org.ajax4jsf.framework.renderer.ComponentsVariableResolver",
- "org.ajax4jsf.framework.renderer.ComponentVariables" };
+ "org.ajax4jsf.renderkit.ComponentsVariableResolver",
+ "org.ajax4jsf.renderkit.ComponentVariables" };
private TemplateElement tree;
@@ -354,7 +354,7 @@
addVariable("writer", "javax.faces.context.ResponseWriter");
// addLocalVariable("component",
"javax.faces.component.UIComponent" );
addVariable("variables",
- "org.ajax4jsf.framework.renderer.ComponentVariables");
+ "org.ajax4jsf.renderkit.ComponentVariables");
}
public Class getMethodReturnedClass(Class clazz, String methodName,
Modified: trunk/cdk/generator/src/main/resources/META-INF/templates/renderer.vm
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/templates/renderer.vm 2007-07-10
22:04:48 UTC (rev 1593)
+++ trunk/cdk/generator/src/main/resources/META-INF/templates/renderer.vm 2007-07-11
00:20:34 UTC (rev 1594)
@@ -15,7 +15,7 @@
public class ${renderer.simpleClassName} extends ${renderer.superclass} {
/**
- * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass()
+ * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass()
*/
protected Class getComponentClass() {
// Expected component class for rendering
Modified:
trunk/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/ComponentTemplate.vm
===================================================================
---
trunk/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/ComponentTemplate.vm 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/ComponentTemplate.vm 2007-07-11
00:20:34 UTC (rev 1594)
@@ -44,14 +44,14 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import org.ajax4jsf.framework.renderer.ComponentsVariableResolver;
-import org.ajax4jsf.framework.renderer.ComponentVariables;
+import org.ajax4jsf.renderkit.ComponentsVariableResolver;
+import org.ajax4jsf.renderkit.ComponentVariables;
#end
#if($component.fullBaseclass)
import $component.fullBaseclass;
#else
-import org.ajax4jsf.framework.renderer.RendererBase;
+import org.ajax4jsf.renderkit.RendererBase;
#end
#if($component.baseclassName)
Modified: trunk/cdk/generator/src/main/resources/META-INF/templates12/renderer.vm
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/templates12/renderer.vm 2007-07-10
22:04:48 UTC (rev 1593)
+++ trunk/cdk/generator/src/main/resources/META-INF/templates12/renderer.vm 2007-07-11
00:20:34 UTC (rev 1594)
@@ -15,7 +15,7 @@
public class ${renderer.simpleClassName} extends ${renderer.superclass} {
/**
- * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass()
+ * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass()
*/
protected Class getComponentClass() {
// Expected component class for rendering
Modified:
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/renderkit/portlet/PortletAjaxViewRootRenderer.java
===================================================================
---
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/renderkit/portlet/PortletAjaxViewRootRenderer.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/renderkit/portlet/PortletAjaxViewRootRenderer.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -8,10 +8,10 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import org.ajax4jsf.framework.ajax.AjaxContext;
-import org.ajax4jsf.framework.renderer.AjaxContainerRenderer;
-import org.ajax4jsf.framework.renderer.AjaxRendererUtils;
-import org.ajax4jsf.framework.renderer.AjaxViewRootRenderer;
-import org.ajax4jsf.framework.renderer.RendererUtils.HTML;
+import org.ajax4jsf.renderkit.AjaxContainerRenderer;
+import org.ajax4jsf.renderkit.AjaxRendererUtils;
+import org.ajax4jsf.renderkit.AjaxViewRootRenderer;
+import org.ajax4jsf.renderkit.RendererUtils.HTML;
import org.ajax4jsf.portlet.context.AbstractExternalContext;
/**
Modified: trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java
===================================================================
--- trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java 2007-07-10 22:04:48 UTC
(rev 1593)
+++ trunk/framework/api/src/main/java/org/ajax4jsf/Messages.java 2007-07-11 00:20:34 UTC
(rev 1594)
@@ -25,7 +25,7 @@
import java.util.ResourceBundle;
public class Messages {
- private static final String BUNDLE_NAME =
"org.ajax4jsf.framework.util.message.messages";
+ private static final String BUNDLE_NAME = "org.ajax4jsf.messages";
static ResourceBundle bundle = ResourceBundle.getBundle(BUNDLE_NAME);
public static final String getMessage(String name) {
Modified: trunk/framework/impl/generatescript.xml
===================================================================
--- trunk/framework/impl/generatescript.xml 2007-07-10 22:04:48 UTC (rev 1593)
+++ trunk/framework/impl/generatescript.xml 2007-07-11 00:20:34 UTC (rev 1594)
@@ -12,8 +12,8 @@
Assemble all javaScript library files to one AJAXJSF.js
</description>
- <property name="scripts-path"
value="org/ajax4jsf/framework/ajax/scripts"></property>
- <property name="prototype-scripts-path"
value="org/ajax4jsf/framework/resource/scripts"></property>
+ <property name="scripts-path"
value="org/ajax4jsf/javascript/scripts"></property>
+ <property name="prototype-scripts-path"
value="org/ajax4jsf/javascript/scripts"></property>
<property name="target-dir"
value="${project.build.directory}/javascript"></property>
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/javascript/DnDScript.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/javascript/DnDScript.java 2007-07-10
22:04:48 UTC (rev 1593)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/javascript/DnDScript.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -33,7 +33,7 @@
* @see org.ajax4jsf.resource.ClientScript#getJavaScript()
*/
public String getJavaScript() {
- return "/org/ajax4jsf/framework/ajax/scripts/dnd.js";
+ return "scripts/dnd.js";
}
/* (non-Javadoc)
Copied: trunk/framework/impl/src/main/java/org/ajax4jsf/javascript/PrototypeScript.java
(from rev 1590,
trunk/framework/impl/src/main/java/org/ajax4jsf/resource/PrototypeScript.java)
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/javascript/PrototypeScript.java
(rev 0)
+++
trunk/framework/impl/src/main/java/org/ajax4jsf/javascript/PrototypeScript.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -0,0 +1,38 @@
+/**
+ * License Agreement.
+ *
+ * Ajax4jsf 1.1 - 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.ajax4jsf.javascript;
+
+import org.ajax4jsf.resource.ClientScript;
+
+
+/**
+ * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $)
+ * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:56:59 $
+ *
+ */
+public class PrototypeScript extends ClientScript {
+
+ public String getJavaScript() {
+ return "scripts/prototype.js";
+ }
+
+}
Copied:
trunk/framework/impl/src/main/java/org/ajax4jsf/javascript/SmartPositionScript.java (from
rev 1590,
trunk/framework/impl/src/main/java/org/ajax4jsf/resource/SmartPositionScript.java)
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/javascript/SmartPositionScript.java
(rev 0)
+++
trunk/framework/impl/src/main/java/org/ajax4jsf/javascript/SmartPositionScript.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -0,0 +1,45 @@
+/**
+ * License Agreement.
+ *
+ * Ajax4jsf 1.1 - 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.ajax4jsf.javascript;
+
+import org.ajax4jsf.resource.ClientScript;
+
+/**
+ * @author Maksim Kaszynski
+ *
+ */
+public class SmartPositionScript extends ClientScript {
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.resource.ClientScript#getJavaScript()
+ */
+ public String getJavaScript() {
+ // TODO Auto-generated method stub
+ return "scripts/smartposition.js";
+ }
+
+ protected boolean isUsePrototype() {
+
+ return true;
+ }
+
+}
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/PrototypeBasedRendererBase.java
===================================================================
---
trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/PrototypeBasedRendererBase.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/PrototypeBasedRendererBase.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -26,9 +26,9 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import org.ajax4jsf.javascript.PrototypeScript;
import org.ajax4jsf.renderkit.HeaderResourceProducer;
import org.ajax4jsf.resource.InternetResource;
-import org.ajax4jsf.resource.PrototypeScript;
/**
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/resource/ClientScript.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/resource/ClientScript.java 2007-07-10
22:04:48 UTC (rev 1593)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/resource/ClientScript.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -28,6 +28,7 @@
import javax.faces.context.FacesContext;
import org.ajax4jsf.Messages;
+import org.ajax4jsf.javascript.PrototypeScript;
import org.ajax4jsf.resource.InternetResource;
import org.ajax4jsf.resource.InternetResourceBuilder;
import org.ajax4jsf.resource.ResourceContext;
Deleted: trunk/framework/impl/src/main/java/org/ajax4jsf/resource/PrototypeScript.java
===================================================================
---
trunk/framework/impl/src/main/java/org/ajax4jsf/resource/PrototypeScript.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/framework/impl/src/main/java/org/ajax4jsf/resource/PrototypeScript.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -1,36 +0,0 @@
-/**
- * License Agreement.
- *
- * Ajax4jsf 1.1 - 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.ajax4jsf.resource;
-
-
-/**
- * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $)
- * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:56:59 $
- *
- */
-public class PrototypeScript extends ClientScript {
-
- public String getJavaScript() {
- return "scripts/prototype.js";
- }
-
-}
Deleted:
trunk/framework/impl/src/main/java/org/ajax4jsf/resource/SmartPositionScript.java
===================================================================
---
trunk/framework/impl/src/main/java/org/ajax4jsf/resource/SmartPositionScript.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/framework/impl/src/main/java/org/ajax4jsf/resource/SmartPositionScript.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -1,43 +0,0 @@
-/**
- * License Agreement.
- *
- * Ajax4jsf 1.1 - 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.ajax4jsf.resource;
-
-/**
- * @author Maksim Kaszynski
- *
- */
-public class SmartPositionScript extends ClientScript {
-
- /* (non-Javadoc)
- * @see org.ajax4jsf.resource.ClientScript#getJavaScript()
- */
- public String getJavaScript() {
- // TODO Auto-generated method stub
- return "scripts/smartposition.js";
- }
-
- protected boolean isUsePrototype() {
-
- return true;
- }
-
-}
Modified: trunk/framework/impl/src/main/resources/META-INF/resources-config.xml
===================================================================
--- trunk/framework/impl/src/main/resources/META-INF/resources-config.xml 2007-07-10
22:04:48 UTC (rev 1593)
+++ trunk/framework/impl/src/main/resources/META-INF/resources-config.xml 2007-07-11
00:20:34 UTC (rev 1594)
@@ -6,7 +6,7 @@
<resource class="org.ajax4jsf.javascript.AjaxScript">
<name>ajax.js</name>
</resource>
- <resource class="org.ajax4jsf.resource.PrototypeScript">
+ <resource class="org.ajax4jsf.javascript.PrototypeScript">
<name>prototype.js</name>
</resource>
<resource class="org.ajax4jsf.javascript.DnDScript">
@@ -14,12 +14,12 @@
</resource>
<resource >
<name>form.js</name>
- <path>/org/ajax4jsf/renderkit/html/scripts/form.js</path>
+ <path>/org/ajax4jsf/javascript/scripts/form.js</path>
<renderer class="org.ajax4jsf.resource.ScriptRenderer"/>
</resource>
<resource >
<name>org/ajax4jsf/renderers/ajax/scripts/form.js</name>
- <path>/org/ajax4jsf/renderkit/html/scripts/form.js</path>
+ <path>/org/ajax4jsf/javascript/scripts/form.js</path>
<renderer class="org.ajax4jsf.resource.ScriptRenderer"/>
</resource>
</resource-config>
Modified:
trunk/framework/impl/src/main/resources/META-INF/services/org.richfaces.skin.SkinFactory
===================================================================
---
trunk/framework/impl/src/main/resources/META-INF/services/org.richfaces.skin.SkinFactory 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/framework/impl/src/main/resources/META-INF/services/org.richfaces.skin.SkinFactory 2007-07-11
00:20:34 UTC (rev 1594)
@@ -1 +1 @@
-org.ajax4jsf.framework.skin.SkinFactoryImpl
+org.richfaces.skin.SkinFactoryImpl
Copied: trunk/framework/impl/src/main/resources/org/ajax4jsf/cache/oscache.properties
(from rev 1590,
trunk/framework/impl/src/main/resources/org/ajax4jsf/framework/ajax/xmlfilter/oscache.properties)
===================================================================
--- trunk/framework/impl/src/main/resources/org/ajax4jsf/cache/oscache.properties
(rev 0)
+++
trunk/framework/impl/src/main/resources/org/ajax4jsf/cache/oscache.properties 2007-07-11
00:20:34 UTC (rev 1594)
@@ -0,0 +1,144 @@
+cache.memory = true
+cache.capacity = 10000
+cache.use.host.domain.in.key = true
+
+# CACHE IN MEMORY
+#
+# If you want to disable memory caching, just uncomment this line.
+#
+# cache.memory=false
+
+
+# CACHE KEY
+#
+# This is the key that will be used to store the cache in the application
+# and session scope.
+#
+# If you want to set the cache key to anything other than the default
+# uncomment this line and change the cache.key
+#
+# cache.key=__oscache_cache
+
+
+# USE HOST DOMAIN NAME IN KEY
+#
+# Servers for multiple host domains may wish to add host name info to
+# the generation of the key. If this is true, then uncomment the
+# following line.
+#
+# cache.use.host.domain.in.key=true
+
+
+# CACHE LISTENERS
+#
+# These hook OSCache events and perform various actions such as logging
+# cache hits and misses, or broadcasting to other cache instances across a cluster.
+# See the documentation for further information.
+#
+#
cache.event.listeners=com.opensymphony.oscache.plugins.clustersupport.JMSBroadcastingListener,
\
+# com.opensymphony.oscache.extra.CacheEntryEventListenerImpl,
\
+# com.opensymphony.oscache.extra.CacheMapAccessEventListenerImpl,
\
+# com.opensymphony.oscache.extra.ScopeEventListenerImpl
+
+
+# CACHE PERSISTENCE CLASS
+#
+# Specify the class to use for persistence. If you use the supplied
DiskPersistenceListener,
+# don't forget to supply the cache.path property to specify the location of the
cache
+# directory.
+#
+# If a persistence class is not specified, OSCache will use memory caching only.
+#
+#
cache.persistence.class=com.opensymphony.oscache.plugins.diskpersistence.DiskPersistenceListener
+
+# CACHE OVERFLOW PERSISTENCE
+# Use persistent cache in overflow or not. The default value is false, which means
+# the persistent cache will be used at all times for every entry. true is the
recommended setting.
+#
+# cache.persistence.overflow.only=true
+
+
+# CACHE DIRECTORY
+#
+# This is the directory on disk where caches will be stored by the
DiskPersistenceListener.
+# it will be created if it doesn't already exist. Remember that OSCache must have
+# write permission to this directory.
+#
+# Note: for Windows machines, this needs \ to be escaped
+# ie Windows:
+# cache.path=c:\\myapp\\cache
+# or *ix:
+# cache.path=/opt/myapp/cache
+#
+# cache.path=c:\\app\\cache
+
+
+# CACHE ALGORITHM
+#
+# Default cache algorithm to use. Note that in order to use an algorithm
+# the cache size must also be specified. If the cache size is not specified,
+# the cache algorithm will be Unlimited cache.
+#
+# cache.algorithm=com.opensymphony.oscache.base.algorithm.LRUCache
+# cache.algorithm=com.opensymphony.oscache.base.algorithm.FIFOCache
+# cache.algorithm=com.opensymphony.oscache.base.algorithm.UnlimitedCache
+
+# THREAD BLOCKING BEHAVIOR
+#
+# When a request is made for a stale cache entry, it is possible that another thread is
already
+# in the process of rebuilding that entry. This setting specifies how OSCache handles
the
+# subsequent 'non-building' threads. The default behaviour (cache.blocking=false)
is to serve
+# the old content to subsequent threads until the cache entry has been updated. This
provides
+# the best performance (at the cost of serving slightly stale data). When blocking is
enabled,
+# threads will instead block until the new cache entry is ready to be served. Once the
new entry
+# is put in the cache the blocked threads will be restarted and given the new entry.
+# Note that even if blocking is disabled, when there is no stale data available to be
served
+# threads will block until the data is added to the cache by the thread that is
responsible
+# for building the data.
+#
+# cache.blocking=false
+
+
+# CACHE SIZE
+#
+# Default cache size in number of items. If a size is specified but not
+# an algorithm, the cache algorithm used will be LRUCache.
+#
+cache.capacity=1000
+
+
+# CACHE UNLIMITED DISK
+# Use unlimited disk cache or not. The default value is false, which means
+# the disk cache will be limited in size to the value specified by cache.capacity.
+#
+# cache.unlimited.disk=false
+
+
+# JMS CLUSTER PROPERTIES
+#
+# Configuration properties for JMS clustering. See the clustering documentation
+# for more information on these settings.
+#
+#cache.cluster.jms.topic.factory=java:comp/env/jms/TopicConnectionFactory
+#cache.cluster.jms.topic.name=java:comp/env/jms/OSCacheTopic
+#cache.cluster.jms.node.name=node1
+
+
+# JAVAGROUPS CLUSTER PROPERTIES
+#
+# Configuration properites for the JavaGroups clustering. Only one of these
+# should be specified. Default values (as shown below) will be used if niether
+# property is set. See the clustering documentation and the JavaGroups project
+# (
www.javagroups.com) for more information on these settings.
+#
+#cache.cluster.properties=UDP(mcast_addr=231.12.21.132;mcast_port=45566;ip_ttl=32;\
+#mcast_send_buf_size=150000;mcast_recv_buf_size=80000):\
+#PING(timeout=2000;num_initial_members=3):\
+#MERGE2(min_interval=5000;max_interval=10000):\
+#FD_SOCK:VERIFY_SUSPECT(timeout=1500):\
+#pbcast.NAKACK(gc_lag=50;retransmit_timeout=300,600,1200,2400,4800;max_xmit_size=8192):\
+#UNICAST(timeout=300,600,1200,2400):\
+#pbcast.STABLE(desired_avg_gossip=20000):\
+#FRAG(frag_size=8096;down_thread=false;up_thread=false):\
+#pbcast.GMS(join_timeout=5000;join_retry_timeout=2000;shun=false;print_local_addr=true)
+#cache.cluster.multicast.ip=231.12.21.132
Copied: trunk/framework/impl/src/main/resources/org/ajax4jsf/javascript/jsshell.html (from
rev 1590,
trunk/framework/impl/src/main/resources/org/ajax4jsf/framework/ajax/jsshell.html)
===================================================================
--- trunk/framework/impl/src/main/resources/org/ajax4jsf/javascript/jsshell.html
(rev 0)
+++
trunk/framework/impl/src/main/resources/org/ajax4jsf/javascript/jsshell.html 2007-07-11
00:20:34 UTC (rev 1594)
@@ -0,0 +1,740 @@
+<!-- short bookmarklet
+// javascript:function loadScript(scriptURL) { var scriptElem =
document.createElement('SCRIPT'); scriptElem.setAttribute('language',
'JavaScript'); scriptElem.setAttribute('src', scriptURL);
document.body.appendChild(scriptElem);}
loadScript('http://blog.monstuff.com/archives/images/jsshell.js');
+
+
+with(window.open("","_blank","width="+screen.width*.6+",left="+screen.width*.35+",height="+screen.height*.9+",resizable,scrollbars=yes")){document.write(""
+
+-->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
+
+<html >
+<head>
+<meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1">
+<title>JavaScript Shell 1.4 modified to support IE</title>
+
+<script type="text/javascript">
+var
+histList = [""],
+histPos = 0,
+_scope = {},
+_win, // a top-level context
+question,
+_in,
+_out,
+tooManyMatches = null,
+lastError = null;
+
+function refocus()
+{
+ _in.blur(); // Needed for Mozilla to scroll correctly.
+ _in.focus();
+}
+
+function init()
+{
+ _in = document.getElementById("input");
+ _out = document.getElementById("output");
+
+ _win = window;
+
+ if (opener && !opener.closed)
+ {
+ println("Using bookmarklet version of shell: commands will run in opener's
context.", "message");
+ _win = opener;
+ }
+
+ initTarget();
+
+ recalculateInputHeight();
+ refocus();
+}
+
+function initTarget()
+{
+ _win.Shell = window;
+ _win.print = shellCommands.print;
+}
+
+
+// Unless the user is selected something, refocus the textbox.
+// (requested by caillon, brendan, asa)
+function keepFocusInTextbox(e)
+{
+ var g = e.srcElement ? e.srcElement : e.target; // IE vs. standard
+
+ while (!g.tagName)
+ g = g.parentNode;
+ var t = g.tagName.toUpperCase();
+ if (t=="A" || t=="INPUT")
+ return;
+
+ if (window.getSelection) {
+ // Mozilla
+ if (String(window.getSelection()))
+ return;
+ }
+ else if (document.getSelection) {
+ // Opera? Netscape 4?
+ if (document.getSelection())
+ return;
+ }
+ else {
+ // IE
+ if ( document.selection.createRange().text )
+ return;
+ }
+
+ refocus();
+}
+
+function inputKeydown(e) {
+ // Use onkeydown because IE doesn't support onkeypress for arrow keys
+
+ //alert(e.keyCode + " ^ " + e.keycode);
+
+ if (e.shiftKey && e.keyCode == 13) { // shift-enter
+ // don't do anything; allow the shift-enter to insert a line break as normal
+ } else if (e.keyCode == 13) { // enter
+ // execute the input on enter
+ try { go(); } catch(er) { alert(er); };
+ setTimeout(function() { _in.value = ""; }, 0); // can't preventDefault
on input, so clear it later
+ } else if (e.keyCode == 38) { // up
+ // go up in history if at top or ctrl-up
+ if (e.ctrlKey || caretInFirstLine(_in))
+ hist(true);
+ } else if (e.keyCode == 40) { // down
+ // go down in history if at end or ctrl-down
+ if (e.ctrlKey || caretInLastLine(_in))
+ hist(false);
+ } else if(e.ctrlKey && e.keyCode == 32) { // ctrl-space
+ tabcomplete();
+ e.cancelBubble = false;
+ e.returnValue = false;
+ return false;
+ } else if (e.keyCode == 9) { // tab
+ tabcomplete();
+ setTimeout(function() { refocus(); }, 0); // refocus because tab was hit
+ } else { }
+
+ setTimeout(recalculateInputHeight, 0);
+
+ //return true;
+};
+
+function caretInFirstLine(textbox)
+{
+ // IE doesn't support selectionStart/selectionEnd
+ if (textbox.selectionStart == undefined)
+ return true;
+
+ var firstLineBreak = textbox.value.indexOf("\n");
+
+ return ((firstLineBreak == -1) || (textbox.selectionStart <= firstLineBreak));
+}
+
+function caretInLastLine(textbox)
+{
+ // IE doesn't support selectionStart/selectionEnd
+ if (textbox.selectionEnd == undefined)
+ return true;
+
+ var lastLineBreak = textbox.value.lastIndexOf("\n");
+
+ return (textbox.selectionEnd > lastLineBreak);
+}
+
+function recalculateInputHeight()
+{
+ var rows = _in.value.split(/\n/).length
+ + 1 // prevent scrollbar flickering in Mozilla
+ + (window.opera ? 1 : 0); // leave room for scrollbar in Opera
+
+ if (_in.rows != rows) // without this check, it is impossible to select text in Opera
7.60 or Opera 8.0.
+ _in.rows = rows;
+}
+
+function println(s, type)
+{
+ if((s=String(s)))
+ {
+ var newdiv = document.createElement("div");
+ newdiv.appendChild(document.createTextNode(s));
+ newdiv.className = type;
+ _out.appendChild(newdiv);
+ return newdiv;
+ }
+}
+
+function printWithRunin(h, s, type)
+{
+ var div = println(s, type);
+ var head = document.createElement("strong");
+ head.appendChild(document.createTextNode(h + ": "));
+ div.insertBefore(head, div.firstChild);
+}
+
+
+var shellCommands =
+{
+load : function load(url)
+{
+ var s = _win.document.createElement("script");
+ s.type = "text/javascript";
+ s.src = url;
+ _win.document.getElementsByTagName("head")[0].appendChild(s);
+ println("Loading " + url + "...", "message");
+},
+
+clear : function clear()
+{
+ var CHILDREN_TO_PRESERVE = 3;
+ while (_out.childNodes[CHILDREN_TO_PRESERVE])
+ _out.removeChild(_out.childNodes[CHILDREN_TO_PRESERVE]);
+},
+
+print : function print(s) { println(s, "print"); },
+
+// the normal function, "print", shouldn't return a value
+// (suggested by brendan; later noticed it was a problem when showing others)
+pr : function pr(s)
+{
+ shellCommands.print(s); // need to specify shellCommands so it doesn't try
window.print()!
+ return s;
+},
+
+props : function props(e, onePerLine)
+{
+ if (e === null) {
+ println("props called with null argument", "error");
+ return;
+ }
+
+ if (e === undefined) {
+ println("props called with undefined argument", "error");
+ return;
+ }
+
+ var ns = ["Methods", "Fields", "Unreachables"];
+ var as = [[], [], []]; // array of (empty) arrays of arrays!
+ var p, j, i; // loop variables, several used multiple times
+
+ var protoLevels = 0;
+
+ for (p = e; p; p = p.__proto__)
+ {
+ for (i=0; i<ns.length; ++i)
+ as[i][protoLevels] = [];
+ ++protoLevels;
+ }
+
+ for(var a in e)
+ {
+ // Shortcoming: doesn't check that VALUES are the same in object and prototype.
+
+ var protoLevel = -1;
+ try
+ {
+ for (p = e; p && (a in p); p = p.__proto__)
+ ++protoLevel;
+ }
+ catch(er) { protoLevel = 0; } // "in" operator throws when param to props()
is a string
+
+ var type = 1;
+ try
+ {
+ if ((typeof e[a]) == "function")
+ type = 0;
+ }
+ catch (er) { type = 2; }
+
+ as[type][protoLevel].push(a);
+ }
+
+ function times(s, n) { return n ? s + times(s, n-1) : ""; }
+
+ for (j=0; j<protoLevels; ++j)
+ for (i=0;i<ns.length;++i)
+ if (as[i][j].length)
+ printWithRunin(
+ ns[i] + times(" of prototype", j),
+ (onePerLine ? "\n\n" : "") +
as[i][j].sort().join(onePerLine ? "\n" : ", ") + (onePerLine ?
"\n\n" : ""),
+ "propList"
+ );
+},
+
+blink : function blink(node)
+{
+ if (!node) throw("blink: argument is null or
undefined.");
+ if (node.nodeType == null) throw("blink: argument must be a node.");
+ if (node.nodeType == 3) throw("blink: argument must not be a text
node");
+ if (node.documentElement) throw("blink: argument must not be the document
object");
+
+ function setOutline(o) {
+ return function() {
+ if (node.style.outline != node.style.bogusProperty) {
+ // browser supports outline (Firefox 1.1 and newer, CSS3, Opera 8).
+ node.style.outline = o;
+ }
+ else if (node.style.MozOutline != node.style.bogusProperty) {
+ // browser supports MozOutline (Firefox 1.0.x and older)
+ node.style.MozOutline = o;
+ }
+ else {
+ // browser only supports border (IE). border is a fallback because it moves
things around.
+ node.style.border = o;
+ }
+ }
+ }
+
+ function focusIt(a) {
+ return function() {
+ a.focus();
+ }
+ }
+
+ if (node.ownerDocument) {
+ var windowToFocusNow = (node.ownerDocument.defaultView ||
node.ownerDocument.parentWindow); // Moz vs. IE
+ if (windowToFocusNow)
+ setTimeout(focusIt(windowToFocusNow.top), 0);
+ }
+
+ for(var i=1;i<7;++i)
+ setTimeout(setOutline((i%252)?'3px solid red':'none'), i*100);
+
+ setTimeout(focusIt(window), 800);
+ setTimeout(focusIt(_in), 810);
+},
+
+scope : function scope(sc)
+{
+ if (!sc) sc = {};
+ _scope = sc;
+ println("Scope is now " + sc + ". If a variable is not found in this
scope, window will also be searched. New variables will still go on window.",
"message");
+},
+
+mathHelp : function mathHelp()
+{
+ printWithRunin("Math constants", "E, LN2, LN10, LOG2E, LOG10E, PI,
SQRT1_2, SQRT2", "propList");
+ printWithRunin("Math methods", "abs, acos, asin, atan, atan2, ceil, cos,
exp, floor, log, max, min, pow, random, round, sin, sqrt, tan",
"propList");
+},
+
+ans : undefined
+};
+
+
+function hist(up)
+{
+ // histList[0] = first command entered, [1] = second, etc.
+ // type something, press up --> thing typed is now in "limbo"
+ // (last item in histList) and should be reachable by pressing
+ // down again.
+
+ var L = histList.length;
+
+ if (L == 1)
+ return;
+
+ if (up)
+ {
+ if (histPos == L-1)
+ {
+ // Save this entry in case the user hits the down key.
+ histList[histPos] = _in.value;
+ }
+
+ if (histPos > 0)
+ {
+ histPos--;
+ // Use a timeout to prevent up from moving cursor within new text
+ // Set to nothing first for the same reason
+ setTimeout(
+ function() {
+ _in.value = '';
+ _in.value = histList[histPos];
+ var caretPos = _in.value.length;
+ if (_in.setSelectionRange)
+ _in.setSelectionRange(caretPos, caretPos);
+ },
+ 0
+ );
+ }
+ }
+ else // down
+ {
+ if (histPos < L-1)
+ {
+ histPos++;
+ _in.value = histList[histPos];
+ }
+ else if (histPos == L-1)
+ {
+ // Already on the current entry: clear but save
+ if (_in.value)
+ {
+ histList[histPos] = _in.value;
+ ++histPos;
+ _in.value = "";
+ }
+ }
+ }
+}
+
+function tabcomplete()
+{
+ /*
+ * Working backwards from s[from], find the spot
+ * where this expression starts. It will scan
+ * until it hits a mismatched ( or a space,
+ * but it skips over quoted strings.
+ * If stopAtDot is true, stop at a '.'
+ */
+ function findbeginning(s, from, stopAtDot)
+ {
+ /*
+ * Complicated function.
+ *
+ * Return true if s[i] == q BUT ONLY IF
+ * s[i-1] is not a backslash.
+ */
+ function equalButNotEscaped(s,i,q)
+ {
+ if(s.charAt(i) != q) // not equal go no further
+ return false;
+
+ if(i==0) // beginning of string
+ return true;
+
+ if(s.charAt(i-1) == '') // escaped?
+ return false;
+
+ return true;
+ }
+
+ var nparens = 0;
+ var i;
+ for(i=from; i>=0; i--)
+ {
+ if(s.charAt(i) == ' ')
+ break;
+
+ if(stopAtDot && s.charAt(i) == '.')
+ break;
+
+ if(s.charAt(i) == ')')
+ nparens++;
+ else if(s.charAt(i) == '(')
+ nparens--;
+
+ if(nparens < 0)
+ break;
+
+ // skip quoted strings
+ if(s.charAt(i) == '\'' || s.charAt(i) == '"')
+ {
+ //dump("skipping quoted chars: ");
+ var quot = s.charAt(i);
+ i--;
+ while(i >= 0 && !equalButNotEscaped(s,i,quot)) {
+ //dump(s.charAt(i));
+ i--;
+ }
+ //dump("\n");
+ }
+ }
+ return i;
+ }
+
+ // XXX should be used more consistently (instead of using selectionStart/selectionEnd
throughout code)
+ // XXX doesn't work in IE, even though it contains IE-specific code
+ function getcaretpos(inp)
+ {
+ if(inp.selectionEnd != null)
+ return inp.selectionEnd;
+
+ var range = document.selection.createRange();
+ var isCollapsed = range.compareEndPoints("StartToEnd", range) == 0;
+ if (!isCollapsed)
+ range.collapse(false);
+ var b = range.getBookmark();
+ return b.charCodeAt(2) - 2;
+ }
+
+ function setselectionto(inp,pos)
+ {
+ if(inp.selectionStart) {
+ inp.selectionStart = inp.selectionEnd = pos;
+ }
+ else if(inp.createTextRange) {
+ var docrange = _win.Shell.document.selection.createRange();
+ var inprange = inp.createTextRange();
+ inprange.move('character',pos);
+ inprange.select();
+ }
+ else { // err...
+ /*
+ inp.select();
+ if(_win.Shell.document.getSelection())
+ _win.Shell.document.getSelection() = "";
+ */
+ }
+ }
+ // get position of cursor within the input box
+ var caret = getcaretpos(_in);
+
+ if(caret) {
+ //dump("----\n");
+ var dotpos, spacepos, complete, obj;
+ //dump("caret pos: " + caret + "\n");
+ // see if there's a dot before here
+ dotpos = findbeginning(_in.value, caret-1, true);
+ //dump("dot pos: " + dotpos + "\n");
+ if(dotpos == -1 || _in.value.charAt(dotpos) != '.') {
+ dotpos = caret;
+ //dump("changed dot pos: " + dotpos + "\n");
+ }
+
+ // look backwards for a non-variable-name character
+ spacepos = findbeginning(_in.value, dotpos-1, false);
+ //dump("space pos: " + spacepos + "\n");
+ // get the object we're trying to complete on
+ if(spacepos == dotpos || spacepos+1 == dotpos || dotpos == caret)
+ {
+ // try completing function args
+ if(_in.value.charAt(dotpos) == '(' ||
+ (_in.value.charAt(spacepos) == '(' && (spacepos+1) == dotpos))
+ {
+ var fn,fname;
+ var from = (_in.value.charAt(dotpos) == '(') ? dotpos : spacepos;
+ spacepos = findbeginning(_in.value, from-1, false);
+
+ fname = _in.value.substr(spacepos+1,from-(spacepos+1));
+ //dump("fname: " + fname + "\n");
+ try {
+ with(_win.Shell._scope)
+ with(_win)
+ with(Shell.shellCommands)
+ fn = eval(fname);
+ }
+ catch(er) {
+ //dump('fn is not a valid object\n');
+ return;
+ }
+ if(fn == undefined) {
+ //dump('fn is undefined');
+ return;
+ }
+ if(fn instanceof Function)
+ {
+ // Print function definition, including argument names, but not function
body
+ if(!fn.toString().match(/function .+?\(\) +\{\n +\[native code\]\n\}/))
+ println(fn.toString().match(/function .+?\(.*?\)/),
"tabcomplete");
+ }
+
+ return;
+ }
+ else
+ obj = _win;
+ }
+ else
+ {
+ var objname = _in.value.substr(spacepos+1,dotpos-(spacepos+1));
+ //dump("objname: |" + objname + "|\n");
+ try {
+ with(_win.Shell._scope)
+ with(_win)
+ obj = eval(objname);
+ }
+ catch(er) {
+ printError(er);
+ return;
+ }
+ if(obj == undefined) {
+ // sometimes this is tabcomplete's fault, so don't print it :(
+ // e.g. completing from "print(document.getElements"
+ // println("Can't complete from null or undefined expression " +
objname, "error");
+ return;
+ }
+ }
+ //dump("obj: " + obj + "\n");
+ // get the thing we're trying to complete
+ if(dotpos == caret)
+ {
+ if(spacepos+1 == dotpos || spacepos == dotpos)
+ {
+ // nothing to complete
+ //dump("nothing to complete\n");
+ return;
+ }
+
+ complete = _in.value.substr(spacepos+1,dotpos-(spacepos+1));
+ }
+ else {
+ complete = _in.value.substr(dotpos+1,caret-(dotpos+1));
+ }
+ //dump("complete: " + complete + "\n");
+ // ok, now look at all the props/methods of this obj
+ // and find ones starting with 'complete'
+ var matches = [];
+ var bestmatch = null;
+ for(var a in obj)
+ {
+ //a = a.toString();
+ //XXX: making it lowercase could help some cases,
+ // but screws up my general logic.
+ if(a.substr(0,complete.length) == complete) {
+ matches.push(a);
+ ////dump("match: " + a + "\n");
+ // if no best match, this is the best match
+ if(bestmatch == null)
+ {
+ bestmatch = a;
+ }
+ else {
+ // the best match is the longest common string
+ function min(a,b){ return ((a<b)?a:b); }
+ var i;
+ for(i=0; i< min(bestmatch.length, a.length); i++)
+ {
+ if(bestmatch.charAt(i) != a.charAt(i))
+ break;
+ }
+ bestmatch = bestmatch.substr(0,i);
+ ////dump("bestmatch len: " + i + "\n");
+ }
+ ////dump("bestmatch: " + bestmatch + "\n");
+ }
+ }
+ bestmatch = (bestmatch || "");
+ ////dump("matches: " + matches + "\n");
+ var objAndComplete = (objname || obj) + "." + bestmatch;
+ //dump("matches.length: " + matches.length + ", tooManyMatches:
" + tooManyMatches + ", objAndComplete: " + objAndComplete +
"\n");
+ if(matches.length > 1 && (tooManyMatches == objAndComplete ||
matches.length <= 10)) {
+
+ printWithRunin("Matches: ", matches.join(', '),
"tabcomplete");
+ tooManyMatches = null;
+ }
+ else if(matches.length > 10)
+ {
+ println(matches.length + " matches. Press tab or ctrl-space again to see
them all", "tabcomplete");
+ tooManyMatches = objAndComplete;
+ }
+ else {
+ tooManyMatches = null;
+ }
+ if(bestmatch != "")
+ {
+ var sstart;
+ if(dotpos == caret) {
+ sstart = spacepos+1;
+ }
+ else {
+ sstart = dotpos+1;
+ }
+ _in.value = _in.value.substr(0, sstart)
+ + bestmatch
+ + _in.value.substr(caret);
+ setselectionto(_in,caret + (bestmatch.length - complete.length));
+ }
+ }
+}
+
+function printQuestion(q)
+{
+ println(q, "input");
+}
+
+function printAnswer(a)
+{
+ if (a !== undefined) {
+ println(a, "normalOutput");
+ shellCommands.ans = a;
+ }
+}
+
+function printError(er)
+{
+ var lineNumberString;
+
+ lastError = er; // for debugging the shell
+ if (er.name)
+ {
+ // lineNumberString should not be "", to avoid a very wacky bug in IE 6.
+ lineNumberString = (er.lineNumber != undefined) ? (" on line " +
er.lineNumber + ": ") : ": ";
+ println(er.name + lineNumberString + er.message, "error"); // Because IE
doesn't have error.toString.
+ }
+ else
+ println(er, "error"); // Because security errors in Moz /only/ have
toString.
+}
+
+function go(s)
+{
+ _in.value = question = s ? s : _in.value;
+
+ if (question == "")
+ return;
+
+ histList[histList.length-1] = question;
+ histList[histList.length] = "";
+ histPos = histList.length - 1;
+
+ // Unfortunately, this has to happen *before* the JavaScript is run, so that
+ // print() output will go in the right place.
+ _in.value='';
+ recalculateInputHeight();
+ printQuestion(question);
+
+ if (_win.closed) {
+ printError("Target window has been closed.");
+ return;
+ }
+
+ try { ("Shell" in _win) }
+ catch(er) {
+ printError("The JavaScript Shell cannot access variables in the target window.
The most likely reason is that the target window now has a different page loaded and that
page has a different hostname than the original page.");
+ return;
+ }
+
+ if (!("Shell" in _win))
+ initTarget(); // silent
+
+ // Evaluate Shell.question using _win's eval (this is why eval isn't in the
|with|, IIRC).
+ _win.location.href = "javascript:try{
Shell.printAnswer(eval('with(Shell._scope) with(Shell.shellCommands) {' +
Shell.question + String.fromCharCode(10) + '}')); } catch(er) {
Shell.printError(er); }; setTimeout(Shell.refocus, 0); void 0";
+}
+
+</script>
+
+<!-- for
http://ted.mielczarek.org/code/mozilla/extensiondev/ -->
+<script type="text/javascript"
src="chrome://extensiondev/content/rdfhistory.js"></script>
+<script type="text/javascript"
src="chrome://extensiondev/content/chromeShellExtras.js"></script>
+
+<style type="text/css">
+body { background: white; color: black; }
+
+#output { white-space: pre; white-space: -moz-pre-wrap; } /* Preserve line breaks, but
wrap too if browser supports it */
+h3 { margin-top: 0; margin-bottom: 0em; }
+h3 + div { margin: 0; }
+
+form { margin: 0; padding: 0; }
+#input { width: 100%; border: none; padding: 0; overflow: auto; }
+
+.input { color: blue; background: white; font: inherit; font-weight: bold; margin-top:
.5em; /* background: #E6E6FF; */ }
+.normalOutput { color: black; background: white; }
+.print { color: brown; background: white; }
+.error { color: red; background: white; }
+.propList { color: green; background: white; }
+.message { color: green; background: white; }
+.tabcomplete { color: purple; background: white; }
+</style>
+</head>
+
+<body onload="init()" onclick="keepFocusInTextbox(event)">
+
+<div id="output"><h3>JavaScript Shell
1.4</h3><h4>Modified by <a
href="http://blog.monstuff.com">Julien Couvreur</a> to work in
IE.</h4><div>Features: autocompletion of property names with Tab and
Ctrl-Space, multiline input with Shift+Enter, input history with (Ctrl+) Up/Down, <a
accesskey="M" href="javascript:go('scope(Math);
mathHelp();');" title="Accesskey: M">Math</a>, <a
accesskey="H"
href="http://www.squarefree.com/shell/?ignoreReferrerFrom=shell1.4&q...
title="Accesskey: H">help</a></div><div>Values and
functions: ans, print(string), <a accesskey="P"
href="javascript:go('props(ans)')" title="Accesskey:
P">props(object)</a>, <a accesskey="B"
href="javascript:go('blink(ans)')" title="Accesskey:
B">blink(node)</a>, <a accesskey="C"
href="javascript:go('clear()')" title="Accesskey:
C">clear()</a>, load(scriptURL), scope(object)</div></div>
+
+<div><textarea id="input" class="input" wrap="off"
onkeydown="inputKeydown(event)"
rows="1"></textarea></div>
+
+</body>
+
+</html>
+<!--
+");document.close();}
+-->
\ No newline at end of file
Copied: trunk/framework/impl/src/main/resources/org/ajax4jsf/javascript/scripts/command.js
(from rev 1593,
trunk/framework/impl/src/main/resources/org/ajax4jsf/framework/util/command/command.js)
===================================================================
--- trunk/framework/impl/src/main/resources/org/ajax4jsf/javascript/scripts/command.js
(rev 0)
+++
trunk/framework/impl/src/main/resources/org/ajax4jsf/javascript/scripts/command.js 2007-07-11
00:20:34 UTC (rev 1594)
@@ -0,0 +1,196 @@
+/**
+
+* Client-side implementation of command script for commadd links, buttons etc.
+
+*
+
+*/
+
+A4J_Command = Class.create();
+
+A4J_Command.prototype = {
+
+ /**
+
+ * Object is usually created on click event.
+
+ */
+
+ initialize: function(e, params, target) {
+
+ this.form = Event.findElement(e, 'form');
+
+ this.target = target;
+
+ this.objectsCreated = new Array();
+
+ this.oldValuesOfExistingInputs = {};
+
+
+
+ this.appendParameters(params);
+
+
+
+ this.processClick();
+
+
+
+ this.cleanUp();
+
+
+
+ },
+
+ /**
+
+ * store form;'s target
+
+ * append temporary parameter nodes
+
+ * submit form
+
+ */
+
+ processClick: function() {
+
+ var form = this.form;
+
+ var targ = form.target;
+
+
+
+ $A(this.objectsCreated).each(
+
+ function(node) {
+
+ form.appendChild(node);
+
+ }
+
+ );
+
+
+
+ if (this.target){
+
+ form.target = this.target;
+
+ }
+
+
+
+ form.submit();
+
+
+
+ form.target = targ;
+
+
+
+ },
+
+ /**
+
+ iterate over set of parameters, setting values of hidden inputs
+
+ */
+
+ appendParameters: function(params) {
+
+ var dis = this;
+
+ $H(params).each(
+
+ function(parameter) {
+
+ dis.createOrInitHiddenInput(parameter.key, parameter.value);
+
+ }
+
+ );
+
+ },
+
+ /**
+
+ * remove created hidden inputs, and restore values of previously existed
+
+ */
+
+ cleanUp: function(){
+
+ var form = this.form;
+
+
+
+ $H(this.oldValuesOfExistingInputs).each(
+
+ function(input){
+
+ ($(input.key) || form[input.key]).value = input.value;
+
+ }
+
+
+
+ );
+
+
+
+ $A(this.objectsCreated).each(
+
+ function(node) {
+
+ form.removeChild(node);
+
+ }
+
+ );
+
+
+
+ delete (this.objectsCreated);
+
+
+
+ },
+
+
+
+ /**
+
+ * init hidden inputs with parameter values, creating inputs if necessary
+
+ */
+
+ createOrInitHiddenInput : function(name, value) {
+
+ var hiddenObj = $(name) || this.form[name];
+
+
+
+ if (!hiddenObj) {
+
+ hiddenObj = document.createElement('input');
+
+ hiddenObj.setAttribute('type', 'hidden');
+
+ hiddenObj.setAttribute('name', name);
+
+ hiddenObj.setAttribute('id', name);
+
+ this.objectsCreated.push(hiddenObj);
+
+ } else {
+
+ this.oldValuesOfExistingInputs[name] = hiddenObj.value;
+
+ }
+
+ hiddenObj.value = value;
+
+ }
+
+};
+
Copied: trunk/framework/impl/src/main/resources/org/ajax4jsf/javascript/scripts/form.js
(from rev 1590,
trunk/framework/impl/src/main/resources/org/ajax4jsf/renderkit/html/scripts/form.js)
===================================================================
--- trunk/framework/impl/src/main/resources/org/ajax4jsf/javascript/scripts/form.js
(rev 0)
+++
trunk/framework/impl/src/main/resources/org/ajax4jsf/javascript/scripts/form.js 2007-07-11
00:20:34 UTC (rev 1594)
@@ -0,0 +1,101 @@
+
+if (!window.A4J) { window.A4J= {};}
+
+if(!A4J.findForm){
+
+function _JSFFormSubmit(linkId,formName,target,parameters){
+ var form = document.getElementById(formName);
+ if(form){
+ var hiddenField = form.elements[formName+":_idcl"];
+ if(hiddenField){
+ hiddenField.value=linkId;
+ } else {
+ var input = document.createElement("input");
+ input.type="hidden";
+ input.name=formName+":_idcl";
+ input.value=linkId;
+ form.appendChild(input);
+ }
+ if(target){
+ form.target=target;
+ }
+ if(parameters){
+ for(var param in parameters){
+ if(form.elements[param]){
+ form.elements[param].value = parameters[param];
+ } else {
+ var input = document.createElement("input");
+ input.type="hidden";
+ input.name=param;
+ input.value=parameters[param];
+ form.appendChild(input);
+ }
+ }
+ }
+ form.submit();
+ } else {
+ alert("Form "+formName+" not found in document");
+ }
+ return false;
+};
+
+function _clearJSFFormParameters(formName,target,fields){
+ var form = document.getElementById(formName);
+ if(form){
+ if(target){
+ form.target = target;
+ } else {
+ form.target = '';
+ }
+ if(fields){
+ for(var i=0;i<fields.length;i++){
+ var field = form.elements[fields[i]];
+ if(field){
+ field.value='';
+ }
+ }
+ }
+ }
+}
+
+function clearFormHiddenParams(formName,target,fields){
+ _clearJSFFormParameters(formName,target,fields);
+}
+
+
+ A4J.findForm = function(element){
+ var parent = element;
+ do{
+ parent = parent.parentNode;
+ } while (parent && parent.nodeName.toLowerCase() != 'form');
+ if(!parent){
+ parent = {reset:function(){}, submit:function(){}};
+ }
+ return parent;
+ }
+
+ A4J._formInput = null;
+
+// setup form to handle 'onclick' events, to detect input element.
+ A4J.setupForm = function(id){
+ var element = window.document.getElementById(id);
+ var name = "click";
+ if (element.addEventListener) {
+ element.addEventListener(name, A4J._observer, false);
+ } else if (element.attachEvent) {
+ element.attachEvent('on' + name, A4J._observer);
+ }
+ // TODO - handle array of all attached forms and remove listeners
+ // on ajax updates, to avoid memory leaks.
+ }
+
+ A4J._observer = function(evt){
+ var src = evt.target||evt.srcElement;
+ if( src && src.nodeName.toUpperCase() == 'INPUT' &&
src.type.toUpperCase() == 'SUBMIT'){
+ A4J._formInput = src;
+ } else {
+ A4J._formInput = null;
+ }
+ }
+}
+//
\ No newline at end of file
Copied: trunk/framework/impl/src/main/resources/org/ajax4jsf/messages.properties (from rev
1593,
trunk/framework/impl/src/main/resources/org/ajax4jsf/framework/util/message/messages.properties)
===================================================================
--- trunk/framework/impl/src/main/resources/org/ajax4jsf/messages.properties
(rev 0)
+++ trunk/framework/impl/src/main/resources/org/ajax4jsf/messages.properties 2007-07-11
00:20:34 UTC (rev 1594)
@@ -0,0 +1,252 @@
+BUNDLE_MAP_NO_PUT_VALUE=Bundle map not allow to put values
+BUNDLE_MAP_NO_REMOVE_VALUE=Bundle map not allow to remove values
+NO_CONVERTER_REGISTERED=No Converter registered with UpdateActionListener and no
appropriate standard converter found. Needed to convert String to {0}
+FOR_TARGETS_NO_AJAX_CONTAINER=Target pointed Attribute 'for' of AjaxStatus
component with id {0} not is AjaxContainer
+VAR_MUST_BE_LITERAL=Attribute 'var' for ajax support component {0} must be
literal
+NAME_MUST_BE_LITERAL=Attribute 'name' for view scope bean must be literal
+EVENT_MUST_BE_LITERAL=Attribute 'event' for ajax support component {0} must be
literal
+CREATE_JAVASCRIPT_EVENT=Create JavaScript event string for component {0}
+CALLED_SET_PARENT=Called setParent for AjaxSupport component with parent \: {0}
+DETECT_NEW_COMPONENT=Detect newly created component
+SET_VALUE_BINDING_FOR_EVENT=Set ValueBinding for {0} event property
+COULD_NOT_LOAD_RESOURCE_BUNDLE=Could not load ResourceBundle "{0}"
+FACES_CONTEXT_NOT_CREATED=Faces context not created then occurs exception
+FACES_CONTEXT_HAS_NOT_EXTERNAL=Faces context not have external then occurs exception
+FACES_CONTEXT_HAS_NOT_RESPONSE=Faces context not have http response object then occurs
exception
+CREATE_ALTERNATE_HANDLER=Create new instance of alternate handler class {0}
+ALTERNATE_HANDLER_CONSTRUCTOR_WARNING=Alternate view handler not use parent in
constructor!
+VIEW_HANDLER_INSTANTIATION_ERROR=Error instantiation parent Faces ViewHandler
+ERROR_ON_PAGE=Error on page {0}
+LIFECYCLE_ERROR=Error on JSF lifecycle in view {0} in {1} lyfecycle method
+LIFECYCLE_ERROR_AT_PHASE=Error on JSF lifecycle in view {0} in {1} lyfecycle method,\n at
phase {2}
+COMPONENT_TREE_NOT_CREATED=Component tree not created
+SET_AJAX_LISTENER=Set AjaxListener to {0}
+ADD_AJAX_AREA=Append single ID of area to render\: {0}
+ADD_AJAX_AREAS=Append collection of ID's to render as AjaxAreas
+SET_AJAX_REQUEST=Set request as ajax powered to {0}
+SUBMITTED_AJAX_REQUEST=Submitted AJAX request - Queue Event to AjaxListeners
+SEND_EVENT_TO_AJAX_LISTENER=Send Event to AjaxListeners from AjaxContainer with Id {0}
+RENDER_AJAX_REQUEST=Render ajax request by container with Id {0}
+RENDERING_AJAX_REGION_ERROR=Error rendering Ajax Region with id {0}
+RESTORE_AJAX_COMPONENT_STATE=Restore State of UIAjaxComponent with Id {0}
+SAVE_AJAX_COMPONENT_STATE=Save State of UIAjaxComponent with Id {0}
+CREATE_AJAX_AREAS_SET_TO_RENDER=Create new set of Ajax Areas to render
+ARGUMENT_IS_NOT_AJAX_REGION_ERROR=Argument for append AJAX region not instance of
AjaxContainer , region is {0}
+NULL_EVENT_SUBMITTED_ERROR=New event submitted to ViewRoot events queue is null
+CONTENT_TYPE_ENCODING=Incoming request has Content-Type header with character encoding
{0}
+CONTENT_TYPE_NO_ENCODING=Incoming request has Content-Type header without character
encoding: {0}
+FILTER_START_INFO=Filter start request processing at {0} for uri\: {1}
+FILTER_XML_OUTPUT=Filter request output to XML
+FILTER_NO_XML_CHAIN=Filter perform not-xml parsing chain
+FILTER_NO_XML_CHAIN_2=Not is faces request, Filter perform not-xml parsing chain
+FILTER_STOP_INFO=Finished request processing total time {0}ms for uri: {1}
+PARSER_NOT_INSTANTIATED_ERROR=Parser for content type {0} not instantiated !
+PARSING_TIME_INFO=Parsing html total time {0}ms
+JTIDY_PARSING_ERROR=Error on parsing response by Jtidy
+COMPONENT_NOT_FOUND=AjaxUpdate component not found for id: {0}
+EVENT_IS_READ_ONLY=Event string is read-only
+FLUSH_BUFFERED_STREAM_ERROR=Error on flush buffered stream in response wrapper
+UNSUPPORTED_ENCODING_WARNING=Unsupported encoding for convert writer content to bytes
+UNSUPPORTED_ENCODING_WARNING_2=Unsupported encoding for convert bytes content to string
+NO_WRITER_CALLED_INFO=Filtered resource did not call getWriter() or getOutputStream().
+PARSE_XML_DOCUMENT_INFO=XML document to parse in filter, return as stream \:
+NO_WRITER_POSSIBLE_ERROR=Servlet response already use stream, Writer not possible
+CREATE_WRITER_INFO=Create StringWriter for buffer servlet output
+NO_STREAM_POSSIBLE_ERROR=Servlet response already use Writer, OutputStream not possible
+CREATE_STREAM_INFO=Create ByteArrayServletOutputStream for buffer servlet output
+OPEN_CLOSE_TAGS_DO_NOT_MATCH_ERROR=Open-close tags don't match in JSSerialisation
+VARIABLE_SUBSTITUTION_WARNING=Could not perform variable substitution.
+START_DOCUMENT_SAX_EXCEPTION=StartDocument SAX exception: {0}
+COMMENT_SAX_EXCEPTION=Comment SAX exception: {0}
+END_ELEMENT_SAX_EXCEPTION=Sax exceptions in endElement: {0}
+END_DOCUMENT_SAX_EXCEPTION=Sax exceptions in endDocument: {0}
+START_ELEMENT_SAX_EXCEPTION=Sax exceptions in startElement: {0}
+TEXT_SAX_EXCEPTION=Sax exceptions in writeText: {0}
+MESSAGE_PARSING_INFO=Message for HTML parsing : {0}
+CREATE_JTIDY_INFO=Parsers pool empty - create new JTidy parser
+READING_TIDY_PROPERTIES_ERROR=Error reading properties from tidy.properties
+ILLEGAL_METHOD_STATE=Illegal state for this method
+WRAPPED_RULES_NULL_ERROR=Wrapped rules must not be null
+NO_NAME_ATTRIBUTE_ERROR=Tag {0} must have mantadory attribute "name"
+ENCODE_COMPILED_TEMPLATE_INFO=Encode compiled template "{0}" from breakpoint
{1}
+ENCODING_TEMPLATE_TERMINATED_INFO=Encoding template "{0}" terminated by
breakpoint\: {1}
+ENCODE_COMPILED_TEMPLATE_INFO2=Encode compiled template "{0}"
+CONVERTING_NON_VALUE_HOLDER_COMPONENT_ERROR=Attempt for get converted value for non
ValueHolder component {0}
+COMPONENT_CLASS_ERROR=Component {0} not instance of {1}
+CONTEXT_NULL_ERROR=Context in renderer {0} method is null
+COMPONENT_NULL_ERROR=Component in renderer {0} method is null
+START_DECODING_COMPONENT_INFO=Start decoding of component {0} with class {1}
+START_ENCODING_COMPONENT_INFO=Start encoding of component {0} with class {1}
+CHILDREN_ENCODING_COMPONENT_INFO=Encoding children of component {0} with class {1}
+FINISH_ENCODING_COMPONENT_INFO=Finish encoding of component {0} with class {1}
+NAMESPACE_NOT_RECOGNIZED_ERROR=Template namespace element <{0}> not recognized
+RENDERER_METHOD_NOT_SET_ERROR=Renderer method not set in template
+METHOD_CALL_ERROR_1=Error call renderer utils method {0} for component {1}
+METHOD_CALL_ERROR_2=Error invoke renderer utils method {0} for component {1}, caused\:
{2}
+METHOD_CALL_ERROR_3=Illegal Access Error call renderer utils method {0} for component
{1}
+METHOD_CALL_ERROR_4=Illegal Access Error invoke renderer utils method {0} for component
{1}, caused\: {2}
+METHOD_CALL_ERROR_5=Method {0} not found in renderer utils for component {1}
+METHOD_CALL_ERROR_6=Method {0} not found for RendererUtils
+METHOD_CALL_ERROR_1a=Error call renderer method {0} for component {1}
+METHOD_CALL_ERROR_2a=Error invoke renderer method {0} for component {1}, caused\: {2}
+METHOD_CALL_ERROR_3a=Illegal Access Error call renderer method {0} for component {1}
+METHOD_CALL_ERROR_4a=Illegal Access Error invoke renderer method {0} for component {1},
caused\: {2}
+METHOD_CALL_ERROR_5a=Method {0} not found in renderer for component {1}
+METHOD_CALL_ERROR_6a=Method {0} not found for Renderer
+PARSING_TEMPLATE_ERROR=Parsing Error when compile template from Reader at line\: {0}
column\: {1} \: {2}
+TEMPLATE_IO_ERROR=I/O Error when compile template from Reader \: {0}
+PARSING_TEMPLATE_ERROR_2=SAX Error then compile template from Reader \: {0}
+START_COMPILE_TEMPLATE_INFO=Start compile template from {0}
+PARSING_TEMPLATE_ERROR_a=Parsing Error when compile template {0} at line\: {1} column\:
{2} \: {3}
+TEMPLATE_IO_ERROR_a=I/O Error when compile template {0} \: {1}
+PARSING_TEMPLATE_ERROR_2a=SAX Error then compile template {0} \: {1}
+FINISH_COMPILE_TEMPLATE_INFO=Finish compilation template from {0}
+TEMPLATE_NOT_COMPILED_ERROR=XML template not compiled
+NO_CHILD_ALLOWED=Childs not allowed for Error element
+NO_FACET_NAME_ATTRIBUTE=Tag {0} must have not null facet name attribute(
name,skin,property etc. attributes )
+BREAKPOINTS_UNSUPPORTED_ERROR=Breakpoints in rendering facet <u:insertFacet>
unsupported, for facet {0}
+BREAKPOINT_NOT_REGISTERED_ERROR=Breakpoint ["{0}"] not registered in template
+CHILD_NOT_ALLOWED_ERROR=Element {0} not allowed as child for {1}
+INVOKE_RENDERER_METHOD_ERROR=Error invoke renderer method for value of template element
{0}
+METHOD_CALL_ERROR_2b=Error invoke renderer utils method {0}, caused\: {1}
+METHOD_CALL_ERROR_4b=Illegal Access Error invoke renderer utils method {0}, caused\: {1}
+METHOD_CALL_ERROR_6b=Method {0} not found in object {1}
+STYLE_ATTRIBUTE_ERROR=Name for style attribute not set
+BREAKPOINTS_UNSUPPORTED_ERROR_2=Breakpoints in rendering children
<u:insertChildren> unsupported
+BREAKPOINTS_UNSUPPORTED_ERROR_3=Breakpoints in rendering child <u:insertChild>
unsupported
+REQUEST_CHAMELEON_RENDER_KIT_INFO=Request to get Chameleon renderKit with id: {0}
+GET_DEFAULT_RENDER_KIT_ERROR=Error for get default render kit
+DEFAULT_RENDER_KIT_INFO=Default render kit id for chameleon will: {0}
+AJAX_RESPONSE_NOT_RENDERED_INFO=AJAX response not rendered - possible MyFaces <f:view
tag behavior.
+ENTER_BEFORE_RENDER_VIEW_PHASE=PhaseListener enter Before RenderView Phase with ViewId
{0} and RenderKitId {1}
+SET_RENDER_KIT_ID_INFO=PhaseListener Set new RenderKitId to {0}
+PROCESS_AJAX_EVENTS_INFO=Process AJAX events to calculate areas.
+DELEGATE_AJAX_PROCESSING_INFO=Delegate AJAX processing to container.
+BREAKPOINTS_UNSUPPORTED_INSIDE_ATTRIBUTE_ERROR=Breakpoints inside attribute element not
allowed, attribute name: {0} of component: {1}
+BUILD_ONCLICK_INFO=Build onclick string for component {0} as {1}
+UNNAMED_PARAMETER_ERROR=Unnamed parameter not allowed for AJAX components, parameter for
{0}
+AJAX_STATUS_COMPONENT_NOT_FOWND_WARNING=AJAX Status component not found for AjaxComponent
with id {0}
+COMPONENT_NULL_ERROR_2=Component argument is null
+CALCULATE_COMPONENT_ID_INFO=Calculate absolute ID for component {0} as {1}
+DETECTING_ENCODING_DISABLED_ERROR=Detecting request character encoding is disable.
+OBTAIN_RESPONSE_SET_HEADER_ERROR=Failed to obtain Response\#setHeader() method\: {0}
+INVOKE_AJAX_REGION_LISTENER=Invoke AjaxRegion Listener for component with Id\={0}
+APPENDING_AJAX_REGION_TO_NON_AJAX_CONTAINER_WARNING=Attempt to append AJAX regions to
render in non-ajax container
+RENDER_CHILDREN_NON_AJAX_INFO=AjaxView RenderChildren() components for normal faces
request
+RENDER_CHILDREN_AJAX_INFO=AjaxView RenderChildren() components for AJAX request
+ENCODE_CHILD_AJAX_INFO=AjaxView encodeChild component for AJAX request with at path {0}
ID {1}
+RENDER_AJAX_AREA_INFO=Render Ajax Area component with ID {0}
+DECODE_AJAX_REQUEST_STATUS_INFO=Decode ajax request status for {0}
+REQUEST_PARAMETERS_MAP=Request parameters map {0}
+SET_MYFACES_SEQUENCE_INFO=Set MyFaces sequence to {0}
+SKIP_ENCODING_HTML_INFO=Skip encoding HTML for Script Resource with key [{0}] due to AJAX
request
+SKIP_ENCODE_BEGIN_HTML_INFO=Skip encodeBegin HTML for Script Resource with key [{0}] due
to AJAX request
+SKIP_ENCODE_END_HTML_INFO=Skip encodeEnd HTML for Script Resource with key [{0}] due to
AJAX request
+QUERY_STRING_BUILDING_ERROR=Error building query string for store data
+BUILD_RESOURCE_URI_INFO=Build URI for Resource with key [{0}] as \: {1}
+RESTORE_DATA_FROM_RESOURCE_URI_INFO=Restore data object for Resource with key [{0}] from
uri string \: {1}
+DESERIALIZE_DATA_INPUT_ERROR=Input error for deserialize data
+DATA_CLASS_NOT_FOUND_ERROR=Data class for restore not found
+METHOD_NOT_IMPLEMENTED=Method {0} not implemented
+ENCODE_HTML_INFO=Encode HTML for Resource with key [{0}]
+ENCODE_HTML_INFO_2=Encode HTML for Resource with key [{0}] and attributes\: {1}
+ENCODE_BEGIN_HTML_INFO=EncodeBegin HTML for Resource with key [{0}] and attributes: {1}
+ENCODE_END_HTML_INFO=EncodeEnd HTML for Resource with key [{0}]
+SEND_CONTENT_INFO=Send content data for Resource with key [{0}]
+NO_INPUT_STREAM_ERROR=Could not get Input stream for resource\: {0}
+SET_RESPONSE_HEADERS_INFO=Set response http headers for Resource with key [{0}]
+BUILD_RESOURCE_INFO=build new resource for path {0}
+NO_RESOURCE_REGISTERED_ERROR=Resource not registered\: {0}
+NO_RESOURCE_REGISTERED_ERROR_2=Not registered type of resource {0} allowed extentions is
{1}
+NO_RESOURCE_EXISTS_ERROR=Resource not exist in classpath\: {0}
+INSTANTIATE_RESOURCE_ERROR=Error for instatiate resource from {0}
+INSTANTIATE_CLASS_ERROR=Instatiate class not InternetResource
+STATIC_RESOURCE_NOT_FOUND_ERROR=Static resource not found for path {0}
+PARSING_IF_MODIFIED_SINCE_WARNING=Error in parsing request If-Modified-Since header
+GET_CONTENT_FROM_CACHE_INFO=Get content from cache for resource {0}
+CONTENT_NOT_FOUND_ERROR=Content not found in cache for resource {0}
+SEND_RESOURCE_ERROR=Error on send resource
+SEND_RESOURCE_ERROR_2=Error on send new resource for cache by {0}
+READING_PROPERTIES_ERROR=Error reading properties from {0}
+SEND_IMAGE_ERROR=Error send image from resource {0}
+SEND_IMAGE_ERROR_2=Error send image
+SKIP_ENCODE_BEGIN_HTML_INFO_2=Skip begin encoding HTML for Resource with key [{0}] due to
previsius rendering
+MARK_AS_RENDERED_INFO=Mark in context Resource with key [{0}] as rendered
+SKIP_ENCODE_END_HTML_INFO_2=Skip end encoding HTML for Resource with key [{0}] due to
previsius rendering
+VARIABLE_SUBSTITUTION_ERROR=Could not perform variable substitution.
+SET_SKIN_FACTORY_INFO=Class name for SkinFactory set to {0} by META-INF/services
+CREATING_SKIN_FACTORY_ERROR=Unhandled exception then creating instance
+NULL_SKIN_NAME_ERROR=Name for current Skin calculated as null
+CREATE_SKIN_INFO=Create new Skin instance for name {0}
+DEFAULT_PROPERTIES_NOT_FOUND_ERROR=Default properties for skin not found in {0}
+SKIN_PROPERTIES_IO_ERROR=Attempt to load Skin property file caused IOError
+SKIN_NOT_FOUND_ERROR=Skin with name {0} not found
+ACESSING_SKIN_PROPERTY_AS_ARRAY_ERROR=Attempt to access to skin property as array
+ACESSING_SKIN_PROPERTY_ERROR=Attempt to access to skin property not as string parameter
+SKIN_PROPERTIES_READ_ONLY_ERROR=Skin properties is read-only
+NO_VALUE_HOLDER_ERROR=Component {0} is no ValueHolder, cannot set value.
+NO_EDITABLE_VALUE_HOLDER_ERROR=Component {0} is no EditableValueHolder
+INVALID_VALIDATION_EXPRESSION=Component {0} has invalid validation expression {1}
+NO_ACTION_SOURCE_ERROR=Component {0} is no ActionSource
+INVALID_ACTION_LISTENER=Component {0} has invalid actionListener value\: {1}
+INVALID_VALUE_CHANGE_LISTENER=Component {0} has invalid valueChangedListener expression
{1}
+NO_VALUE_REFERENCE_ERROR=Component {0} attribute {1} must be a value reference, was {2}
+NO_BYTE_ARRAY_ERROR=Parameter supplied to Base64 decode is not a byte[]
+BUFFER_TYPE_ERROR=Wrong Destination Buffer type
+IMAGE_ERROR=Image must be 8-bit
+CANNOT_WRITE_RASTERS=Cannot write rasters
+NULL_OUTPUT_ERROR=output was not set
+IMAGE_NOT_BUFFERED_ERROR=RenderedImage is not a BufferedImage
+NOT_DATA_OUTPUT_ERROR=output is not a DataOutput
+NULL_COLOR_PARAMETER_ERROR=Parameter "color" for convert from HTML to java is
null
+DECODE_COLOR_PARAMETER_ERROR=Parameter "color" for convert from HTML to java
can not be decoded\: [{0}], reason\: {1}
+NULL_COLOR_PARAMETER_ERROR_2=Parameter "color" for convert from java.awt.Color
to HTML is null
+DECODE_PARAMETER_ERROR=Parameter "{0}" for convert from HTML to java can not be
decoded\: [{1}], reason\: {2}
+IMAGE_GENERATOR_CLASS_NOT_FOUND=The imageGenerator class cannot be found\: {0}
+CREATING_IMAGE_GENERATOR_ERROR=The ImageGenerator instance could not be created\: {0}
+INVALID_COMMENT_INDEX=Not a valid comment index\: {0}
+LOADING_IMAGE_ERROR=Error loading image
+NOT_INDEXED_IMAGE_ERROR=Image is not indexed!
+INVALID_RADIUS=Radius must be greater than 0.
+INVALID_ATTRIBUTE_VALUE=Value {0} of tag {1} attribute is incorrect.
+VALUE_BINDING_TYPE_ERROR=ValueBinding for UISelectMany must be of type List or Array
+NO_CONVERTER_FOUND_ERROR=No Converter for type {0} found
+GRABBER_ERROR=Grabber returned false\: {0}
+TOOMANY_COLORS_ERROR=Too many colors.
+GET_RESOURCE_AS_STREAM_ERROR=ServletContext not allow to getResourceAsStream for {0}
+PARSING_WEB_XML_IO_ERROR=Error parsing web.xml due to IOexception
+PARSING_WEB_XML_SAX_ERROR=Error parsing web.xml due to SAX exception
+NULL_FILTER_NAME_WARNING=Filter name for definition is null
+FILTER_NOT_FOUND_ERROR=Filter definition not found for name {0}
+FILTER_NOT_CONFIGURED_ERROR=Filter for name {0} not configured in web.xml
+NO_PREFIX_OR_SUFFIX_IN_FILTER_MAPPING_ERROR=Filter mapping for chameleon filter {0} do
not contain wilcard prefix or suffix
+CONFIG_INITIALIZATION_ERROR={0} during config initialization for field {1} with value
[{2}]: {3}
+FIELD_READING_ERROR={0} when reading field {1}
+CONFIG_INITIALIZATION_ERROR_2={0} during config initialization for field {1}
+DOM_METHOD_NOT_SUPPORTED=DOM method not supported
+METHOD_NOT_SUPPORTED=Method {0} not supported
+NAMED_ITEM_NOT_FOUND_ERROR=Named item {0} not found
+AJAX_SUPPORT_REQUEST_PARAMETER_INFO=Have request parameter for AjaxSupport component {0}
+COMMAND_LINK_SUBMIT_INFO=CommandLink component {0} submit request
+COMMAND_LINK_NOT_IN_FORM_WARNING=CommandLink {0} not enclosed in form
+MUST_BE_EXPRESSION_ERROR=Must be expression to modifyable property
+NOT_PARENT_AJAX_CONTAINER_ERROR=Parent is not of type AjaxContainer, type is\: {0}
+NOT_PARENT_AJAX_COMPONENT_ERROR=Parent component {0} for a ajaxListener is not source of
AjaxEvent's
+MUST_BE_LITERAL_ERROR=Must be literal
+FACET_TAG_MANY_CHILDREN_ERROR=Facet Tag can only have one child UIComponent
+NO_UI_COMPONENT_TAG_ANCESTOR_ERROR={0} has no UIComponentTag ancestor
+NO_VALUE_REFERENCE_ERROR_2=property attribute is no valid value reference\: {0}
+NULL_TYPE_ATTRIBUTE_ERROR=type attribute not set
+INSTANTIATE_LISTENER_ERROR=Listener class {0} for Component {1} is not instantiable
+NOT_AJAX_CONTAINER_ERROR=Component {0} is no AjaxContainer
+INVALID_EXPRESSION=Invalid expression {0}
+NOT_INSTANCE_OF_ERROR={0} is not instance of {1}
+UNSUPPORTED_ENCODING_ERROR=Unsupported encoding\: {0}
+UNSUPPORTED_INPUT_SOURCE_ERROR=Unsupported type of input source\: {0}
+STRING_CONVERSION_ERROR=String to UTF-8 conversion failed\: {0}
+UTF_CONVERSION_ERROR=UTF-8 to string conversion failed\: {0}
+READ_ONLY_NODE_ERROR=Node is read only
+AJAX_VIEW_EXPIRED=View state could't be restored - reload page ?
+SKIN_CYCLIC_REFERENCE=Cyclic reference in Skin configuration for property \: {0}
+SKIN_ILLEGAL_REFERENCE=Reference for property "{0}" not present in Skin
configuration
+NULL_ATTRIBUTE_ERROR="Requied attribute {0} for component {1} is null
\ No newline at end of file
Copied: trunk/framework/impl/src/main/resources/org/ajax4jsf/webapp/output.properties
(from rev 1590,
trunk/framework/impl/src/main/resources/org/ajax4jsf/framework/ajax/xmlfilter/output.properties)
===================================================================
--- trunk/framework/impl/src/main/resources/org/ajax4jsf/webapp/output.properties
(rev 0)
+++
trunk/framework/impl/src/main/resources/org/ajax4jsf/webapp/output.properties 2007-07-11
00:20:34 UTC (rev 1594)
@@ -0,0 +1,4 @@
+method = xml
+omit-xml-declaration = no
+doctype-public = -//W3C//DTD XHTML 1.0 Transitional//EN
+doctype-system =
http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd
\ No newline at end of file
Copied: trunk/framework/impl/src/main/resources/org/ajax4jsf/webapp/tidy (from rev 1590,
trunk/framework/impl/src/main/resources/org/ajax4jsf/framework/ajax/xmlfilter/tidy)
Deleted: trunk/framework/impl/src/main/resources/org/ajax4jsf/webapp/tidy/tidy.properties
===================================================================
---
trunk/framework/impl/src/main/resources/org/ajax4jsf/framework/ajax/xmlfilter/tidy/tidy.properties 2007-07-10
19:28:19 UTC (rev 1590)
+++
trunk/framework/impl/src/main/resources/org/ajax4jsf/webapp/tidy/tidy.properties 2007-07-11
00:20:34 UTC (rev 1594)
@@ -1,55 +0,0 @@
-add-xml-decl=false
-doctype=ignore
-#add-xml-space=
-#alt-text=
-#assume-xml-procins=
-break-before-br=false
-#char-encoding=1
-#clean=
-#drop-empty-paras=
-#drop-font-tags=
-#enclose-block-text=
-#enclose-text=
-#error-file=
-#fix-bad-comments=
-#hide-endtags=
-indent-attributes=false
-#indent-spaces=2
-#indent=
-#input-xml=
-#keep-time=
-#literal-attributes=
-#logical-emphasis=
-#markup=
-#new-blocklevel-tags=
-#new-empty-tags=
-#new-inline-tags=
-#new-pre-tags=
-numeric-entities=true
-#output-xhtml=true
-#output-xml=true
-quiet=true
-#quote-ampersand=true
-#quote-marks=
-#quote-nbsp=
-#raw=
-show-warnings=true
-#slide-style=
-#split=
-#tab-size=4
-tidy-mark=false
-uppercase-attributes=false
-uppercase-tags=false
-#word-2000=
-#wrap-asp=
-#wrap-jste=
-#wrap-php=
-#wrap-script-literals=false
-#wrap-sections=
-wrap=0
-#write-back=
-join-classes=true
-join-styles=true
-#literal-attributes=true
-smart-indent=false
-trim-empty-elements=false
\ No newline at end of file
Copied: trunk/framework/impl/src/main/resources/org/ajax4jsf/webapp/tidy/tidy.properties
(from rev 1593,
trunk/framework/impl/src/main/resources/org/ajax4jsf/framework/ajax/xmlfilter/tidy/tidy.properties)
===================================================================
--- trunk/framework/impl/src/main/resources/org/ajax4jsf/webapp/tidy/tidy.properties
(rev 0)
+++
trunk/framework/impl/src/main/resources/org/ajax4jsf/webapp/tidy/tidy.properties 2007-07-11
00:20:34 UTC (rev 1594)
@@ -0,0 +1,55 @@
+add-xml-decl=false
+doctype=ignore
+#add-xml-space=
+#alt-text=
+#assume-xml-procins=
+break-before-br=false
+#char-encoding=1
+#clean=
+#drop-empty-paras=
+#drop-font-tags=
+#enclose-block-text=
+#enclose-text=
+#error-file=
+#fix-bad-comments=
+#hide-endtags=
+indent-attributes=false
+#indent-spaces=2
+#indent=
+#input-xml=
+#keep-time=
+#literal-attributes=
+#logical-emphasis=
+#markup=
+#new-blocklevel-tags=
+#new-empty-tags=
+#new-inline-tags=
+#new-pre-tags=
+numeric-entities=true
+#output-xhtml=true
+#output-xml=true
+quiet=true
+#quote-ampersand=true
+#quote-marks=
+#quote-nbsp=
+#raw=
+show-warnings=true
+#slide-style=
+#split=
+#tab-size=4
+tidy-mark=false
+uppercase-attributes=false
+uppercase-tags=false
+#word-2000=
+#wrap-asp=
+#wrap-jste=
+#wrap-php=
+#wrap-script-literals=false
+#wrap-sections=
+wrap=0
+#write-back=
+join-classes=true
+join-styles=true
+#literal-attributes=true
+smart-indent=false
+trim-empty-elements=false
\ No newline at end of file
Modified:
trunk/framework/test/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/NekkoParserTest.java
===================================================================
---
trunk/framework/test/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/NekkoParserTest.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/framework/test/src/test/java/org/ajax4jsf/framework/ajax/xmlfilter/NekkoParserTest.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -38,6 +38,7 @@
parser = new NekkoParser();
parser.setInputEncoding("UTF-8");
parser.setOutputEncoding("UTF-8");
+ parser.init();
super.setUp();
}
Modified:
trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/WEB-INF/lib/ajax4jsf-1.1.2-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified:
trunk/sandbox/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java
===================================================================
---
trunk/sandbox/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/sandbox/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -6,7 +6,7 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import org.ajax4jsf.framework.renderer.AjaxComponentRendererBase;
+import org.ajax4jsf.renderkit.AjaxComponentRendererBase;
import org.ajax4jsf.framework.skin.Skin;
import org.richfaces.component.UIToolTip;
import org.richfaces.renderkit.html.image.cornerimages.BottomLeftToolTipCornerImage;
Modified: trunk/sandbox/tooltip/src/main/templates/org/richfaces/htmltooltip.jspx
===================================================================
--- trunk/sandbox/tooltip/src/main/templates/org/richfaces/htmltooltip.jspx 2007-07-10
22:04:48 UTC (rev 1593)
+++ trunk/sandbox/tooltip/src/main/templates/org/richfaces/htmltooltip.jspx 2007-07-11
00:20:34 UTC (rev 1594)
@@ -15,8 +15,8 @@
/org/richfaces/renderkit/html/css/tooltip.xcss
</h:styles>
<h:scripts>
- new org.ajax4jsf.framework.resource.PrototypeScript(),
- new org.ajax4jsf.framework.ajax.AjaxScript(),
+ new org.ajax4jsf.javascript.PrototypeScript(),
+ new org.ajax4jsf.javascript.AjaxScript(),
/org/richfaces/renderkit/html/scripts/utils.js,
/org/richfaces/renderkit/html/scripts/tooltip.js
</h:scripts>
Modified:
trunk/sandbox/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
---
trunk/sandbox/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/sandbox/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -31,7 +31,7 @@
public class CalendarRendererBase extends TemplateEncoderRendererBase {
/* (non-Javadoc)
- * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass()
+ * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass()
*/
protected Class getComponentClass() {
return UICalendar.class;
Modified: trunk/sandbox/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
===================================================================
---
trunk/sandbox/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/sandbox/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-07-11
00:20:34 UTC (rev 1594)
@@ -11,7 +11,7 @@
component="org.richfaces.component.UICalendar"
<f:clientid var="clientId"/>
- <h:scripts>new org.ajax4jsf.framework.resource.PrototypeScript(),new
org.ajax4jsf.framework.ajax.AjaxScript(),/org/richfaces/renderkit/html/scripts/utils.js,/org/richfaces/renderkit/html/scripts/json/json-dom.js</h:scripts>
+ <h:scripts>new org.ajax4jsf.javascript.PrototypeScript(),new
org.ajax4jsf.javascript.AjaxScript(),/org/richfaces/renderkit/html/scripts/utils.js,/org/richfaces/renderkit/html/scripts/json/json-dom.js</h:scripts>
<div id="#{clientId}"
x:passThruWithExclusions="value,name,type,id"
Modified:
trunk/sandbox/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java
===================================================================
---
trunk/sandbox/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/sandbox/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -28,8 +28,8 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase;
-import org.ajax4jsf.framework.renderer.compiler.TemplateContext;
+import org.ajax4jsf.renderkit.HeaderResourcesRendererBase;
+import org.ajax4jsf.renderkit.compiler.TemplateContext;
import org.ajax4jsf.framework.skin.Skin;
import org.ajax4jsf.framework.util.style.CSSFormat;
import org.richfaces.component.UIPanelMenu;
@@ -45,7 +45,7 @@
import org.richfaces.renderkit.html.iconimages.PanelMenuIconTriangle;
import org.richfaces.renderkit.html.iconimages.PanelMenuIconTriangleDown;
import org.richfaces.renderkit.html.iconimages.PanelMenuIconTriangleUp;
-import org.ajax4jsf.framework.renderer.RendererUtils.HTML;
+import org.ajax4jsf.renderkit.RendererUtils.HTML;
/**
* @author hans
Modified:
trunk/sandbox/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java
===================================================================
---
trunk/sandbox/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/sandbox/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -30,7 +30,7 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import org.ajax4jsf.framework.renderer.AjaxRendererUtils;
+import org.ajax4jsf.renderkit.AjaxRendererUtils;
import org.ajax4jsf.framework.util.javascript.JSFunction;
import org.richfaces.component.UIPanelMenu;
import org.richfaces.component.UIPanelMenuGroup;
@@ -40,7 +40,7 @@
public class PanelMenuRenderer extends PanelMenuRendererBase {
/* (non-Javadoc)
- * @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass()
+ * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass()
*/
protected Class getComponentClass() {
return UIComponent.class;
Modified: trunk/sandbox/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx
===================================================================
---
trunk/sandbox/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/sandbox/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx 2007-07-11
00:20:34 UTC (rev 1594)
@@ -15,8 +15,8 @@
/org/richfaces/renderkit/html/css/panelMenu.xcss
</h:styles>
<h:scripts>
- new org.ajax4jsf.framework.resource.PrototypeScript(),
- new org.ajax4jsf.framework.ajax.AjaxScript(),
+ new org.ajax4jsf.javascript.PrototypeScript(),
+ new org.ajax4jsf.javascript.AjaxScript(),
/org/richfaces/renderkit/html/scripts/utils.js,
/org/richfaces/renderkit/html/scripts/panelMenu.js,
</h:scripts>
Modified:
trunk/sandbox/ui/panelmenu/src/test/java/org/richfaces/component/PanelMenuComponentTest.java
===================================================================
---
trunk/sandbox/ui/panelmenu/src/test/java/org/richfaces/component/PanelMenuComponentTest.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/sandbox/ui/panelmenu/src/test/java/org/richfaces/component/PanelMenuComponentTest.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -64,8 +64,8 @@
};
static {
- javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript");
- javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript");
+ javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScript");
javaScripts.add("org/richfaces/renderkit/html/scripts/utils.js");
javaScripts.add("org/richfaces/renderkit/html/scripts/panelMenu.js");
}
Modified:
trunk/sandbox/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/AjaxFunctionBuilder.java
===================================================================
---
trunk/sandbox/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/AjaxFunctionBuilder.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/sandbox/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/AjaxFunctionBuilder.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -5,7 +5,7 @@
import javax.faces.context.FacesContext;
-import org.ajax4jsf.framework.renderer.RendererBase;
+import org.ajax4jsf.renderkit.RendererBase;
import org.ajax4jsf.framework.util.javascript.JSFunction;
import org.ajax4jsf.framework.util.javascript.JSFunctionDefinition;
import org.ajax4jsf.framework.util.javascript.JSReference;
Modified:
trunk/sandbox/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/GridRendererState.java
===================================================================
---
trunk/sandbox/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/GridRendererState.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/sandbox/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/GridRendererState.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -15,7 +15,7 @@
import javax.faces.context.ResponseWriter;
import org.ajax4jsf.framework.ajax.AjaxContext;
-import org.ajax4jsf.framework.renderer.AjaxRendererUtils;
+import org.ajax4jsf.renderkit.AjaxRendererUtils;
import org.richfaces.component.UIScrollableGrid;
/**
Modified:
trunk/sandbox/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java
===================================================================
---
trunk/sandbox/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/sandbox/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -14,11 +14,11 @@
import org.ajax4jsf.ajax.repeat.DataVisitor;
import org.ajax4jsf.framework.ajax.AjaxContext;
-import org.ajax4jsf.framework.renderer.AjaxRendererUtils;
-import org.ajax4jsf.framework.renderer.ComponentVariables;
-import org.ajax4jsf.framework.renderer.ComponentsVariableResolver;
-import org.ajax4jsf.framework.renderer.RendererBase;
-import org.ajax4jsf.framework.renderer.RendererUtils.HTML;
+import org.ajax4jsf.renderkit.AjaxRendererUtils;
+import org.ajax4jsf.renderkit.ComponentVariables;
+import org.ajax4jsf.renderkit.ComponentsVariableResolver;
+import org.ajax4jsf.renderkit.RendererBase;
+import org.ajax4jsf.renderkit.RendererUtils.HTML;
import org.ajax4jsf.framework.util.javascript.JSFunction;
import org.ajax4jsf.framework.util.javascript.JSFunctionDefinition;
import org.ajax4jsf.framework.util.javascript.JSReference;
Modified:
trunk/sandbox/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java
===================================================================
---
trunk/sandbox/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/sandbox/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -16,7 +16,7 @@
import org.ajax4jsf.ajax.repeat.DataVisitor;
import org.ajax4jsf.framework.ajax.AjaxContext;
-import org.ajax4jsf.framework.renderer.RendererUtils.HTML;
+import org.ajax4jsf.renderkit.RendererUtils.HTML;
import org.richfaces.component.UIScrollableGrid;
import org.richfaces.model.selection.ClientSelection;
import org.richfaces.model.selection.Selection;
Modified:
trunk/sandbox/ui/scrollable-grid/src/main/java/org/richfaces/utils/TemplateLoader.java
===================================================================
---
trunk/sandbox/ui/scrollable-grid/src/main/java/org/richfaces/utils/TemplateLoader.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/sandbox/ui/scrollable-grid/src/main/java/org/richfaces/utils/TemplateLoader.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -3,7 +3,7 @@
*/
package org.richfaces.utils;
-import org.ajax4jsf.framework.renderer.RendererBase;
+import org.ajax4jsf.renderkit.RendererBase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified:
trunk/sandbox/ui/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx
===================================================================
---
trunk/sandbox/ui/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/sandbox/ui/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx 2007-07-11
00:20:34 UTC (rev 1594)
@@ -17,8 +17,8 @@
</h:styles>
<h:scripts>
- new org.ajax4jsf.framework.resource.PrototypeScript(),
- new org.ajax4jsf.framework.ajax.AjaxScript(),
+ new org.ajax4jsf.javascript.PrototypeScript(),
+ new org.ajax4jsf.javascript.AjaxScript(),
/org/richfaces/renderkit/html/scripts/scrollable-grid.js
</h:scripts>
Modified:
trunk/sandbox/ui/scrollable-grid/src/test/java/org/richfaces/renderkit/html/ScrollableGridRendererTest.java
===================================================================
---
trunk/sandbox/ui/scrollable-grid/src/test/java/org/richfaces/renderkit/html/ScrollableGridRendererTest.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/sandbox/ui/scrollable-grid/src/test/java/org/richfaces/renderkit/html/ScrollableGridRendererTest.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -29,9 +29,9 @@
private static Set javaScripts = new HashSet();
static {
- javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript");
- javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript");
- javaScripts.add("org.ajax4jsf.framework.resource.PrototypeScript");
+ javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScript");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScript");
javaScripts.add("org/richfaces/renderkit/html/scripts/scrollable-grid.js");
}
Modified:
trunk/sandbox/ui/simpleTogglePanel2/src/main/java/org/richfaces/component/UISimpleTogglePanel2.java
===================================================================
---
trunk/sandbox/ui/simpleTogglePanel2/src/main/java/org/richfaces/component/UISimpleTogglePanel2.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/sandbox/ui/simpleTogglePanel2/src/main/java/org/richfaces/component/UISimpleTogglePanel2.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -24,7 +24,7 @@
import org.ajax4jsf.framework.ajax.AjaxActionComponent;
import org.ajax4jsf.framework.ajax.AjaxComponent;
import org.ajax4jsf.framework.ajax.AjaxSource;
-import org.ajax4jsf.framework.renderer.AjaxRendererUtils;
+import org.ajax4jsf.renderkit.AjaxRendererUtils;
import javax.faces.component.ActionSource;
import javax.faces.context.FacesContext;
Modified:
trunk/sandbox/ui/simpleTogglePanel2/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanel2Renderer.java
===================================================================
---
trunk/sandbox/ui/simpleTogglePanel2/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanel2Renderer.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/sandbox/ui/simpleTogglePanel2/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanel2Renderer.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -24,7 +24,7 @@
*/
package org.richfaces.renderkit.html;
-import org.ajax4jsf.framework.renderer.AjaxRendererUtils;
+import org.ajax4jsf.renderkit.AjaxRendererUtils;
import org.richfaces.component.UISimpleTogglePanel2;
import org.richfaces.event.SimpleToggle2Event;
@@ -38,7 +38,7 @@
//public class SimpleTogglePanelRenderer extends AjaxCommandLinkRenderer {
-public class SimpleTogglePanel2Renderer extends
org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase {
+public class SimpleTogglePanel2Renderer extends
org.ajax4jsf.renderkit.HeaderResourcesRendererBase {
//XXXX by nick - denis - seems there is a lot of code common to
org.richfaces.renderkit.html.ToggleControlRenderer. Please commonize!
//private InternetResource[] _scripts = {new PrototypeScript(),
getResource("scripts/simpleTogglePanel.js") };
Modified: trunk/sandbox/ui/simpleTogglePanel2/src/main/templates/simpleTogglePanel2.jspx
===================================================================
---
trunk/sandbox/ui/simpleTogglePanel2/src/main/templates/simpleTogglePanel2.jspx 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/sandbox/ui/simpleTogglePanel2/src/main/templates/simpleTogglePanel2.jspx 2007-07-11
00:20:34 UTC (rev 1594)
@@ -12,10 +12,10 @@
<f:clientid var="clientId"/>
<h:styles>css/simpleTogglePanel2.xcss</h:styles>
<h:scripts>
-new org.ajax4jsf.framework.resource.PrototypeScript(),
-new org.ajax4jsf.framework.ajax.AjaxScript(),
-new org.ajax4jsf.framework.ajax.ImageCacheScript(),
-/org/ajax4jsf/renderkit/html/scripts/form.js,
+new org.ajax4jsf.javascript.PrototypeScript(),
+new org.ajax4jsf.javascript.AjaxScript(),
+new org.ajax4jsf.javascript.ImageCacheScript(),
+/org/ajax4jsf/javascript/scripts/form.js,
/org/richfaces/renderkit/html/scripts/browser_info.js,
scripts/simpleTogglePanel2.js
</h:scripts>
Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java
===================================================================
---
trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -70,7 +70,7 @@
private static final String MYFACES_HIDDEN_FIELD_SUFFIX =
NamingContainer.SEPARATOR_CHAR
+ "_link_hidden_";
- private InternetResource[] _scripts = { getResource("scripts/form.js") };
+ private InternetResource[] _scripts = {
getResource("/org/ajax4jsf/javascript/scripts/form.js") };
private static final String[] exclusions = { "onsubmit" };
Modified: trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx
===================================================================
--- trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx 2007-07-10 22:04:48
UTC (rev 1593)
+++ trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx 2007-07-11 00:20:34
UTC (rev 1594)
@@ -12,7 +12,7 @@
component="org.richfaces.component.UIDataFltrSlider">
<h:styles>css/dataFilterSlider.xcss</h:styles>
- <h:scripts>new
org.ajax4jsf.resource.PrototypeScript(),scripts/scriptaculous-js-1.6.5/src/slider.js</h:scripts>
+ <h:scripts>new
org.ajax4jsf.javascript.PrototypeScript(),scripts/scriptaculous-js-1.6.5/src/slider.js</h:scripts>
<f:clientid var="clientId"/>
<f:resource name="org.richfaces.renderkit.html.images.SliderArrowImage"
var="arrow" />
Modified:
trunk/ui/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java
===================================================================
---
trunk/ui/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -79,8 +79,8 @@
*/
static {
- javaScripts.add("org.ajax4jsf.resource.PrototypeScript");
- javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScript");
+ javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
javaScripts.add("scripts/scriptaculous-js-1.6.5/src/slider.js");
}
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractDefinitionListRenderer.java
===================================================================
---
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractDefinitionListRenderer.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractDefinitionListRenderer.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -28,7 +28,6 @@
import javax.faces.context.ResponseWriter;
import org.ajax4jsf.component.UIDataAdaptor;
-import org.ajax4jsf.renderkit.RendererUtils.HTML;
/**
* @author shura
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractListRenderer.java
===================================================================
---
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractListRenderer.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractListRenderer.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -27,7 +27,6 @@
import javax.faces.context.ResponseWriter;
import org.ajax4jsf.component.UIDataAdaptor;
-import org.ajax4jsf.renderkit.RendererUtils.HTML;
/**
* @author shura
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java
===================================================================
---
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -31,7 +31,6 @@
import org.ajax4jsf.component.UIDataAdaptor;
import org.ajax4jsf.model.DataVisitor;
import org.ajax4jsf.renderkit.HeaderResourcesRendererBase;
-import org.ajax4jsf.renderkit.RendererBase;
import org.ajax4jsf.renderkit.RendererUtils;
import org.ajax4jsf.renderkit.RendererUtils.HTML;
import org.richfaces.component.Row;
Modified:
trunk/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java
===================================================================
---
trunk/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -36,7 +36,6 @@
import javax.faces.el.ValueBinding;
import javax.faces.model.ListDataModel;
-import org.ajax4jsf.component.AjaxSupport;
import org.ajax4jsf.component.UIAjaxSupport;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
import org.apache.commons.collections.Predicate;
Modified: trunk/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java
===================================================================
---
trunk/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -31,7 +31,7 @@
import javax.faces.event.AbortProcessingException;
import javax.faces.event.FacesEvent;
-import org.ajax4jsf.framework.renderer.AjaxRendererUtils;
+import org.ajax4jsf.renderkit.AjaxRendererUtils;
import org.richfaces.event.DataScrollerEvent;
import org.richfaces.event.DataScrollerListener;
import org.richfaces.event.DataScrollerSource;
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-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -29,11 +29,11 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import org.ajax4jsf.framework.renderer.AjaxRendererUtils;
-import org.ajax4jsf.framework.renderer.ComponentVariables;
-import org.ajax4jsf.framework.renderer.ComponentsVariableResolver;
-import org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase;
import org.ajax4jsf.javascript.JSFunction;
+import org.ajax4jsf.renderkit.AjaxRendererUtils;
+import org.ajax4jsf.renderkit.ComponentVariables;
+import org.ajax4jsf.renderkit.ComponentsVariableResolver;
+import org.ajax4jsf.renderkit.HeaderResourcesRendererBase;
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-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2007-07-11
00:20:34 UTC (rev 1594)
@@ -12,7 +12,7 @@
<h:styles>css/datascroller.xcss</h:styles>
<h:scripts>
- new org.ajax4jsf.resource.PrototypeScript(),
+ new org.ajax4jsf.javascript.PrototypeScript(),
new org.ajax4jsf.javascript.AjaxScript(),
</h:scripts>
Modified:
trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java
===================================================================
---
trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -56,8 +56,8 @@
private static Set javaScripts = new HashSet();
static {
- javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript");
- javaScripts.add("org.ajax4jsf.resource.PrototypeScript");
+ javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt");
}
private UIDatascroller scroller;
Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragIndicator.java
===================================================================
---
trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragIndicator.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragIndicator.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -21,12 +21,7 @@
package org.richfaces.component;
-import java.util.Map;
-
-import javax.faces.application.Application;
import javax.faces.component.UIComponentBase;
-import javax.faces.component.UIOutput;
-import javax.faces.context.FacesContext;
/**
* Component for render Drag indicator ( marker )
Modified:
trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java
===================================================================
---
trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -30,8 +30,8 @@
import javax.faces.event.FacesEvent;
import org.ajax4jsf.javascript.DnDScript;
+import org.ajax4jsf.javascript.PrototypeScript;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
-import org.ajax4jsf.resource.PrototypeScript;
import org.richfaces.component.Draggable;
import org.richfaces.component.Dropzone;
import org.richfaces.event.DragEvent;
Modified:
trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java
===================================================================
---
trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -32,9 +32,9 @@
import org.ajax4jsf.javascript.JSFunction;
import org.ajax4jsf.javascript.JSFunctionDefinition;
import org.ajax4jsf.javascript.JSReference;
+import org.ajax4jsf.javascript.PrototypeScript;
import org.ajax4jsf.javascript.ScriptUtils;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
-import org.ajax4jsf.resource.PrototypeScript;
import org.richfaces.component.Draggable;
import org.richfaces.component.Dropzone;
import org.richfaces.event.DropEvent;
Modified: trunk/ui/drag-drop/src/main/templates/org/richfaces/htmlDragIndicator.jspx
===================================================================
--- trunk/ui/drag-drop/src/main/templates/org/richfaces/htmlDragIndicator.jspx 2007-07-10
22:04:48 UTC (rev 1593)
+++ trunk/ui/drag-drop/src/main/templates/org/richfaces/htmlDragIndicator.jspx 2007-07-11
00:20:34 UTC (rev 1594)
@@ -12,7 +12,7 @@
xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
<h:scripts>
- new org.ajax4jsf.resource.PrototypeScript(),
+ new org.ajax4jsf.javascript.PrototypeScript(),
new org.ajax4jsf.javascript.AjaxScript(),
new org.ajax4jsf.javascript.DnDScript(),
/org/richfaces/renderkit/html/scripts/utils.js,
Modified: trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java
===================================================================
--- trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java 2007-07-10
22:04:48 UTC (rev 1593)
+++ trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -40,8 +40,8 @@
private static Set javaScripts = new HashSet();
static {
- javaScripts.add("org.ajax4jsf.resource.PrototypeScript");
- javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt");
+ javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
javaScripts.add("scripts/browser_info.js");
javaScripts.add("org.ajax4jsf.dnd.DnDScript");
javaScripts.add("scripts/events.js");
Modified: trunk/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
===================================================================
---
trunk/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-07-11
00:20:34 UTC (rev 1594)
@@ -12,7 +12,7 @@
<h:styles>css/dropdownmenu.xcss</h:styles>
<h:scripts>
- new org.ajax4jsf.resource.PrototypeScript(),
+ new org.ajax4jsf.javascript.PrototypeScript(),
new org.ajax4jsf.javascript.AjaxScript(),
scripts/menu.js
</h:scripts>
Modified:
trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java
===================================================================
---
trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -50,8 +50,8 @@
private static Set javaScripts = new HashSet();
static {
- javaScripts.add("org.ajax4jsf.resource.PrototypeScript");
- javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt");
+ javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
javaScripts.add("org.ajax4jsf.util.command.CommandScript");
javaScripts.add("scripts/menu.js");
}
Modified: trunk/ui/gmap/src/main/templates/gmap.jspx
===================================================================
--- trunk/ui/gmap/src/main/templates/gmap.jspx 2007-07-10 22:04:48 UTC (rev 1593)
+++ trunk/ui/gmap/src/main/templates/gmap.jspx 2007-07-11 00:20:34 UTC (rev 1594)
@@ -27,7 +27,7 @@
<c:set var="enableDoubleClickZoom"
value="#{component.attributes['enableDoubleClickZoom']}"/>
<c:set var="enableContinuousZoom"
value="#{component.attributes['enableContinuousZoom']}"/>
<h:styles>css/gmap.xcss</h:styles>
- <h:scripts>new
org.ajax4jsf.resource.PrototypeScript(),script/gmap.js</h:scripts>
+ <h:scripts>new
org.ajax4jsf.javascript.PrototypeScript(),script/gmap.js</h:scripts>
<div id="#{clientId}" class="dr-gmap rich-gmap
#{component.attributes['styleClass']}"
x:passThruWithExclusions="id, styleClass"
Modified: trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java
===================================================================
--- trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java 2007-07-10
22:04:48 UTC (rev 1593)
+++ trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -48,8 +48,8 @@
private final static String TEST_STYLE = "width:500px; height:400px";
static {
- javaScripts.add("org.ajax4jsf.resource.PrototypeScript");
- javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt");
+ javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
javaScripts.add("script/gmap.js");
javaScripts.add("http://maps.google.com");
}
Modified: trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx
===================================================================
--- trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx 2007-07-10
22:04:48 UTC (rev 1593)
+++ trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx 2007-07-11
00:20:34 UTC (rev 1594)
@@ -10,7 +10,7 @@
component="org.richfaces.component.UIInputNumberSlider"
<h:styles>css/slider.xcss</h:styles>
- <h:scripts>new
org.ajax4jsf.resource.PrototypeScript(),script/SliderScript.js,/org/richfaces/renderkit/html/scripts/browser_info.js,/org/richfaces/renderkit/html/scripts/events.js</h:scripts>
+ <h:scripts>new
org.ajax4jsf.javascript.PrototypeScript(),script/SliderScript.js,/org/richfaces/renderkit/html/scripts/browser_info.js,/org/richfaces/renderkit/html/scripts/events.js</h:scripts>
<f:clientid var="clientId"/>
<f:resource name="/org/richfaces/renderkit/html/images/spacer.gif"
var="spacer" />
Modified:
trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java
===================================================================
---
trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -75,8 +75,8 @@
*/
static {
- javaScripts.add("org.ajax4jsf.resource.PrototypeScript");
- javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt");
+ javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
javaScripts.add("script/SliderScript.js");
javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js");
javaScripts.add("org/richfaces/renderkit/html/scripts/events.js");
Modified: trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx
===================================================================
--- trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx 2007-07-10
22:04:48 UTC (rev 1593)
+++ trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx 2007-07-11
00:20:34 UTC (rev 1594)
@@ -17,7 +17,7 @@
<f:resource name="org.richfaces.renderkit.html.images.buttons.SpinnerButtonDown"
var="down_arrow" />
- <h:scripts>new
org.ajax4jsf.resource.PrototypeScript(),script/SpinnerScript.js,/org/richfaces/renderkit/html/scripts/browser_info.js</h:scripts>
+ <h:scripts>new
org.ajax4jsf.javascript.PrototypeScript(),script/SpinnerScript.js,/org/richfaces/renderkit/html/scripts/browser_info.js</h:scripts>
<h:styles>css/spinner.xcss</h:styles>
<table width="2%" class="dr-spnr-c rich-spinner-c
#{component.attributes['styleClass']}" id="#{clientId}"
cellspacing="0" cellpadding="0" border="0"
style="#{component.attributes['style']}">
Modified:
trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java
===================================================================
---
trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -68,8 +68,8 @@
private static Set javaScripts = new HashSet();
static {
- javaScripts.add("org.ajax4jsf.resource.PrototypeScript");
- javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt");
+ javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
javaScripts.add("script/SpinnerScript.js");
javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js");
javaScripts.add("org/richfaces/renderkit/html/scripts/events.js");
Modified: trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx
===================================================================
---
trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2007-07-11
00:20:34 UTC (rev 1594)
@@ -13,7 +13,7 @@
<h:styles>css/menucomponents.xcss</h:styles>
<h:scripts>
- new org.ajax4jsf.resource.PrototypeScript(),
+ new org.ajax4jsf.javascript.PrototypeScript(),
new org.ajax4jsf.javascript.AjaxScript()
</h:scripts>
Modified: trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx
===================================================================
--- trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2007-07-10
22:04:48 UTC (rev 1593)
+++ trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2007-07-11
00:20:34 UTC (rev 1594)
@@ -12,10 +12,10 @@
<h:styles>css/menucomponents.xcss</h:styles>
<h:scripts>
- new org.ajax4jsf.resource.PrototypeScript(),
+ new org.ajax4jsf.javascript.PrototypeScript(),
new org.ajax4jsf.javascript.AjaxScript(),
/org/richfaces/renderkit/html/scripts/utils.js,
- /org/ajax4jsf/renderkit/html/scripts/form.js,
+ /org/ajax4jsf/javascript/scripts/form.js,
/org/richfaces/renderkit/html/scripts/form.js
</h:scripts>
Modified:
trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuSeparatorComponentTest.java
===================================================================
---
trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuSeparatorComponentTest.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuSeparatorComponentTest.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -40,8 +40,8 @@
/* private static Set javaScripts = new HashSet();
static {
- javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript()");
- javaScripts.add("org.ajax4jsf.resource.PrototypeScript()");
+ javaScripts.add("org.ajax4jsf.javascript.AjaxScript()");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt()");
javaScripts.add("org.ajax4jsf.util.command.CommandScript()");
}
*/
Modified: trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
===================================================================
--- trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-07-10
22:04:48 UTC (rev 1593)
+++ trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-07-11
00:20:34 UTC (rev 1594)
@@ -16,7 +16,7 @@
/org/richfaces/renderkit/html/css/modalPanel.xcss
</h:styles>
<h:scripts>
- new org.ajax4jsf.resource.PrototypeScript(),
+ new org.ajax4jsf.javascript.PrototypeScript(),
/org/richfaces/renderkit/html/scripts/utils.js,
/org/richfaces/renderkit/html/scripts/modalPanel.js,
/org/richfaces/renderkit/html/scripts/modalPanelBorders.js,
Modified:
trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java
===================================================================
---
trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -55,8 +55,8 @@
};
static {
- javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript");
- javaScripts.add("org.ajax4jsf.resource.PrototypeScript");
+ javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt");
javaScripts.add("scripts/utils.js");
javaScripts.add("scripts/modalPanel.js");
javaScripts.add("scripts/modalPanelBorders.js");
Modified: trunk/ui/panelbar/src/main/java/org/richfaces/component/UIPanelBar.java
===================================================================
--- trunk/ui/panelbar/src/main/java/org/richfaces/component/UIPanelBar.java 2007-07-10
22:04:48 UTC (rev 1593)
+++ trunk/ui/panelbar/src/main/java/org/richfaces/component/UIPanelBar.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -25,7 +25,6 @@
import java.util.List;
import javax.faces.component.UIComponent;
-import javax.faces.component.UIComponentBase;
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
import javax.faces.event.AbortProcessingException;
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-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarItemRendererBase.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -21,7 +21,7 @@
package org.richfaces.renderkit.html;
-import org.ajax4jsf.framework.renderer.RendererBase;
+import org.ajax4jsf.renderkit.RendererBase;
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-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarRendererBase.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -30,11 +30,11 @@
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
-import org.ajax4jsf.framework.ajax.AjaxScript;
-import org.ajax4jsf.framework.ajax.ImageCacheScript;
-import org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase;
+import org.ajax4jsf.javascript.AjaxScript;
+import org.ajax4jsf.javascript.ImageCacheScript;
+import org.ajax4jsf.javascript.PrototypeScript;
+import org.ajax4jsf.renderkit.HeaderResourcesRendererBase;
import org.ajax4jsf.resource.InternetResource;
-import org.ajax4jsf.resource.PrototypeScript;
import org.richfaces.component.UIPanelBar;
import org.richfaces.component.UIPanelBarItem;
import org.richfaces.event.SwitchablePanelSwitchEvent;
Modified:
trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java
===================================================================
---
trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -26,18 +26,11 @@
import java.util.List;
import java.util.Set;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import javax.faces.component.UIComponent;
import javax.faces.component.UIForm;
import javax.faces.component.html.HtmlForm;
import javax.faces.event.FacesEvent;
import javax.faces.event.PhaseId;
-import org.ajax4jsf.framework.ajax.AjaxScript;
-import org.ajax4jsf.framework.ajax.ImageCacheScript;
-import org.ajax4jsf.resource.PrototypeScript;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
import org.ajax4jsf.tests.MockViewRoot;
import org.apache.commons.collections.Buffer;
Modified: trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx
===================================================================
--- trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2007-07-10
22:04:48 UTC (rev 1593)
+++ trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2007-07-11
00:20:34 UTC (rev 1594)
@@ -12,10 +12,10 @@
<f:clientid var="clientId"/>
<h:styles>css/simpleTogglePanel.xcss</h:styles>
<h:scripts>
-new org.ajax4jsf.resource.PrototypeScript(),
+new org.ajax4jsf.javascript.PrototypeScript(),
new org.ajax4jsf.javascript.AjaxScript(),
new org.ajax4jsf.javascript.ImageCacheScript(),
-/org/ajax4jsf/renderkit/html/scripts/form.js,
+/org/ajax4jsf/javascript/scripts/form.js,
/org/richfaces/renderkit/html/scripts/browser_info.js,
scripts/simpleTogglePanel.js
</h:scripts>
Modified:
trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java
===================================================================
---
trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -47,10 +47,10 @@
private static Set javaScripts = new HashSet();
static {
- javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript");
- javaScripts.add("org.ajax4jsf.resource.PrototypeScript");
- javaScripts.add("org.ajax4jsf.framework.ajax.ImageCacheScript");
- javaScripts.add("org/ajax4jsf/renderkit/html/scripts/form.js");
+ javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt");
+ javaScripts.add("org.ajax4jsf.javascript.ImageCacheScript");
+ javaScripts.add("org/ajax4jsf/javascript/scripts/form.js");
javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js");
javaScripts.add("scripts/simpleTogglePanel.js");
}
Modified:
trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java
===================================================================
---
trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -80,8 +80,8 @@
* Additional scripts.
*/
private final InternetResource[] additionalScripts = {
- new org.ajax4jsf.resource.PrototypeScript(),
- new org.ajax4jsf.resource.SmartPositionScript(),
+ new org.ajax4jsf.javascript.PrototypeScript(),
+ new org.ajax4jsf.javascript.SmartPositionScript(),
getResource("/org/richfaces/renderkit/html/scripts/browser_info.js"),
getResource("scripts/scriptaculo.js"),
getResource("scripts/suggestionbox.js")};
Modified:
trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java
===================================================================
---
trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -42,7 +42,7 @@
private static Set javaScripts = new HashSet();
static {
- javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript");
+ javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
javaScripts.add("prototype.js");
javaScripts.add("org.ajax4jsf.resource.SmartPositionScript");
javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js");
Modified: trunk/ui/tabPanel/src/main/templates/tabPanel.jspx
===================================================================
--- trunk/ui/tabPanel/src/main/templates/tabPanel.jspx 2007-07-10 22:04:48 UTC (rev 1593)
+++ trunk/ui/tabPanel/src/main/templates/tabPanel.jspx 2007-07-11 00:20:34 UTC (rev 1594)
@@ -12,11 +12,11 @@
<h:styles>css/tabPanel.xcss</h:styles>
<h:scripts>
- new org.ajax4jsf.resource.PrototypeScript(),
+ new org.ajax4jsf.javascript.PrototypeScript(),
new org.ajax4jsf.javascript.AjaxScript(),
new org.ajax4jsf.javascript.ImageCacheScript(),
/org/richfaces/renderkit/html/scripts/browser_info.js,
- /org/ajax4jsf/renderkit/html/scripts/form.js,
+ /org/ajax4jsf/javascript/scripts/form.js,
scripts/tabPanel.js
</h:scripts>
Modified:
trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java
===================================================================
---
trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -49,11 +49,11 @@
private static Set javaScripts = new HashSet();
static {
- javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript");
- javaScripts.add("org.ajax4jsf.resource.PrototypeScript");
- javaScripts.add("org.ajax4jsf.framework.ajax.ImageCacheScript");
+ javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScript");
+ javaScripts.add("org.ajax4jsf.javascript.ImageCacheScript");
javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js");
- javaScripts.add("org/ajax4jsf/renderkit/html/scripts/form.js");
+ javaScripts.add("org/ajax4jsf/javascript/scripts/form.js");
javaScripts.add("scripts/tabPanel.js");
}
Modified: trunk/ui/togglePanel/src/main/templates/toggleControl.jspx
===================================================================
--- trunk/ui/togglePanel/src/main/templates/toggleControl.jspx 2007-07-10 22:04:48 UTC
(rev 1593)
+++ trunk/ui/togglePanel/src/main/templates/toggleControl.jspx 2007-07-11 00:20:34 UTC
(rev 1594)
@@ -11,7 +11,7 @@
component="org.richfaces.component.UIToggleControl">
<h:styles>css/toggleControl.xcss</h:styles>
<h:scripts>
- new org.ajax4jsf.resource.PrototypeScript(),
+ new org.ajax4jsf.javascript.PrototypeScript(),
new org.ajax4jsf.javascript.AjaxScript(),
scripts/togglePanel.js
</h:scripts> <f:clientid var="clientId"/>
Modified:
trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java
===================================================================
---
trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2007-07-10
22:04:48 UTC (rev 1593)
+++
trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -50,8 +50,8 @@
private static Set javaScripts = new HashSet();
static {
- javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript");
- javaScripts.add("org.ajax4jsf.resource.PrototypeScript");
+ javaScripts.add("org.ajax4jsf.javascript.AjaxScript");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt");
javaScripts.add("scripts/togglePanel.js");
}
Modified: trunk/ui/tree/src/main/templates/htmlTree.jspx
===================================================================
--- trunk/ui/tree/src/main/templates/htmlTree.jspx 2007-07-10 22:04:48 UTC (rev 1593)
+++ trunk/ui/tree/src/main/templates/htmlTree.jspx 2007-07-11 00:20:34 UTC (rev 1594)
@@ -14,10 +14,10 @@
<h:styles>css/tree.xcss</h:styles>
<h:scripts>
- new org.ajax4jsf.resource.PrototypeScript(),
+ new org.ajax4jsf.javascript.PrototypeScript(),
/org/ajax4jsf/framework/ajax/scripts/AJAX.js,
/org/richfaces/renderkit/html/scripts/utils.js,
- /org/ajax4jsf/renderkit/html/scripts/form.js,
+ /org/ajax4jsf/javascript/scripts/form.js,
/org/richfaces/renderkit/html/scripts/form.js,
/org/richfaces/renderkit/html/scripts/events.js,
/org/richfaces/renderkit/html/scripts/tree.js,
Modified: trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java
===================================================================
--- trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-07-10
22:04:48 UTC (rev 1593)
+++ trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-07-11
00:20:34 UTC (rev 1594)
@@ -73,7 +73,7 @@
static {
javaScripts.add("/org/richfaces/renderkit/html/scripts/json/json.js");
- javaScripts.add("org.ajax4jsf.resource.PrototypeScript");
+ javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt");
javaScripts.add("scripts/AJAX.js");
javaScripts.add("org.ajax4jsf.dnd.DnDScript");
@@ -83,7 +83,7 @@
javaScripts.add("/org/richfaces/renderkit/html/scripts/dnd/dnd-dropzone.js");
- javaScripts.add("/org/ajax4jsf/renderkit/html/scripts/form.js");
+ javaScripts.add("/org/ajax4jsf/javascript/scripts/form.js");
javaScripts.add("/org/richfaces/renderkit/html/scripts/form.js");
javaScripts.add("/org/richfaces/renderkit/html/scripts/events.js");
javaScripts.add("/org/richfaces/renderkit/html/scripts/tree.js");