You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@myfaces.apache.org by Sean Schofield <se...@gmail.com> on 2006/02/27 16:26:06 UTC
PLEASE: No major checkins
Please .... Please ... Please try not to make major changes to
anything these next few days until the refactoring is complete. I beg
you. This is already complex enough as it is.
Sean
On 2/26/06, Manfred Geiler <ma...@gmail.com> wrote:
> Step 1 of refactoring is done.
> That means: All commons classes have been copied to the shared module
> and are now in package org.apache.myfaces.shared.*. This was done in
> shared trunk(!) and core and tomahawk branches 1_1_2.
>
> Step 2 is pending (Hope I can finish it today):
> That is: Deriving two "shared" libs with different namespace
> (o.a.m.impl.shared and o.a.m.tomahawk.shared) and refactoring core and
> tomahawk accordingly.
>
> So, if you have a serious bugfix for commons/shared, please fix in
> both shared trunk and commons trunk, so that both nightly builds and
> coming release will have this fix. Redundant code change sounds a bit
> queerish, but there is no other solution at the moment. Right, Sean?
>
> After the release 1.1.2 we merge core and tomahawk branches down to
> the trunk and must ensure somehow that meantime commons changes are
> merged into shared. Don't know if that will be possible with SVN
> trickery. So, if you have low priority commons changes, please
> postpone until after the release.
>
> Thanks,
> Manfred
>
>
>
> On 2/25/06, Martin Marinschek <ma...@gmail.com> wrote:
> > ;)
> >
> > I think Manfred is working on a branch, so you shouldn't be in danger
> > while dancing.
> >
> > regards,
> >
> > Martin
> >
> > On 2/25/06, Dennis Byrne <de...@dbyrne.net> wrote:
> > > DJ Manfred,
> > >
> > > Are you done remixing commons, or should we postpone commits until the end of the weekend?
> > >
> > > Dennis Byrne
> > >
> > > >-----Original Message-----
> > > >From: manolito@apache.org [mailto:manolito@apache.org]
> > > >Sent: Friday, February 24, 2006 10:47 AM
> > > >To: commits@myfaces.apache.org
> > > >Subject: svn commit: r380693 [9/9] - in /myfaces: core/branches/1_1_2/assembly/ core/branches/1_1_2/impl/ core/branches/1_1_2/impl/src/main/java/org/apache/myfaces/application/ core/branches/1_1_2/impl/src/main/java/org/apache/myfaces/application/jsp/ core/bran...
> > > >
> > > >Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/script/Script.java
> > > >URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/script/Script.java?rev=380693&r1=380692&r2=380693&view=diff
> > > >==============================================================================
> > > >--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/script/Script.java (original)
> > > >+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/script/Script.java Fri Feb 24 07:47:18 2006
> > > >@@ -19,8 +19,8 @@
> > > > import javax.faces.context.FacesContext;
> > > > import javax.faces.el.ValueBinding;
> > > >
> > > >-import org.apache.myfaces.renderkit.html.HTML;
> > > >-import org.apache.myfaces.util._ComponentUtils;
> > > >+import org.apache.myfaces.shared.renderkit.html.HTML;
> > > >+import org.apache.myfaces.shared.util._ComponentUtils;
> > > >
> > > > /**
> > > > * @author Matthias Wessendorf (changed by $Author$)
> > > >@@ -28,12 +28,12 @@
> > > > */
> > > > public class Script extends UIOutput {
> > > >
> > > >- public static final String COMPONENT_TYPE = "org.apache.myfaces.Script";
> > > >- public static final String COMPONENT_FAMILY = "javax.faces.Output";
> > > >- private static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.Script";
> > > >-
> > > >- private String src = null;
> > > >- private String type = HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT;
> > > >+ public static final String COMPONENT_TYPE = "org.apache.myfaces.Script";
> > > >+ public static final String COMPONENT_FAMILY = "javax.faces.Output";
> > > >+ private static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.Script";
> > > >+
> > > >+ private String src = null;
> > > >+ private String type = HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT;
> > > >
> > > > // ------------------------------------------------------------ Constructor
> > > > public Script() {
> > > >@@ -50,28 +50,28 @@
> > > > }
> > > >
> > > > // ------------------------------------------------------------ getter/setter
> > > >- public String getSrc() {
> > > >+ public String getSrc() {
> > > > if (src != null) return src;
> > > > ValueBinding vb = getValueBinding("src");
> > > > return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
> > > >- }
> > > >+ }
> > > >
> > > >
> > > >- public void setSrc(String src) {
> > > >- this.src = src;
> > > >- }
> > > >+ public void setSrc(String src) {
> > > >+ this.src = src;
> > > >+ }
> > > >
> > > >
> > > >- public String getType() {
> > > >+ public String getType() {
> > > > if (type != null) return type;
> > > > ValueBinding vb = getValueBinding("type");
> > > > return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
> > > >- }
> > > >+ }
> > > >
> > > >
> > > >- public void setType(String type) {
> > > >- this.type = type;
> > > >- }
> > > >+ public void setType(String type) {
> > > >+ this.type = type;
> > > >+ }
> > > >
> > > > // ------------------------------------------------------------ StateHolder
> > > > public void restoreState(FacesContext context, Object state) {
> > > >@@ -93,5 +93,5 @@
> > > >
> > > > }
> > > >
> > > >-
> > > >+
> > > > }
> > > >
> > > >Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/script/ScriptRenderer.java
> > > >URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/script/ScriptRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
> > > >==============================================================================
> > > >--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/script/ScriptRenderer.java (original)
> > > >+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/script/ScriptRenderer.java Fri Feb 24 07:47:18 2006
> > > >@@ -21,26 +21,26 @@
> > > > import javax.faces.context.FacesContext;
> > > > import javax.faces.context.ResponseWriter;
> > > >
> > > >-import org.apache.myfaces.renderkit.html.HTML;
> > > >-import org.apache.myfaces.renderkit.html.HtmlRenderer;
> > > >+import org.apache.myfaces.shared.renderkit.html.HTML;
> > > >+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
> > > >
> > > > /**
> > > > * @author Matthias Wessendorf (changed by $Author$)
> > > > * @version $Revision$ $Date$
> > > > */
> > > > public class ScriptRenderer extends HtmlRenderer {
> > > >-
> > > >- public void encodeEnd(FacesContext context, UIComponent component) throws IOException {
> > > >- if ((context == null) || (component == null)) {
> > > >- throw new NullPointerException();
> > > >- }
> > > >- Script script = (Script) component;
> > > >- ResponseWriter writer = context.getResponseWriter();
> > > >-
> > > >+
> > > >+ public void encodeEnd(FacesContext context, UIComponent component) throws IOException {
> > > >+ if ((context == null) || (component == null)) {
> > > >+ throw new NullPointerException();
> > > >+ }
> > > >+ Script script = (Script) component;
> > > >+ ResponseWriter writer = context.getResponseWriter();
> > > >+
> > > > writer.startElement(HTML.SCRIPT_ELEM, component);
> > > > writer.writeAttribute(HTML.SRC_ATTR, context.getExternalContext().getRequestContextPath()+script.getSrc(), null);
> > > > writer.writeAttribute(HTML.TYPE_ATTR, script.getType(), null);
> > > > writer.writeText("",null);
> > > >- writer.endElement(HTML.SCRIPT_ELEM);
> > > >- }
> > > >+ writer.endElement(HTML.SCRIPT_ELEM);
> > > >+ }
> > > > }
> > > >
> > > >Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/script/ScriptTag.java
> > > >URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/script/ScriptTag.java?rev=380693&r1=380692&r2=380693&view=diff
> > > >==============================================================================
> > > >--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/script/ScriptTag.java (original)
> > > >+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/script/ScriptTag.java Fri Feb 24 07:47:18 2006
> > > >@@ -17,8 +17,8 @@
> > > >
> > > > import javax.faces.component.UIComponent;
> > > >
> > > >-import org.apache.myfaces.renderkit.html.HTML;
> > > >-import org.apache.myfaces.taglib.html.HtmlOutputTextTagBase;
> > > >+import org.apache.myfaces.shared.renderkit.html.HTML;
> > > >+import org.apache.myfaces.shared.taglib.html.HtmlOutputTextTagBase;
> > > >
> > > > /**
> > > > * @author Matthias Wessendorf (changed by $Author$)
> > > >
> > > >Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/selectOneRow/SelectOneRowRenderer.java
> > > >URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/selectOneRow/SelectOneRowRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
> > > >==============================================================================
> > > >--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/selectOneRow/SelectOneRowRenderer.java (original)
> > > >+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/selectOneRow/SelectOneRowRenderer.java Fri Feb 24 07:47:18 2006
> > > >@@ -1,8 +1,8 @@
> > > > package org.apache.myfaces.custom.selectOneRow;
> > > >
> > > >-import org.apache.myfaces.renderkit.html.HtmlRenderer;
> > > >-import org.apache.myfaces.renderkit.html.HTML;
> > > >-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
> > > >+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
> > > >+import org.apache.myfaces.shared.renderkit.html.HTML;
> > > >+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
> > > >
> > > > import javax.faces.component.UIComponent;
> > > > import javax.faces.component.UIData;
> > > >
> > > >Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/selectOneRow/SelectOneRowTag.java
> > > >URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/selectOneRow/SelectOneRowTag.java?rev=380693&r1=380692&r2=380693&view=diff
> > > >==============================================================================
> > > >--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/selectOneRow/SelectOneRowTag.java (original)
> > > >+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/selectOneRow/SelectOneRowTag.java Fri Feb 24 07:47:18 2006
> > > >@@ -1,9 +1,9 @@
> > > > package org.apache.myfaces.custom.selectOneRow;
> > > >
> > > >-import org.apache.myfaces.taglib.html.HtmlInputTagBase;
> > > >+import org.apache.myfaces.shared.taglib.html.HtmlInputTagBase;
> > > >+
> > > >+import org.apache.myfaces.shared.renderkit.html.HTML;
> > > >
> > > >-import org.apache.myfaces.renderkit.JSFAttr;
> > > >-import org.apache.myfaces.renderkit.html.HTML;
> > > > import javax.faces.application.Application;
> > > > import javax.faces.component.UIComponent;
> > > > import javax.faces.component.UIInput;
> > > >
> > > >Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/statechangednotifier/StateChangedNotifier.java
> > > >URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/statechangednotifier/StateChangedNotifier.java?rev=380693&r1=380692&r2=380693&view=diff
> > > >==============================================================================
> > > >--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/statechangednotifier/StateChangedNotifier.java (original)
> > > >+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/statechangednotifier/StateChangedNotifier.java Fri Feb 24 07:47:18 2006
> > > >@@ -15,7 +15,7 @@
> > > > */
> > > > package org.apache.myfaces.custom.statechangednotifier;
> > > >
> > > >-import org.apache.myfaces.util._ComponentUtils;
> > > >+import org.apache.myfaces.shared.util._ComponentUtils;
> > > >
> > > > import javax.faces.component.html.HtmlInputHidden;
> > > > import javax.faces.context.FacesContext;
> > > >
> > > >Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/statechangednotifier/StateChangedNotifierRenderer.java
> > > >URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/statechangednotifier/StateChangedNotifierRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
> > > >==============================================================================
> > > >--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/statechangednotifier/StateChangedNotifierRenderer.java (original)
> > > >+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/statechangednotifier/StateChangedNotifierRenderer.java Fri Feb 24 07:47:18 2006
> > > >@@ -16,10 +16,10 @@
> > > > package org.apache.myfaces.custom.statechangednotifier;
> > > >
> > > > import org.apache.myfaces.renderkit.html.HtmlHiddenRenderer;
> > > >-import org.apache.myfaces.renderkit.html.util.AddResource;
> > > >-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
> > > >-import org.apache.myfaces.renderkit.RendererUtils;
> > > >-import org.apache.myfaces.renderkit.JSFAttr;
> > > >+import org.apache.myfaces.shared.renderkit.html.util.AddResource;
> > > >+import org.apache.myfaces.shared.renderkit.html.util.AddResourceFactory;
> > > >+import org.apache.myfaces.shared.renderkit.RendererUtils;
> > > >+import org.apache.myfaces.shared.renderkit.JSFAttr;
> > > > import org.apache.myfaces.custom.dojo.DojoUtils;
> > > > import org.apache.myfaces.custom.dojo.DojoConfig;
> > > >
> > > >@@ -36,7 +36,8 @@
> > > > {
> > > > public void encodeEnd(FacesContext facesContext, UIComponent uiComponent) throws IOException
> > > > {
> > > >- RendererUtils.checkParamValidity(facesContext, uiComponent, StateChangedNotifier.class);
> > > >+ RendererUtils.checkParamValidity(facesContext, uiComponent,
> > > >+ StateChangedNotifier.class);
> > > >
> > > > StateChangedNotifier notifier = (StateChangedNotifier) uiComponent;
> > > >
> > > >@@ -52,8 +53,8 @@
> > > > //DojoUtils.addRequire(facesContext, "dojo.xml.Parse");
> > > >
> > > > AddResource addResource = AddResourceFactory.getInstance(facesContext);
> > > >- addResource.addJavaScriptAtPosition(facesContext, AddResource.HEADER_BEGIN, StateChangedNotifierRenderer.class,
> > > >- "stateChangedNotifier.js");
> > > >+ addResource.addJavaScriptAtPosition(facesContext, AddResource.HEADER_BEGIN,
> > > >+ StateChangedNotifierRenderer.class, "stateChangedNotifier.js");
> > > >
> > > > encodeJavascript(facesContext, notifier);
> > > >
> > > >@@ -65,39 +66,37 @@
> > > > String notifierClientId = notifier.getClientId(facesContext);
> > > >
> > > > String replacedClientId = notifierClientId.replaceAll(":", "_");
> > > >- String initFunctionName = "init_" + replacedClientId;
> > > >+ String initFunctionName = "init_"+replacedClientId;
> > > >
> > > > UIForm form = getParentForm(notifier);
> > > > String formId = form.getClientId(facesContext);
> > > >
> > > >- String notifierVar = replacedClientId + "Notifier";
> > > >+ String notifierVar = replacedClientId+"Notifier";
> > > >
> > > > StringBuffer sb = new StringBuffer();
> > > > sb.append("<!--\n");
> > > >- sb.append("var " + notifierVar + " = null;\n");
> > > >-
> > > >- sb.append("function " + initFunctionName + "() {\n");
> > > >- sb.append(notifierVar + " = new org_apache_myfaces_StateChangedNotifier('" + notifierVar + "','" + formId
> > > >- + "','" + notifierClientId + "','" + notifier.getConfirmationMessage() + "',");
> > > >+ sb.append("dojo.addOnLoad(window, '"+initFunctionName+"');\n");
> > > >+ sb.append("function "+initFunctionName+ "() {\n");
> > > >+ sb.append(notifierVar+" = new org.apache.myfaces.StateChangedNotifier('"+notifierVar+"','"+formId+"','"+notifierClientId+"','"+notifier.getConfirmationMessage()+"',");
> > > >
> > > > String excludedCommandIds = notifier.getExcludedIds();
> > > > if (excludedCommandIds != null)
> > > > {
> > > >- sb.append("'" + excludedCommandIds + "');\n");
> > > >+ sb.append("'"+excludedCommandIds+"');\n");
> > > > }
> > > > else
> > > > {
> > > > sb.append("'');\n");
> > > > }
> > > >
> > > >- sb.append(replacedClientId + "Notifier.prepareNotifier();\n");
> > > >+ sb.append(replacedClientId+"Notifier.prepareNotifier();\n");
> > > >
> > > > sb.append("}\n");
> > > >- sb.append("dojo.addOnLoad(window, '" + initFunctionName + "');\n");
> > > > sb.append("-->\n");
> > > >
> > > > AddResource addResource = AddResourceFactory.getInstance(facesContext);
> > > >- addResource.addInlineScriptAtPosition(facesContext, AddResource.HEADER_BEGIN, sb.toString());
> > > >+ addResource.addInlineScriptAtPosition(facesContext, AddResource.HEADER_BEGIN,
> > > >+ sb.toString());
> > > > }
> > > >
> > > > /**
> > > >@@ -106,12 +105,10 @@
> > > > * @param component
> > > > * @return UIForm
> > > > */
> > > >- private UIForm getParentForm(UIComponent component)
> > > >- {
> > > >+ private UIForm getParentForm(UIComponent component) {
> > > > // See if we are in a form
> > > > UIComponent parent = component.getParent();
> > > >- while (parent != null && !(parent instanceof UIForm))
> > > >- {
> > > >+ while (parent != null && !(parent instanceof UIForm)) {
> > > > parent = parent.getParent();
> > > > }
> > > > return (UIForm) parent;
> > > >
> > > >Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/subform/SubForm.java
> > > >URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/subform/SubForm.java?rev=380693&r1=380692&r2=380693&view=diff
> > > >==============================================================================
> > > >--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/subform/SubForm.java (original)
> > > >+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/subform/SubForm.java Fri Feb 24 07:47:18 2006
> > > >@@ -1,6 +1,6 @@
> > > > package org.apache.myfaces.custom.subform;
> > > >
> > > >-import org.apache.myfaces.renderkit.RendererUtils;
> > > >+import org.apache.myfaces.shared.renderkit.RendererUtils;
> > > >
> > > > import javax.faces.component.NamingContainer;
> > > > import javax.faces.component.UIComponent;
> > > >
> > > >Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/subform/SubFormRenderer.java
> > > >URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/subform/SubFormRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
> > > >==============================================================================
> > > >--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/subform/SubFormRenderer.java (original)
> > > >+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/subform/SubFormRenderer.java Fri Feb 24 07:47:18 2006
> > > >@@ -1,6 +1,6 @@
> > > > package org.apache.myfaces.custom.subform;
> > > >
> > > >-import org.apache.myfaces.renderkit.html.HtmlRenderer;
> > > >+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
> > > >
> > > > /**
> > > > * @author Gerald Muellan
> > > >@@ -9,5 +9,5 @@
> > > > */
> > > > public class SubFormRenderer extends HtmlRenderer
> > > > {
> > > >-
> > > >+
> > > > }
> > > >
> > > >Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/suggest/InputSuggestRenderer.java
> > > >URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/suggest/InputSuggestRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
> > > >==============================================================================
> > > >--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/suggest/InputSuggestRenderer.java (original)
> > > >+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/suggest/InputSuggestRenderer.java Fri Feb 24 07:47:18 2006
> > > >@@ -29,11 +29,11 @@
> > > > import javax.faces.render.Renderer;
> > > >
> > > > import org.apache.myfaces.component.html.ext.HtmlInputHidden;
> > > >-import org.apache.myfaces.renderkit.html.util.AddResource;
> > > >-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
> > > >-import org.apache.myfaces.renderkit.JSFAttr;
> > > >-import org.apache.myfaces.renderkit.html.HTML;
> > > >-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
> > > >+import org.apache.myfaces.shared.renderkit.html.util.AddResource;
> > > >+import org.apache.myfaces.shared.renderkit.html.util.AddResourceFactory;
> > > >+import org.apache.myfaces.shared.renderkit.html.HTML;
> > > >+import org.apache.myfaces.shared.renderkit.JSFAttr;
> > > >+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
> > > >
> > > > /**
> > > > * Basic HTML Renderer for the inputSuggest component.
> > > >@@ -77,7 +77,7 @@
> > > > }
> > > >
> > > > public void encodeBegin(FacesContext context, UIComponent component) throws
> > > >- IOException
> > > >+ IOException
> > > > {
> > > >
> > > > if (!component.isRendered())
> > > >@@ -120,7 +120,7 @@
> > > >
> > > > private void renderInputField(ResponseWriter out, String text,
> > > > String clientId, UIComponent component) throws
> > > >- IOException
> > > >+ IOException
> > > > {
> > > >
> > > > out.startElement("input", component);
> > > >@@ -139,7 +139,7 @@
> > > > component.getAttributes().put("autocomplete","off");
> > > >
> > > > HtmlRendererUtils.renderHTMLAttributes(out,
> > > >- component, HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED);
> > > >+ component, HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED);
> > > >
> > > > if((component instanceof HtmlInputText) && ((HtmlInputText) component).isDisabled())
> > > > {
> > > >@@ -271,7 +271,7 @@
> > > > * @throws IOException
> > > > */
> > > > private void encodeStyles(UIComponent component, FacesContext context) throws
> > > >- IOException
> > > >+ IOException
> > > > {
> > > > ResponseWriter out = context.getResponseWriter();
> > > >
> > > >@@ -297,7 +297,7 @@
> > > > * @throws IOException
> > > > */
> > > > private void encodeJavascript(UIComponent component, FacesContext context) throws
> > > >- IOException
> > > >+ IOException
> > > > {
> > > > ResponseWriter out = context.getResponseWriter();
> > > >
> > > >
> > > >Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/suggest/InputSuggestTag.java
> > > >URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/suggest/InputSuggestTag.java?rev=380693&r1=380692&r2=380693&view=diff
> > > >==============================================================================
> > > >--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/suggest/InputSuggestTag.java (original)
> > > >+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/suggest/InputSuggestTag.java Fri Feb 24 07:47:18 2006
> > > >@@ -17,7 +17,7 @@
> > > >
> > > > import javax.faces.component.UIComponent;
> > > >
> > > >-import org.apache.myfaces.taglib.html.HtmlInputTagBase;
> > > >+import org.apache.myfaces.shared.taglib.html.HtmlInputTagBase;
> > > >
> > > > /**
> > > > * @author Sean Schofield
> > > >
> > > >Modified: myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/urlvalidator/UrlValidator.java
> > > >URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/urlvalidator/UrlValidator.java?rev=380693&r1=380692&r2=380693&view=diff
> > > >==============================================================================
> > > >--- myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/urlvalidator/UrlValidator.java (original)
> > > >+++ myfaces/tomahawk/branches/1_1_2/sandbox/core/src/main/java/org/apache/myfaces/custom/urlvalidator/UrlValidator.java Fri Feb 24 07:47:18 2006
> > > >@@ -16,7 +16,7 @@
> > > >
> > > > package org.apache.myfaces.custom.urlvalidator;
> > > >
> > > >-import org.apache.myfaces.util.MessageUtils;
> > > >+import org.apache.myfaces.shared.util.MessageUtils;
> > > >
> > > > import org.apache.commons.validator.GenericValidator;
> > > >
> > > >
> > > >Modified: myfaces/tomahawk/branches/1_1_2/sandbox/examples/src/main/webapp/WEB-INF/web.xml
> > > >URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/sandbox/examples/src/main/webapp/WEB-INF/web.xml?rev=380693&r1=380692&r2=380693&view=diff
> > > >==============================================================================
> > > >--- myfaces/tomahawk/branches/1_1_2/sandbox/examples/src/main/webapp/WEB-INF/web.xml (original)
> > > >+++ myfaces/tomahawk/branches/1_1_2/sandbox/examples/src/main/webapp/WEB-INF/web.xml Fri Feb 24 07:47:18 2006
> > > >@@ -89,7 +89,7 @@
> > > > </servlet>
> > > > <servlet>
> > > > <servlet-name>SourceCodeServlet</servlet-name>
> > > >- <servlet-class>org.apache.myfaces.util.servlet.SourceCodeServlet</servlet-class>
> > > >+ <servlet-class>SourceCodeServlet</servlet-class>
> > > > </servlet>
> > > > <servlet-mapping>
> > > > <servlet-name>Faces Servlet</servlet-name>
> > > >
> > > >
> > > >
> > >
> > >
> > >
> >
> >
> > --
> >
> > http://www.irian.at
> >
> > Your JSF powerhouse -
> > JSF Consulting, Development and
> > Courses in English and German
> >
> > Professional Support for Apache MyFaces
> >
>