You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2006/02/24 16:19:48 UTC
svn commit: r380686 [3/5] - in /myfaces/shared/trunk: ./ src/main/java/
src/main/java/org/apache/myfaces/component/
src/main/java/org/apache/myfaces/config/
src/main/java/org/apache/myfaces/context/
src/main/java/org/apache/myfaces/el/ src/main/java/or...
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.2
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlSecretRendererBase.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlSecretRendererBase.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlSecretRendererBase.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java Fri Feb 24 07:19:28 2006
@@ -13,10 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.renderkit.html;
+package org.apache.myfaces.shared.renderkit.html;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
@@ -45,7 +48,7 @@
ResponseWriter writer = facesContext.getResponseWriter();
writer.startElement(HTML.INPUT_ELEM, uiComponent);
- writer.writeAttribute(HTML.TYPE_ATTR, HTML.INPUT_TYPE_PASSWORD, null);
+ writer.writeAttribute(HTML.TYPE_ATTR, org.apache.myfaces.shared.renderkit.html.HTML.INPUT_TYPE_PASSWORD, null);
String clientId = uiComponent.getClientId(facesContext);
@@ -59,7 +62,7 @@
}
else
{
- isRedisplay = RendererUtils.getBooleanAttribute(uiComponent, JSFAttr.REDISPLAY_ATTR, false);
+ isRedisplay = org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(uiComponent, JSFAttr.REDISPLAY_ATTR, false);
}
if (isRedisplay)
{
@@ -93,7 +96,7 @@
public void decode(FacesContext facesContext, UIComponent component)
{
- RendererUtils.checkParamValidity(facesContext, component, UIInput.class);
+ org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, component, UIInput.class);
HtmlRendererUtils.decodeUIInput(facesContext, component);
}
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.4
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlTableRendererBase.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlTableRendererBase.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlTableRendererBase.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java Fri Feb 24 07:19:28 2006
@@ -13,12 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.renderkit.html;
+package org.apache.myfaces.shared.renderkit.html;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.util.ArrayUtils;
-import org.apache.myfaces.util.StringUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -76,7 +77,7 @@
HtmlRendererUtils.writePrettyLineSeparator(facesContext);
writer.startElement(HTML.TABLE_ELEM, uiComponent);
HtmlRendererUtils.writeIdIfNecessary(writer, uiComponent, facesContext);
- HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent, HTML.TABLE_PASSTHROUGH_ATTRIBUTES);
+ HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent, org.apache.myfaces.shared.renderkit.html.HTML.TABLE_PASSTHROUGH_ATTRIBUTES);
}
/**
@@ -125,7 +126,7 @@
}
else
{
- rowClasses = (String) component.getAttributes().get(JSFAttr.ROW_CLASSES_ATTR);
+ rowClasses = (String) component.getAttributes().get(org.apache.myfaces.shared.renderkit.JSFAttr.ROW_CLASSES_ATTR);
columnClasses = (String) component.getAttributes().get(JSFAttr.COLUMN_CLASSES_ATTR);
}
Iterator rowStyleIterator = new StyleIterator(rowClasses);
@@ -230,7 +231,7 @@
renderRowStyle(facesContext, writer, uiData, rowStyleIterator);
- Object rowId = uiData.getAttributes().get(JSFAttr.ROW_ID);
+ Object rowId = uiData.getAttributes().get(org.apache.myfaces.shared.renderkit.JSFAttr.ROW_ID);
if (rowId != null)
{
@@ -691,7 +692,7 @@
}
else
{
- return (String) component.getAttributes().get(JSFAttr.HEADER_CLASS_ATTR);
+ return (String) component.getAttributes().get(org.apache.myfaces.shared.renderkit.JSFAttr.HEADER_CLASS_ATTR);
}
}
@@ -708,7 +709,7 @@
}
else
{
- return (String) component.getAttributes().get(JSFAttr.FOOTER_CLASS_ATTR);
+ return (String) component.getAttributes().get(org.apache.myfaces.shared.renderkit.JSFAttr.FOOTER_CLASS_ATTR);
}
}
@@ -727,7 +728,7 @@
// ---------------------------------------------------------------------------
StyleIterator(String styles)
{
- _style = (styles == null) ? ArrayUtils.EMPTY_STRING_ARRAY : StringUtils.trim(StringUtils
+ _style = (styles == null) ? org.apache.myfaces.shared.util.ArrayUtils.EMPTY_STRING_ARRAY : org.apache.myfaces.shared.util.StringUtils.trim(org.apache.myfaces.shared.util.StringUtils
.splitShortString(styles, ','));
}
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.9
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextRendererBase.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextRendererBase.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextRendererBase.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java Fri Feb 24 07:19:28 2006
@@ -13,11 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.renderkit.html;
+package org.apache.myfaces.shared.renderkit.html;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.component.EscapeCapable;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.component.EscapeCapable;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
@@ -43,7 +46,7 @@
public void encodeEnd(FacesContext facesContext, UIComponent component)
throws IOException
{
- RendererUtils.checkParamValidity(facesContext,component,null);
+ org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext,component,null);
if (component instanceof UIInput)
{
@@ -63,7 +66,7 @@
protected static void renderOutput(FacesContext facesContext, UIComponent component)
throws IOException
{
- String text = RendererUtils.getStringValue(facesContext, component);
+ String text = org.apache.myfaces.shared.renderkit.RendererUtils.getStringValue(facesContext, component);
boolean escape;
if (component instanceof HtmlOutputText || component instanceof EscapeCapable)
{
@@ -71,7 +74,7 @@
}
else
{
- escape = RendererUtils.getBooleanAttribute(component, JSFAttr.ESCAPE_ATTR,
+ escape = RendererUtils.getBooleanAttribute(component, org.apache.myfaces.shared.renderkit.JSFAttr.ESCAPE_ATTR,
true); //default is to escape
}
renderOutputText(facesContext, component, text, escape);
@@ -108,7 +111,7 @@
if (escape)
{
- writer.writeText(text, JSFAttr.VALUE_ATTR);
+ writer.writeText(text, org.apache.myfaces.shared.renderkit.JSFAttr.VALUE_ATTR);
}
else
{
@@ -117,7 +120,7 @@
if(span)
{
- writer.endElement(HTML.SPAN_ELEM);
+ writer.endElement(org.apache.myfaces.shared.renderkit.html.HTML.SPAN_ELEM);
}
}
}
@@ -129,7 +132,7 @@
ResponseWriter writer = facesContext.getResponseWriter();
String clientId = component.getClientId(facesContext);
- String value = RendererUtils.getStringValue(facesContext, component);
+ String value = org.apache.myfaces.shared.renderkit.RendererUtils.getStringValue(facesContext, component);
writer.startElement(HTML.INPUT_ELEM, component);
writer.writeAttribute(HTML.ID_ATTR, clientId, null);
@@ -158,7 +161,7 @@
}
else
{
- return RendererUtils.getBooleanAttribute(component, HTML.DISABLED_ATTR, false);
+ return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component, HTML.DISABLED_ATTR, false);
}
}
@@ -184,7 +187,7 @@
public Object getConvertedValue(FacesContext facesContext, UIComponent component, Object submittedValue) throws ConverterException
{
- RendererUtils.checkParamValidity(facesContext, component, UIOutput.class);
+ org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, component, UIOutput.class);
return RendererUtils.getConvertedUIOutputValue(facesContext,
(UIOutput)component,
submittedValue);
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.9
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextareaRendererBase.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextareaRendererBase.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextareaRendererBase.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java Fri Feb 24 07:19:28 2006
@@ -13,10 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.renderkit.html;
+package org.apache.myfaces.shared.renderkit.html;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
@@ -56,11 +58,11 @@
HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent, HTML.TEXTAREA_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED);
if (isDisabled(facesContext, uiComponent))
{
- writer.writeAttribute(HTML.DISABLED_ATTR, Boolean.TRUE, null);
+ writer.writeAttribute(org.apache.myfaces.shared.renderkit.html.HTML.DISABLED_ATTR, Boolean.TRUE, null);
}
- String strValue = RendererUtils.getStringValue(facesContext, uiComponent);
- writer.writeText(strValue, JSFAttr.VALUE_ATTR);
+ String strValue = org.apache.myfaces.shared.renderkit.RendererUtils.getStringValue(facesContext, uiComponent);
+ writer.writeText(strValue, org.apache.myfaces.shared.renderkit.JSFAttr.VALUE_ATTR);
writer.endElement(HTML.TEXTAREA_ELEM);
}
@@ -74,7 +76,7 @@
}
else
{
- return RendererUtils.getBooleanAttribute(uiComponent, HTML.DISABLED_ATTR, false);
+ return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(uiComponent, HTML.DISABLED_ATTR, false);
}
}
@@ -87,7 +89,7 @@
public Object getConvertedValue(FacesContext facesContext, UIComponent uiComponent, Object submittedValue) throws ConverterException
{
RendererUtils.checkParamValidity(facesContext, uiComponent, UIOutput.class);
- return RendererUtils.getConvertedUIOutputValue(facesContext,
+ return org.apache.myfaces.shared.renderkit.RendererUtils.getConvertedUIOutputValue(facesContext,
(UIOutput)uiComponent,
submittedValue);
}
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.4
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/AddResource.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/AddResource.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/AddResource.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/AddResource.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/AddResource.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/AddResource.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/AddResource.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.renderkit.html.util;
+package org.apache.myfaces.shared.renderkit.html.util;
import javax.faces.context.FacesContext;
import javax.servlet.ServletContext;
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/AddResource.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.23
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/AddResource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/AddResource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/AddResourceFactory.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/AddResourceFactory.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/AddResourceFactory.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/AddResourceFactory.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/AddResourceFactory.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/AddResourceFactory.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/AddResourceFactory.java Fri Feb 24 07:19:28 2006
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package org.apache.myfaces.renderkit.html.util;
+package org.apache.myfaces.shared.renderkit.html.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.config.MyfacesConfig;
-import org.apache.myfaces.util.ClassUtils;
+import org.apache.myfaces.shared.config.MyfacesConfig;
+import org.apache.myfaces.shared.util.ClassUtils;
+import javax.faces.context.FacesContext;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
-import javax.faces.context.FacesContext;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/AutoScrollPhaseListener.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/AutoScrollPhaseListener.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/AutoScrollPhaseListener.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/AutoScrollPhaseListener.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/AutoScrollPhaseListener.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/AutoScrollPhaseListener.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/AutoScrollPhaseListener.java Fri Feb 24 07:19:28 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.myfaces.renderkit.html.util;
+package org.apache.myfaces.shared.renderkit.html.util;
/**
* @author Manfred Geiler (latest modification by $Author$)
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/AutoScrollPhaseListener.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.2
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/AutoScrollPhaseListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/AutoScrollPhaseListener.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/AutoScrollPhaseListener.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/CallbackListener.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/CallbackListener.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/CallbackListener.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/CallbackListener.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/CallbackListener.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/CallbackListener.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/CallbackListener.java Fri Feb 24 07:19:28 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.myfaces.renderkit.html.util;
+package org.apache.myfaces.shared.renderkit.html.util;
/**
* @author Martin Marinschek
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/CallbackListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/CallbackListener.java
------------------------------------------------------------------------------
svn:keywords = URL Author Revision Date
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/DefaultAddResource.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DefaultAddResource.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/DefaultAddResource.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/DefaultAddResource.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DefaultAddResource.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DefaultAddResource.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/DefaultAddResource.java Fri Feb 24 07:19:28 2006
@@ -13,16 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.renderkit.html.util;
+package org.apache.myfaces.shared.renderkit.html.util;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.renderkit.html.HtmlResponseWriterImpl;
-import org.apache.myfaces.util.ClassUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlResponseWriterImpl;
+import org.apache.myfaces.shared.util.ClassUtils;
import javax.faces.FacesException;
import javax.faces.context.FacesContext;
@@ -136,10 +135,10 @@
{
ResponseWriter writer = context.getResponseWriter();
- writer.startElement(HTML.SCRIPT_ELEM, null);
- writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR, HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT, null);
+ writer.startElement(org.apache.myfaces.shared.renderkit.html.HTML.SCRIPT_ELEM, null);
+ writer.writeAttribute(org.apache.myfaces.shared.renderkit.html.HTML.SCRIPT_TYPE_ATTR, org.apache.myfaces.shared.renderkit.html.HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT, null);
String src = context.getExternalContext().encodeResourceURL(getResourceUri(context, uri));
- writer.writeURIAttribute(HTML.SRC_ATTR, src, null);
+ writer.writeURIAttribute(org.apache.myfaces.shared.renderkit.html.HTML.SRC_ATTR, src, null);
writer.endElement(HTML.SCRIPT_ELEM);
}
@@ -701,9 +700,9 @@
}
}
- ResponseWriter writer = new HtmlResponseWriterImpl(response.getWriter(), HtmlRendererUtils
+ ResponseWriter writer = new org.apache.myfaces.shared.renderkit.html.HtmlResponseWriterImpl(response.getWriter(), org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils
.selectContentType(request.getHeader("accept")),
- response.getCharacterEncoding());
+ response.getCharacterEncoding());
if (afterBodyContentInsertPosition >= 0)
{
@@ -788,7 +787,7 @@
public void writeResponse(HttpServletRequest request,
HttpServletResponse response) throws IOException
{
- ResponseWriter writer = new HtmlResponseWriterImpl(response.getWriter(), HtmlRendererUtils
+ ResponseWriter writer = new HtmlResponseWriterImpl(response.getWriter(), org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils
.selectContentType(request.getHeader("accept")),
response.getCharacterEncoding());
writer.write(originalResponse.toString());
@@ -910,10 +909,10 @@
throws IOException
{
writer.startElement(HTML.LINK_ELEM, null);
- writer.writeAttribute(HTML.REL_ATTR, HTML.STYLESHEET_VALUE, null);
+ writer.writeAttribute(org.apache.myfaces.shared.renderkit.html.HTML.REL_ATTR, org.apache.myfaces.shared.renderkit.html.HTML.STYLESHEET_VALUE, null);
writer.writeAttribute(HTML.HREF_ATTR, response.encodeURL(this.getResourceUri()), null);
writer.writeAttribute(HTML.TYPE_ATTR, HTML.STYLE_TYPE_TEXT_CSS, null);
- writer.endElement(HTML.LINK_ELEM);
+ writer.endElement(org.apache.myfaces.shared.renderkit.html.HTML.LINK_ELEM);
}
}
@@ -955,9 +954,9 @@
if (_defer)
{
- writer.writeAttribute(HTML.SCRIPT_ELEM_DEFER_ATTR, "true", null);
+ writer.writeAttribute(org.apache.myfaces.shared.renderkit.html.HTML.SCRIPT_ELEM_DEFER_ATTR, "true", null);
}
- writer.endElement(HTML.SCRIPT_ELEM);
+ writer.endElement(org.apache.myfaces.shared.renderkit.html.HTML.SCRIPT_ELEM);
}
}
@@ -1010,7 +1009,7 @@
throws IOException
{
writer.startElement(HTML.SCRIPT_ELEM, null);
- writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR, HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT, null);
+ writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR, org.apache.myfaces.shared.renderkit.html.HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT, null);
writer.writeText(getInlineValue(), null);
writer.endElement(HTML.SCRIPT_ELEM);
}
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/DummyFormRequestInfo.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DummyFormRequestInfo.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/DummyFormRequestInfo.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/DummyFormRequestInfo.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DummyFormRequestInfo.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DummyFormRequestInfo.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/DummyFormRequestInfo.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.renderkit.html.util;
+package org.apache.myfaces.shared.renderkit.html.util;
import java.util.HashSet;
import java.util.Set;
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/DummyFormRequestInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/DummyFormRequestInfo.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/DummyFormUtils.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DummyFormUtils.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/DummyFormUtils.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/DummyFormUtils.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DummyFormUtils.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DummyFormUtils.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/DummyFormUtils.java Fri Feb 24 07:19:28 2006
@@ -13,14 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.renderkit.html.util;
+package org.apache.myfaces.shared.renderkit.html.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.config.MyfacesConfig;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.util.DummyFormRequestInfo;
import javax.faces.application.StateManager;
import javax.faces.application.ViewHandler;
@@ -134,18 +132,18 @@
String actionURL = viewHandler.getActionURL(facesContext, viewId);
//write out dummy form
- writer.startElement(HTML.FORM_ELEM, null);
- writer.writeAttribute(HTML.ID_ATTR, DUMMY_FORM_ID, null);
+ writer.startElement(org.apache.myfaces.shared.renderkit.html.HTML.FORM_ELEM, null);
+ writer.writeAttribute(org.apache.myfaces.shared.renderkit.html.HTML.ID_ATTR, DUMMY_FORM_ID, null);
writer.writeAttribute(HTML.NAME_ATTR, DUMMY_FORM_NAME, null);
writer.writeAttribute(HTML.STYLE_ATTR, "display:inline", null);
writer.writeAttribute(HTML.METHOD_ATTR, "post", null);
- writer.writeURIAttribute(HTML.ACTION_ATTR,
+ writer.writeURIAttribute(org.apache.myfaces.shared.renderkit.html.HTML.ACTION_ATTR,
facesContext.getExternalContext().encodeActionURL(actionURL),
null);
writer.flush();
StateManager stateManager = facesContext.getApplication().getStateManager();
- HtmlRendererUtils.writePrettyLineSeparator(facesContext);
+ org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils.writePrettyLineSeparator(facesContext);
if (stateManager.isSavingStateInClient(facesContext))
{
//render state parameters
@@ -156,26 +154,26 @@
else
{
writer.startElement(HTML.INPUT_ELEM, null);
- writer.writeAttribute(HTML.TYPE_ATTR, HTML.INPUT_TYPE_HIDDEN, null);
- writer.writeAttribute(HTML.NAME_ATTR, RendererUtils.SEQUENCE_PARAM, null);
- writer.writeAttribute(HTML.VALUE_ATTR, RendererUtils.getViewSequence(facesContext), null);
- writer.endElement(HTML.INPUT_ELEM);
+ writer.writeAttribute(org.apache.myfaces.shared.renderkit.html.HTML.TYPE_ATTR, org.apache.myfaces.shared.renderkit.html.HTML.INPUT_TYPE_HIDDEN, null);
+ writer.writeAttribute(HTML.NAME_ATTR, org.apache.myfaces.shared.renderkit.RendererUtils.SEQUENCE_PARAM, null);
+ writer.writeAttribute(org.apache.myfaces.shared.renderkit.html.HTML.VALUE_ATTR, org.apache.myfaces.shared.renderkit.RendererUtils.getViewSequence(facesContext), null);
+ writer.endElement(org.apache.myfaces.shared.renderkit.html.HTML.INPUT_ELEM);
}
- if (MyfacesConfig.getCurrentInstance(facesContext.getExternalContext()).isAutoScroll())
+ if (org.apache.myfaces.shared.config.MyfacesConfig.getCurrentInstance(facesContext.getExternalContext()).isAutoScroll())
{
JavascriptUtils.renderAutoScrollHiddenInput(facesContext,writer);
}
- HtmlRendererUtils.writePrettyLineSeparator(facesContext);
+ org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils.writePrettyLineSeparator(facesContext);
if (dummyFormParams != null)
{
- HtmlRendererUtils.renderHiddenCommandFormParams(writer, dummyFormParams);
- HtmlRendererUtils.renderClearHiddenCommandFormParamsFunction(writer,
+ org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils.renderHiddenCommandFormParams(writer, dummyFormParams);
+ org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils.renderClearHiddenCommandFormParamsFunction(writer,
DUMMY_FORM_NAME,
dummyFormParams, null);
}
- HtmlRendererUtils.writePrettyLineSeparator(facesContext);
+ org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils.writePrettyLineSeparator(facesContext);
writer.endElement(HTML.FORM_ELEM);
}
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/DummyFormUtils.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.8
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/DummyFormUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/DummyFormUtils.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/DummyFormUtils.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/HTMLEncoder.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/HTMLEncoder.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/HTMLEncoder.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.renderkit.html.util;
+package org.apache.myfaces.shared.renderkit.html.util;
/**
* Converts Strings so that they can be used within HTML-Code.
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.2
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HtmlBufferResponseWriterWrapper.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/HtmlBufferResponseWriterWrapper.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HtmlBufferResponseWriterWrapper.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HtmlBufferResponseWriterWrapper.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/HtmlBufferResponseWriterWrapper.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/HtmlBufferResponseWriterWrapper.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HtmlBufferResponseWriterWrapper.java Fri Feb 24 07:19:28 2006
@@ -13,9 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.renderkit.html.util;
-
-import org.apache.myfaces.renderkit.html.HtmlResponseWriterImpl;
+package org.apache.myfaces.shared.renderkit.html.util;
import javax.faces.context.ResponseWriter;
import java.io.ByteArrayOutputStream;
@@ -27,7 +25,7 @@
* @author Sylvain Vieujot (latest modification by $Author: grantsmith $)
* @version $Revision: 169649 $ $Date: 2005-05-11 17:47:12 +0200 (Wed, 11 May 2005) $
*/
-public class HtmlBufferResponseWriterWrapper extends HtmlResponseWriterImpl {
+public class HtmlBufferResponseWriterWrapper extends org.apache.myfaces.shared.renderkit.html.HtmlResponseWriterImpl {
private ByteArrayOutputStream stream;
private PrintWriter writer;
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java Fri Feb 24 07:19:28 2006
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.renderkit.html.util;
+package org.apache.myfaces.shared.renderkit.html.util;
-import org.apache.myfaces.config.MyfacesConfig;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.config.MyfacesConfig;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -281,12 +281,12 @@
*/
public static void renderAutoScrollHiddenInput(FacesContext facesContext, ResponseWriter writer) throws IOException
{
- HtmlRendererUtils.writePrettyLineSeparator(facesContext);
- writer.startElement(HTML.INPUT_ELEM, null);
- writer.writeAttribute(HTML.TYPE_ATTR, "hidden", null);
- writer.writeAttribute(HTML.NAME_ATTR, AUTO_SCROLL_PARAM, null);
- writer.endElement(HTML.INPUT_ELEM);
- HtmlRendererUtils.writePrettyLineSeparator(facesContext);
+ org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils.writePrettyLineSeparator(facesContext);
+ writer.startElement(org.apache.myfaces.shared.renderkit.html.HTML.INPUT_ELEM, null);
+ writer.writeAttribute(org.apache.myfaces.shared.renderkit.html.HTML.TYPE_ATTR, "hidden", null);
+ writer.writeAttribute(org.apache.myfaces.shared.renderkit.html.HTML.NAME_ATTR, AUTO_SCROLL_PARAM, null);
+ writer.endElement(org.apache.myfaces.shared.renderkit.html.HTML.INPUT_ELEM);
+ org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils.writePrettyLineSeparator(facesContext);
}
/**
@@ -297,7 +297,7 @@
{
HtmlRendererUtils.writePrettyLineSeparator(facesContext);
writer.startElement(HTML.SCRIPT_ELEM,null);
- writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR,HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT,null);
+ writer.writeAttribute(org.apache.myfaces.shared.renderkit.html.HTML.SCRIPT_TYPE_ATTR,org.apache.myfaces.shared.renderkit.html.HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT,null);
StringBuffer script = new StringBuffer();
@@ -345,7 +345,7 @@
writer.writeText(script.toString(),null);
- writer.endElement(HTML.SCRIPT_ELEM);
+ writer.endElement(org.apache.myfaces.shared.renderkit.html.HTML.SCRIPT_ELEM);
HtmlRendererUtils.writePrettyLineSeparator(facesContext);
}
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.12
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/MyFacesResourceHandler.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/MyFacesResourceHandler.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/MyFacesResourceHandler.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/MyFacesResourceHandler.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/MyFacesResourceHandler.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/MyFacesResourceHandler.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/MyFacesResourceHandler.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.renderkit.html.util;
+package org.apache.myfaces.shared.renderkit.html.util;
import javax.faces.context.FacesContext;
@@ -53,7 +53,7 @@
* class in the getResourceUri method and use that info to locate
* the resource data represented by this object.
*
- * @see org.apache.myfaces.renderkit.html.util.ResourceHandler#getResourceLoaderClass()
+ * @see org.apache.myfaces.shared.renderkit.html.util.ResourceHandler#getResourceLoaderClass()
*/
public Class getResourceLoaderClass()
{
@@ -89,7 +89,7 @@
* where partial.class.name is the name of the base class specified in the
* constructor, and resourceName is the resource specified in the constructor.
*
- * @see org.apache.myfaces.renderkit.html.util.ResourceHandler#getResourceUri(javax.faces.context.FacesContext)
+ * @see org.apache.myfaces.shared.renderkit.html.util.ResourceHandler#getResourceUri(javax.faces.context.FacesContext)
*/
public String getResourceUri(FacesContext context)
{
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/MyFacesResourceHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/MyFacesResourceHandler.java
------------------------------------------------------------------------------
svn:keywords = URL Author Revision Date
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/MyFacesResourceLoader.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/MyFacesResourceLoader.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/MyFacesResourceLoader.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/MyFacesResourceLoader.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/MyFacesResourceLoader.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/MyFacesResourceLoader.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/MyFacesResourceLoader.java Fri Feb 24 07:19:28 2006
@@ -14,12 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.renderkit.html.util;
+package org.apache.myfaces.shared.renderkit.html.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import javax.servlet.ServletContext;
import javax.servlet.ServletOutputStream;
@@ -97,7 +96,7 @@
* which define the mime content-type; this is deduced from the
* filename suffix of the resource.
* <p>
- * @see org.apache.myfaces.renderkit.html.util.ResourceLoader#serveResource(javax.servlet.ServletContext,
+ * @see org.apache.myfaces.shared.renderkit.html.util.ResourceLoader#serveResource(javax.servlet.ServletContext,
* javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, java.lang.String)
*/
public void serveResource(ServletContext context, HttpServletRequest request,
@@ -201,9 +200,9 @@
String resource)
{
if (resource.endsWith(".js"))
- response.setContentType(HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT);
+ response.setContentType(org.apache.myfaces.shared.renderkit.html.HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT);
else if (resource.endsWith(".css"))
- response.setContentType(HTML.STYLE_TYPE_TEXT_CSS);
+ response.setContentType(org.apache.myfaces.shared.renderkit.html.HTML.STYLE_TYPE_TEXT_CSS);
else if (resource.endsWith(".gif"))
response.setContentType("image/gif");
else if (resource.endsWith(".png"))
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ReducedHTMLParser.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/ReducedHTMLParser.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ReducedHTMLParser.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ReducedHTMLParser.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/ReducedHTMLParser.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/ReducedHTMLParser.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ReducedHTMLParser.java Fri Feb 24 07:19:28 2006
@@ -13,10 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.renderkit.html.util;
+package org.apache.myfaces.shared.renderkit.html.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.shared.renderkit.html.util.CallbackListener;
/**
* A class which detects the open/close tags in an HTML document and reports
@@ -466,7 +467,7 @@
if (currentTagName == null)
{
log.warn("Invalid HTML; bare lessthan sign found at line "
- + getCurrentLineNumber());
+ + getCurrentLineNumber());
// remain in STATE_READY; this isn't really the start of
// an xml element.
}
@@ -556,7 +557,7 @@
// for "/>", though that does risk us misinterpreting the
// contents of an attribute's associated string value.
log.warn("Invalid tag found: unexpected input while looking for attr name or '/>'"
- + " at line " + getCurrentLineNumber());
+ + " at line " + getCurrentLineNumber());
state = STATE_EXPECTING_ETAGO;
// and consume one character
++_offset;
@@ -643,7 +644,7 @@
if (!consumeMatch(">"))
{
log.error("Malformed end tag at line " + getCurrentLineNumber()
- + "; skipping parsing");
+ + "; skipping parsing");
return false;
}
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ReducedHTMLParser.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ReducedHTMLParser.java
------------------------------------------------------------------------------
svn:keywords = URL Author Revision Date
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ResourceHandler.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/ResourceHandler.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ResourceHandler.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ResourceHandler.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/ResourceHandler.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/ResourceHandler.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ResourceHandler.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.renderkit.html.util;
+package org.apache.myfaces.shared.renderkit.html.util;
import javax.faces.context.FacesContext;
import javax.servlet.http.HttpServletRequest;
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ResourceHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ResourceHandler.java
------------------------------------------------------------------------------
svn:keywords = URL Author Revision Date
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ResourceLoader.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/ResourceLoader.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ResourceLoader.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ResourceLoader.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/ResourceLoader.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/ResourceLoader.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ResourceLoader.java Fri Feb 24 07:19:28 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.renderkit.html.util;
+package org.apache.myfaces.shared.renderkit.html.util;
import java.io.IOException;
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ResourceLoader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ResourceLoader.java
------------------------------------------------------------------------------
svn:keywords = URL Author Revision Date
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ResourcePosition.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/ResourcePosition.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ResourcePosition.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ResourcePosition.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/ResourcePosition.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/ResourcePosition.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ResourcePosition.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.renderkit.html.util;
+package org.apache.myfaces.shared.renderkit.html.util;
public class ResourcePosition
{
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/UnicodeEncoder.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/UnicodeEncoder.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/UnicodeEncoder.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/UnicodeEncoder.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/UnicodeEncoder.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/UnicodeEncoder.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/UnicodeEncoder.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.renderkit.html.util;
+package org.apache.myfaces.shared.renderkit.html.util;
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/UnicodeEncoder.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.1
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/UnicodeEncoder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/util/UnicodeEncoder.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentBodyTagBase.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/taglib/UIComponentBodyTagBase.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentBodyTagBase.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentBodyTagBase.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/taglib/UIComponentBodyTagBase.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/taglib/UIComponentBodyTagBase.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentBodyTagBase.java Fri Feb 24 07:19:28 2006
@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.taglib;
+package org.apache.myfaces.shared.taglib;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -48,7 +47,7 @@
{
log.warn("Component with id '" + component.getClientId(getFacesContext()) +
"' (" + getClass().getName() +
- " tag) and path : "+RendererUtils.getPathToComponent(component)+"renders it's children, but has embedded JSP or HTML code. Use the <f:verbatim> tag for nested HTML. For comments use <%/* */%> style JSP comments instead of <!-- --> style HTML comments." +
+ " tag) and path : "+org.apache.myfaces.shared.renderkit.RendererUtils.getPathToComponent(component)+"renders it's children, but has embedded JSP or HTML code. Use the <f:verbatim> tag for nested HTML. For comments use <%/* */%> style JSP comments instead of <!-- --> style HTML comments." +
"\n BodyContent:\n" + getBodyContent().getString().trim());
}
}
@@ -101,7 +100,7 @@
super.setProperties(component);
setBooleanProperty(component, JSFAttr.FORCE_ID_ATTR, _forceId);
- setBooleanProperty(component, JSFAttr.FORCE_ID_INDEX_ATTR, _forceIdIndex);
+ setBooleanProperty(component, org.apache.myfaces.shared.renderkit.JSFAttr.FORCE_ID_INDEX_ATTR, _forceIdIndex);
//rendererType already handled by UIComponentTag
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentBodyTagBase.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.15
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentBodyTagBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentBodyTagBase.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentBodyTagBase.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagBase.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/taglib/UIComponentTagBase.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagBase.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagBase.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/taglib/UIComponentTagBase.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/taglib/UIComponentTagBase.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagBase.java Fri Feb 24 07:19:28 2006
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.taglib;
+package org.apache.myfaces.shared.taglib;
-import org.apache.myfaces.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
import javax.faces.component.UIComponent;
import javax.faces.webapp.UIComponentTag;
@@ -56,10 +56,10 @@
{
super.setProperties(component);
- setBooleanProperty(component, JSFAttr.FORCE_ID_ATTR, _forceId);
- setBooleanProperty(component, JSFAttr.FORCE_ID_INDEX_ATTR, _forceIdIndex);
+ setBooleanProperty(component, org.apache.myfaces.shared.renderkit.JSFAttr.FORCE_ID_ATTR, _forceId);
+ setBooleanProperty(component, org.apache.myfaces.shared.renderkit.JSFAttr.FORCE_ID_INDEX_ATTR, _forceIdIndex);
if (_javascriptLocation != null) setStringProperty(component, JSFAttr.JAVASCRIPT_LOCATION, _javascriptLocation);
- if (_imageLocation != null) setStringProperty(component, JSFAttr.IMAGE_LOCATION, _imageLocation);
+ if (_imageLocation != null) setStringProperty(component, org.apache.myfaces.shared.renderkit.JSFAttr.IMAGE_LOCATION, _imageLocation);
if (_styleLocation != null) setStringProperty(component, JSFAttr.STYLE_LOCATION, _styleLocation);
//rendererType already handled by UIComponentTag
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagBase.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.13
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagBase.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagBase.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagUtils.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/taglib/UIComponentTagUtils.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagUtils.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagUtils.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/taglib/UIComponentTagUtils.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/taglib/UIComponentTagUtils.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagUtils.java Fri Feb 24 07:19:28 2006
@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.taglib;
+package org.apache.myfaces.shared.taglib;
-import org.apache.myfaces.el.SimpleActionMethodBinding;
-import org.apache.myfaces.renderkit.JSFAttr;
+import org.apache.myfaces.shared.el.SimpleActionMethodBinding;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -144,7 +143,7 @@
if (isValueReference(value))
{
ValueBinding vb = context.getApplication().createValueBinding(value);
- component.setValueBinding(JSFAttr.VALUE_ATTR, vb);
+ component.setValueBinding(org.apache.myfaces.shared.renderkit.JSFAttr.VALUE_ATTR, vb);
}
else if (component instanceof UICommand)
{
@@ -187,7 +186,7 @@
if (isValueReference(value))
{
ValueBinding vb = context.getApplication().createValueBinding(value);
- component.setValueBinding(JSFAttr.CONVERTER_ATTR, vb);
+ component.setValueBinding(org.apache.myfaces.shared.renderkit.JSFAttr.CONVERTER_ATTR, vb);
}
else
{
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagUtils.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.7
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagUtils.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagUtils.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/core/SelectItemTagBase.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/taglib/core/SelectItemTagBase.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/core/SelectItemTagBase.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/core/SelectItemTagBase.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/taglib/core/SelectItemTagBase.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/taglib/core/SelectItemTagBase.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/core/SelectItemTagBase.java Fri Feb 24 07:19:28 2006
@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.taglib.core;
+package org.apache.myfaces.shared.taglib.core;
-import org.apache.myfaces.taglib.UIComponentTagBase;
-import org.apache.myfaces.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
import javax.faces.component.UIComponent;
@@ -25,7 +24,7 @@
* @version $Revision$ $Date$
*/
public class SelectItemTagBase
- extends UIComponentTagBase
+ extends org.apache.myfaces.shared.taglib.UIComponentTagBase
{
//private static final Log log = LogFactory.getLog(SelectItemTag.class);
@@ -51,7 +50,7 @@
setBooleanProperty(component, JSFAttr.ITEM_DISABLED_ATTR, _itemDisabled);
setStringProperty(component, JSFAttr.ITEM_DESCRIPTION_ATTR, _itemDescription);
- setStringProperty(component, JSFAttr.ITEM_LABEL_ATTR, _itemLabel);
+ setStringProperty(component, org.apache.myfaces.shared.renderkit.JSFAttr.ITEM_LABEL_ATTR, _itemLabel);
setStringProperty(component, JSFAttr.ITEM_VALUE_ATTR, _itemValue);
if (_itemValue == null &&
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/core/SelectItemTagBase.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.3
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/core/SelectItemTagBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/core/SelectItemTagBase.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/core/SelectItemTagBase.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandButtonTagBase.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/taglib/html/HtmlCommandButtonTagBase.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandButtonTagBase.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandButtonTagBase.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/taglib/html/HtmlCommandButtonTagBase.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/taglib/html/HtmlCommandButtonTagBase.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandButtonTagBase.java Fri Feb 24 07:19:28 2006
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.taglib.html;
+package org.apache.myfaces.shared.taglib.html;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.HTML;
import javax.faces.component.UIComponent;
@@ -83,14 +83,14 @@
setStringProperty(component, HTML.ACCESSKEY_ATTR, _accesskey);
setStringProperty(component, HTML.ALT_ATTR, _alt);
- setBooleanProperty(component, HTML.DISABLED_ATTR, _disabled);
+ setBooleanProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.DISABLED_ATTR, _disabled);
setStringProperty(component, HTML.ONBLUR_ATTR, _onblur);
- setStringProperty(component, HTML.ONCHANGE_ATTR, _onchange);
- setStringProperty(component, HTML.ONFOCUS_ATTR, _onfocus);
- setStringProperty(component, HTML.ONSELECT_ATTR, _onselect);
- setStringProperty(component, HTML.SIZE_ATTR, _size);
+ setStringProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.ONCHANGE_ATTR, _onchange);
+ setStringProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.ONFOCUS_ATTR, _onfocus);
+ setStringProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.ONSELECT_ATTR, _onselect);
+ setStringProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.SIZE_ATTR, _size);
setStringProperty(component, HTML.TABINDEX_ATTR, _tabindex);
- setStringProperty(component, HTML.TYPE_ATTR, _type);
+ setStringProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.TYPE_ATTR, _type);
setActionProperty(component, _action);
setActionListenerProperty(component, _actionListener);
setBooleanProperty(component, JSFAttr.IMMEDIATE_ATTR, _immediate);
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandButtonTagBase.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.4
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandButtonTagBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandButtonTagBase.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandButtonTagBase.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandLinkTagBase.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/taglib/html/HtmlCommandLinkTagBase.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandLinkTagBase.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandLinkTagBase.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/taglib/html/HtmlCommandLinkTagBase.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/taglib/html/HtmlCommandLinkTagBase.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandLinkTagBase.java Fri Feb 24 07:19:28 2006
@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.taglib.html;
+package org.apache.myfaces.shared.taglib.html;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HTML;
import javax.faces.component.UIComponent;
@@ -83,21 +82,21 @@
{
super.setProperties(component);
- setStringProperty(component, HTML.ACCESSKEY_ATTR, _accesskey);
- setStringProperty(component, HTML.CHARSET_ATTR, _charset);
+ setStringProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.ACCESSKEY_ATTR, _accesskey);
+ setStringProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.CHARSET_ATTR, _charset);
setStringProperty(component, HTML.COORDS_ATTR, _coords);
setStringProperty(component, HTML.HREFLANG_ATTR, _hreflang);
- setStringProperty(component, HTML.REL_ATTR, _rel);
- setStringProperty(component, HTML.REV_ATTR, _rev);
+ setStringProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.REL_ATTR, _rel);
+ setStringProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.REV_ATTR, _rev);
setStringProperty(component, HTML.SHAPE_ATTR, _shape);
setStringProperty(component, HTML.TABINDEX_ATTR, _tabindex);
setStringProperty(component, HTML.TYPE_ATTR, _type);
- setStringProperty(component, HTML.ONBLUR_ATTR, _onblur);
+ setStringProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.ONBLUR_ATTR, _onblur);
setStringProperty(component, HTML.ONFOCUS_ATTR, _onfocus);
setStringProperty(component, HTML.TARGET_ATTR, _target);
setActionProperty(component, _action);
setActionListenerProperty(component, _actionListener);
- setBooleanProperty(component, JSFAttr.IMMEDIATE_ATTR, _immediate);
+ setBooleanProperty(component, org.apache.myfaces.shared.renderkit.JSFAttr.IMMEDIATE_ATTR, _immediate);
}
public void setAccesskey(String accesskey)
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandLinkTagBase.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.5
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandLinkTagBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandLinkTagBase.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandLinkTagBase.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlComponentBodyTagBase.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/taglib/html/HtmlComponentBodyTagBase.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlComponentBodyTagBase.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlComponentBodyTagBase.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/taglib/html/HtmlComponentBodyTagBase.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/taglib/html/HtmlComponentBodyTagBase.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlComponentBodyTagBase.java Fri Feb 24 07:19:28 2006
@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.myfaces.taglib.html;
+package org.apache.myfaces.shared.taglib.html;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.taglib.UIComponentBodyTagBase;
+import org.apache.myfaces.shared.renderkit.html.HTML;
import javax.faces.component.UIComponent;
@@ -25,7 +24,7 @@
* @version $Revision$ $Date$
*/
public abstract class HtmlComponentBodyTagBase
- extends UIComponentBodyTagBase
+ extends org.apache.myfaces.shared.taglib.UIComponentBodyTagBase
{
//private static final Log log = LogFactory.getLog(HtmlComponentTag.class);
@@ -70,21 +69,21 @@
protected void setProperties(UIComponent component)
{
super.setProperties(component);
- setStringProperty(component, HTML.DIR_ATTR, _dir);
+ setStringProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.DIR_ATTR, _dir);
setStringProperty(component, HTML.LANG_ATTR, _lang);
setStringProperty(component, HTML.STYLE_ATTR, _style);
setStringProperty(component, HTML.TITLE_ATTR, _title);
setStringProperty(component, HTML.STYLE_CLASS_ATTR, _styleClass);
- setStringProperty(component, HTML.ONCLICK_ATTR, _onclick);
+ setStringProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.ONCLICK_ATTR, _onclick);
setStringProperty(component, HTML.ONDBLCLICK_ATTR, _ondblclick);
- setStringProperty(component, HTML.ONMOUSEDOWN_ATTR, _onmousedown);
- setStringProperty(component, HTML.ONMOUSEUP_ATTR, _onmouseup);
+ setStringProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.ONMOUSEDOWN_ATTR, _onmousedown);
+ setStringProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.ONMOUSEUP_ATTR, _onmouseup);
setStringProperty(component, HTML.ONMOUSEOVER_ATTR, _onmouseover);
setStringProperty(component, HTML.ONMOUSEMOVE_ATTR, _onmousemove);
- setStringProperty(component, HTML.ONMOUSEOUT_ATTR, _onmouseout);
+ setStringProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.ONMOUSEOUT_ATTR, _onmouseout);
setStringProperty(component, HTML.ONKEYPRESS_ATTR, _onkeypress);
setStringProperty(component, HTML.ONKEYDOWN_ATTR, _onkeydown);
- setStringProperty(component, HTML.ONKEYUP_ATTR, _onkeyup);
+ setStringProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.ONKEYUP_ATTR, _onkeyup);
}
public void setStyleClass(String styleClass)
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlComponentBodyTagBase.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.4
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlComponentBodyTagBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlComponentBodyTagBase.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlComponentBodyTagBase.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision