You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2013/02/22 15:22:38 UTC
svn commit: r1449056 [2/3] - in /myfaces/tobago/trunk: tobago-assembly/
tobago-core/src/main/faces-config/
tobago-core/src/main/java/org/apache/myfaces/tobago/event/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/
tobago-core/src/mai...
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java Fri Feb 22 14:22:36 2013
@@ -19,18 +19,17 @@
package org.apache.myfaces.tobago.facelets;
-import com.sun.facelets.FaceletContext;
-import com.sun.facelets.el.ELAdaptor;
-import com.sun.facelets.tag.MetaRule;
-import com.sun.facelets.tag.Metadata;
-import com.sun.facelets.tag.MetadataTarget;
-import com.sun.facelets.tag.TagAttribute;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.SupportsMarkup;
import org.apache.myfaces.tobago.context.Markup;
import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
+import javax.faces.view.facelets.FaceletContext;
+import javax.faces.view.facelets.MetaRule;
+import javax.faces.view.facelets.Metadata;
+import javax.faces.view.facelets.MetadataTarget;
+import javax.faces.view.facelets.TagAttribute;
public class SupportsMarkupRule extends MetaRule {
@@ -58,7 +57,7 @@ public class SupportsMarkupRule extends
((SupportsMarkup) instance).setMarkup(Markup.valueOf(attribute.getValue()));
} else {
ValueExpression expression = attribute.getValueExpression(ctx, Object.class);
- ELAdaptor.setExpression((UIComponent) instance, Attributes.MARKUP, expression);
+ ((UIComponent) instance).setValueExpression(Attributes.MARKUP, expression);
}
}
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/SupportsRenderedPartiallyRule.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/SupportsRenderedPartiallyRule.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/SupportsRenderedPartiallyRule.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/SupportsRenderedPartiallyRule.java Fri Feb 22 14:22:36 2013
@@ -19,18 +19,17 @@
package org.apache.myfaces.tobago.facelets;
-import com.sun.facelets.FaceletContext;
-import com.sun.facelets.el.ELAdaptor;
-import com.sun.facelets.tag.MetaRule;
-import com.sun.facelets.tag.Metadata;
-import com.sun.facelets.tag.MetadataTarget;
-import com.sun.facelets.tag.TagAttribute;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.SupportsRenderedPartially;
import org.apache.myfaces.tobago.util.ComponentUtils;
import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
+import javax.faces.view.facelets.FaceletContext;
+import javax.faces.view.facelets.MetaRule;
+import javax.faces.view.facelets.Metadata;
+import javax.faces.view.facelets.MetadataTarget;
+import javax.faces.view.facelets.TagAttribute;
public class SupportsRenderedPartiallyRule extends MetaRule {
@@ -59,7 +58,7 @@ public class SupportsRenderedPartiallyRu
((SupportsRenderedPartially) instance).setRenderedPartially(components);
} else {
ValueExpression expression = attribute.getValueExpression(ctx, Object.class);
- ELAdaptor.setExpression((UIComponent) instance, Attributes.RENDERED_PARTIALLY, expression);
+ ((UIComponent) instance).setValueExpression(Attributes.RENDERED_PARTIALLY, expression);
}
}
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java Fri Feb 22 14:22:36 2013
@@ -19,12 +19,6 @@
package org.apache.myfaces.tobago.facelets;
-import com.sun.facelets.FaceletContext;
-import com.sun.facelets.tag.TagAttribute;
-import com.sun.facelets.tag.TagAttributeException;
-import com.sun.facelets.tag.TagConfig;
-import com.sun.facelets.tag.TagException;
-import com.sun.facelets.tag.TagHandler;
import org.apache.myfaces.tobago.event.TabChangeListener;
import org.apache.myfaces.tobago.event.TabChangeSource;
import org.apache.myfaces.tobago.event.ValueExpressionTabChangeListener;
@@ -33,12 +27,14 @@ import javax.el.ELException;
import javax.el.ValueExpression;
import javax.faces.FacesException;
import javax.faces.component.UIComponent;
+import javax.faces.view.facelets.FaceletContext;
+import javax.faces.view.facelets.TagAttribute;
+import javax.faces.view.facelets.TagAttributeException;
+import javax.faces.view.facelets.TagConfig;
+import javax.faces.view.facelets.TagException;
+import javax.faces.view.facelets.TagHandler;
import java.io.IOException;
-/*
- * Date: 20.04.2006
- * Time: 18:14:11
- */
public class TabChangeListenerHandler extends TagHandler {
private Class listenerType;
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java Fri Feb 22 14:22:36 2013
@@ -19,20 +19,16 @@
package org.apache.myfaces.tobago.facelets;
-import com.sun.facelets.tag.MetaRule;
-import com.sun.facelets.tag.Metadata;
-import com.sun.facelets.tag.TagAttribute;
-import com.sun.facelets.tag.MetadataTarget;
-import com.sun.facelets.FaceletContext;
-import com.sun.facelets.el.LegacyMethodBinding;
-import org.apache.myfaces.tobago.event.TabChangeSource;
+import org.apache.myfaces.tobago.component.MethodExpressionToMethodBinding;
import org.apache.myfaces.tobago.event.TabChangeEvent;
+import org.apache.myfaces.tobago.event.TabChangeSource;
+
+import javax.faces.view.facelets.FaceletContext;
+import javax.faces.view.facelets.MetaRule;
+import javax.faces.view.facelets.Metadata;
+import javax.faces.view.facelets.MetadataTarget;
+import javax.faces.view.facelets.TagAttribute;
-/*
- * User: bommel
- * Date: 15.04.2006
- * Time: 14:24:54
- */
public class TabChangeSourceRule extends MetaRule {
static final Class[] ACTION_LISTENER = new Class[]{TabChangeEvent.class};
public static final TabChangeSourceRule INSTANCE = new TabChangeSourceRule();
@@ -56,11 +52,9 @@ public class TabChangeSourceRule extends
}
public void applyMetadata(FaceletContext ctx, Object instance) {
- ((TabChangeSource) instance)
- .setTabChangeListener(new LegacyMethodBinding(attribute
- .getMethodExpression(ctx, null,
- TabChangeSourceRule.ACTION_LISTENER)));
+ ((TabChangeSource) instance).setTabChangeListener(
+ new MethodExpressionToMethodBinding(
+ attribute.getMethodExpression(ctx, null, TabChangeSourceRule.ACTION_LISTENER)));
}
}
-
}
Added: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/TagMethodExpression.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/TagMethodExpression.java?rev=1449056&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/TagMethodExpression.java (added)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/TagMethodExpression.java Fri Feb 22 14:22:36 2013
@@ -0,0 +1,117 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.tobago.facelets;
+
+import javax.el.ELContext;
+import javax.el.ELException;
+import javax.el.MethodExpression;
+import javax.el.MethodInfo;
+import javax.el.MethodNotFoundException;
+import javax.el.PropertyNotFoundException;
+import javax.faces.FacesWrapper;
+import javax.faces.view.facelets.TagAttribute;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+/*
+ * Was copied from MyFaces-Impl.
+ */
+
+/**
+ * Jacob Hookom
+ * @version $Id: TagMethodExpression.java 1187700 2011-10-22 12:19:37Z bommel $
+ */
+public final class TagMethodExpression extends MethodExpression
+ implements Externalizable, FacesWrapper<MethodExpression> {
+
+ private static final long serialVersionUID = 1L;
+
+ private String attr;
+ private MethodExpression orig;
+
+ public TagMethodExpression() {
+ super();
+ }
+
+ public TagMethodExpression(TagAttribute attr, MethodExpression orig) {
+ this.attr = attr.toString();
+ this.orig = orig;
+ }
+
+ public MethodInfo getMethodInfo(ELContext context) {
+ try {
+ return this.orig.getMethodInfo(context);
+ } catch (PropertyNotFoundException pnfe) {
+ throw new PropertyNotFoundException(this.attr + ": " + pnfe.getMessage(), pnfe.getCause());
+ } catch (MethodNotFoundException mnfe) {
+ throw new MethodNotFoundException(this.attr + ": " + mnfe.getMessage(), mnfe.getCause());
+ } catch (ELException e) {
+ throw new ELException(this.attr + ": " + e.getMessage(), e.getCause());
+ }
+ }
+
+ public Object invoke(ELContext context, Object[] params) {
+ try {
+ return this.orig.invoke(context, params);
+ } catch (PropertyNotFoundException pnfe) {
+ throw new PropertyNotFoundException(this.attr + ": " + pnfe.getMessage(), pnfe.getCause());
+ } catch (MethodNotFoundException mnfe) {
+ throw new MethodNotFoundException(this.attr + ": " + mnfe.getMessage(), mnfe.getCause());
+ } catch (ELException e) {
+ throw new ELException(this.attr + ": " + e.getMessage(), e.getCause());
+ }
+ }
+
+ public String getExpressionString() {
+ return this.orig.getExpressionString();
+ }
+
+ public boolean equals(Object obj) {
+ return this.orig.equals(obj);
+ }
+
+ public int hashCode() {
+ return this.orig.hashCode();
+ }
+
+ public boolean isLiteralText() {
+ return this.orig.isLiteralText();
+ }
+
+ public void writeExternal(ObjectOutput out) throws IOException {
+ out.writeObject(this.orig);
+ out.writeUTF(this.attr);
+ }
+
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ this.orig = (MethodExpression) in.readObject();
+ this.attr = in.readUTF();
+ }
+
+ public String toString() {
+ return this.attr + ": " + this.orig;
+ }
+
+ public MethodExpression getWrapped() {
+ return this.orig;
+ }
+}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java Fri Feb 22 14:22:36 2013
@@ -19,10 +19,6 @@
package org.apache.myfaces.tobago.facelets;
-import com.sun.facelets.FaceletContext;
-import com.sun.facelets.tag.MetaRuleset;
-import com.sun.facelets.tag.jsf.ComponentConfig;
-import com.sun.facelets.tag.jsf.ComponentHandler;
import org.apache.myfaces.tobago.component.DeprecatedDimension;
import org.apache.myfaces.tobago.component.InputSuggest;
import org.apache.myfaces.tobago.component.OnComponentCreated;
@@ -37,11 +33,17 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.component.AbstractUIGridLayout;
import org.apache.myfaces.tobago.internal.component.AbstractUIPopup;
import org.apache.myfaces.tobago.internal.config.TobagoConfigImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.faces.component.EditableValueHolder;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.validator.Validator;
+import javax.faces.view.facelets.ComponentConfig;
+import javax.faces.view.facelets.ComponentHandler;
+import javax.faces.view.facelets.FaceletContext;
+import javax.faces.view.facelets.MetaRuleset;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
@@ -49,6 +51,12 @@ import java.util.Set;
public class TobagoComponentHandler extends ComponentHandler {
+ private static final Logger LOG = LoggerFactory.getLogger(TobagoComponentHandler.class);
+
+ static {
+ LOG.error("init");
+ }
+
public TobagoComponentHandler(ComponentConfig componentConfig) {
super(componentConfig);
}
@@ -88,7 +96,7 @@ public class TobagoComponentHandler exte
return metaRuleset;
}
- protected void onComponentCreated(FaceletContext context, UIComponent component, UIComponent parent) {
+ public void onComponentCreated(FaceletContext context, UIComponent component, UIComponent parent) {
if (component instanceof OnComponentCreated
&& component.getAttributes().get(OnComponentCreated.MARKER) == null) {
component.getAttributes().put(OnComponentCreated.MARKER, Boolean.TRUE);
@@ -96,7 +104,7 @@ public class TobagoComponentHandler exte
}
}
- protected void onComponentPopulated(FaceletContext context, UIComponent component, UIComponent parent) {
+ public void onComponentPopulated(FaceletContext context, UIComponent component, UIComponent parent) {
if (component instanceof OnComponentPopulated
&& component.getAttributes().get(OnComponentPopulated.MARKER) == null) {
component.getAttributes().put(OnComponentPopulated.MARKER, Boolean.TRUE);
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoValidateHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoValidateHandler.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoValidateHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/TobagoValidateHandler.java Fri Feb 22 14:22:36 2013
@@ -19,12 +19,13 @@
package org.apache.myfaces.tobago.facelets;
-import com.sun.facelets.tag.MetaRuleset;
-import com.sun.facelets.tag.jsf.ValidateHandler;
-import com.sun.facelets.tag.jsf.ValidatorConfig;
import org.apache.myfaces.tobago.validator.FileItemValidator;
-public class TobagoValidateHandler extends ValidateHandler {
+import javax.faces.view.facelets.MetaRuleset;
+import javax.faces.view.facelets.ValidatorConfig;
+import javax.faces.view.facelets.ValidatorHandler;
+
+public class TobagoValidateHandler extends ValidatorHandler {
public TobagoValidateHandler(ValidatorConfig config) {
super(config);
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/WizardComponentHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/WizardComponentHandler.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/WizardComponentHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/WizardComponentHandler.java Fri Feb 22 14:22:36 2013
@@ -19,13 +19,11 @@
package org.apache.myfaces.tobago.facelets;
-import com.sun.facelets.FaceletContext;
-import com.sun.facelets.el.ELAdaptor;
-import com.sun.facelets.tag.TagAttribute;
-import com.sun.facelets.tag.jsf.ComponentConfig;
-
import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
+import javax.faces.view.facelets.ComponentConfig;
+import javax.faces.view.facelets.FaceletContext;
+import javax.faces.view.facelets.TagAttribute;
public class WizardComponentHandler extends TobagoComponentHandler {
@@ -36,14 +34,14 @@ public class WizardComponentHandler exte
outcomeAttribute = getAttribute("outcome");
}
- protected void onComponentCreated(FaceletContext faceletContext, UIComponent wizard, UIComponent parent) {
+ public void onComponentCreated(FaceletContext faceletContext, UIComponent wizard, UIComponent parent) {
if (outcomeAttribute != null) {
if (outcomeAttribute.isLiteral()) {
wizard.getAttributes().put("outcome", outcomeAttribute.getValue(faceletContext));
} else {
ValueExpression expression = outcomeAttribute.getValueExpression(faceletContext, String.class);
- ELAdaptor.setExpression(wizard, "outcome", expression);
+ wizard.setValueExpression("outcome", expression);
}
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java Fri Feb 22 14:22:36 2013
@@ -19,19 +19,19 @@
package org.apache.myfaces.tobago.facelets.extension;
-import com.sun.facelets.FaceletContext;
-import com.sun.facelets.tag.TagAttribute;
-import com.sun.facelets.tag.jsf.ComponentConfig;
-import com.sun.facelets.tag.jsf.ComponentSupport;
import org.apache.myfaces.tobago.component.OnComponentCreated;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UIDate;
import org.apache.myfaces.tobago.component.UIDatePicker;
import org.apache.myfaces.tobago.component.UIForm;
+import org.apache.myfaces.tobago.util.ComponentUtils;
import javax.faces.application.Application;
import javax.faces.component.UIComponent;
import javax.faces.component.UIViewRoot;
+import javax.faces.view.facelets.ComponentConfig;
+import javax.faces.view.facelets.FaceletContext;
+import javax.faces.view.facelets.TagAttribute;
public class DateExtensionHandler extends TobagoLabelExtensionHandler {
@@ -52,11 +52,11 @@ public class DateExtensionHandler extend
return RendererTypes.DATE;
}
- protected void onComponentPopulated(FaceletContext faceletContext, UIComponent panel, UIComponent parent) {
+ public void onComponentPopulated(FaceletContext faceletContext, UIComponent panel, UIComponent parent) {
super.onComponentPopulated(faceletContext, panel, parent);
if (panel.getChildCount() == 2) {
Application application = faceletContext.getFacesContext().getApplication();
- UIViewRoot root = ComponentSupport.getViewRoot(faceletContext, parent);
+ UIViewRoot root = ComponentUtils.findViewRoot(faceletContext, parent);
UIForm form = (UIForm) application.createComponent(UIForm.COMPONENT_TYPE);
form.setRendererType(RendererTypes.FORM);
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/FileExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/FileExtensionHandler.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/FileExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/FileExtensionHandler.java Fri Feb 22 14:22:36 2013
@@ -19,10 +19,11 @@
package org.apache.myfaces.tobago.facelets.extension;
-import com.sun.facelets.tag.jsf.ComponentConfig;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UIFile;
+import javax.faces.view.facelets.ComponentConfig;
+
public class FileExtensionHandler extends TobagoLabelExtensionHandler {
public FileExtensionHandler(ComponentConfig config) {
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/InExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/InExtensionHandler.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/InExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/InExtensionHandler.java Fri Feb 22 14:22:36 2013
@@ -19,10 +19,11 @@
package org.apache.myfaces.tobago.facelets.extension;
-import com.sun.facelets.tag.jsf.ComponentConfig;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UIIn;
+import javax.faces.view.facelets.ComponentConfig;
+
public class InExtensionHandler extends TobagoLabelExtensionHandler {
public InExtensionHandler(ComponentConfig config) {
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuCheckboxExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuCheckboxExtensionHandler.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuCheckboxExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuCheckboxExtensionHandler.java Fri Feb 22 14:22:36 2013
@@ -19,10 +19,11 @@
package org.apache.myfaces.tobago.facelets.extension;
-import com.sun.facelets.tag.jsf.ComponentConfig;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.UISelectBooleanCheckbox;
+import javax.faces.view.facelets.ComponentConfig;
+
/**
* Facelets handler for the <code><tx:menuCheckbox></code> extension tag.
* <pre>
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuRadioExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuRadioExtensionHandler.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuRadioExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuRadioExtensionHandler.java Fri Feb 22 14:22:36 2013
@@ -19,10 +19,11 @@
package org.apache.myfaces.tobago.facelets.extension;
-import com.sun.facelets.tag.jsf.ComponentConfig;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.UISelectOneRadio;
+import javax.faces.view.facelets.ComponentConfig;
+
/**
* Facelets handler for the <code><tx:menuRadio></code> extension tag.
* <pre>
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectBooleanCheckboxExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectBooleanCheckboxExtensionHandler.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectBooleanCheckboxExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectBooleanCheckboxExtensionHandler.java Fri Feb 22 14:22:36 2013
@@ -19,16 +19,15 @@
package org.apache.myfaces.tobago.facelets.extension;
-import com.sun.facelets.FaceletContext;
-import com.sun.facelets.el.ELAdaptor;
-import com.sun.facelets.tag.TagAttribute;
-import com.sun.facelets.tag.jsf.ComponentConfig;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UISelectBooleanCheckbox;
import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
+import javax.faces.view.facelets.ComponentConfig;
+import javax.faces.view.facelets.FaceletContext;
+import javax.faces.view.facelets.TagAttribute;
public class SelectBooleanCheckboxExtensionHandler extends TobagoLabelExtensionHandler {
@@ -47,7 +46,7 @@ public class SelectBooleanCheckboxExtens
checkbox.setItemLabel(itemLabelAttribute.getValue(faceletContext));
} else {
ValueExpression expression = itemLabelAttribute.getValueExpression(faceletContext, String.class);
- ELAdaptor.setExpression(checkbox, Attributes.ITEM_LABEL, expression);
+ checkbox.setValueExpression(Attributes.ITEM_LABEL, expression);
}
} else {
checkbox.setItemLabel(""); // for compatibility (TOBAGO-1093)
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectManyCheckboxExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectManyCheckboxExtensionHandler.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectManyCheckboxExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectManyCheckboxExtensionHandler.java Fri Feb 22 14:22:36 2013
@@ -19,10 +19,11 @@
package org.apache.myfaces.tobago.facelets.extension;
-import com.sun.facelets.tag.jsf.ComponentConfig;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UISelectManyCheckbox;
+import javax.faces.view.facelets.ComponentConfig;
+
public class SelectManyCheckboxExtensionHandler extends TobagoLabelExtensionHandler {
public SelectManyCheckboxExtensionHandler(ComponentConfig config) {
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectManyListboxExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectManyListboxExtensionHandler.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectManyListboxExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectManyListboxExtensionHandler.java Fri Feb 22 14:22:36 2013
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.facelets.extension;
-import com.sun.facelets.tag.jsf.ComponentConfig;
+import javax.faces.view.facelets.ComponentConfig;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UISelectManyListbox;
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectManyShuttleExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectManyShuttleExtensionHandler.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectManyShuttleExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectManyShuttleExtensionHandler.java Fri Feb 22 14:22:36 2013
@@ -19,10 +19,11 @@
package org.apache.myfaces.tobago.facelets.extension;
-import com.sun.facelets.tag.jsf.ComponentConfig;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UISelectManyShuttle;
+import javax.faces.view.facelets.ComponentConfig;
+
public class SelectManyShuttleExtensionHandler extends TobagoLabelExtensionHandler {
public SelectManyShuttleExtensionHandler(ComponentConfig config) {
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneChoiceExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneChoiceExtensionHandler.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneChoiceExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneChoiceExtensionHandler.java Fri Feb 22 14:22:36 2013
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.facelets.extension;
-import com.sun.facelets.tag.jsf.ComponentConfig;
+import javax.faces.view.facelets.ComponentConfig;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UISelectOneChoice;
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneListboxExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneListboxExtensionHandler.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneListboxExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneListboxExtensionHandler.java Fri Feb 22 14:22:36 2013
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.facelets.extension;
-import com.sun.facelets.tag.jsf.ComponentConfig;
+import javax.faces.view.facelets.ComponentConfig;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UISelectOneListbox;
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneRadioExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneRadioExtensionHandler.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneRadioExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectOneRadioExtensionHandler.java Fri Feb 22 14:22:36 2013
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.facelets.extension;
-import com.sun.facelets.tag.jsf.ComponentConfig;
+import javax.faces.view.facelets.ComponentConfig;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UISelectOneRadio;
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SeparatorExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SeparatorExtensionHandler.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SeparatorExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SeparatorExtensionHandler.java Fri Feb 22 14:22:36 2013
@@ -19,17 +19,11 @@
package org.apache.myfaces.tobago.facelets.extension;
-import com.sun.facelets.FaceletContext;
-import com.sun.facelets.el.ELAdaptor;
-import com.sun.facelets.tag.MetaRuleset;
-import com.sun.facelets.tag.TagAttribute;
-import com.sun.facelets.tag.jsf.ComponentConfig;
-import com.sun.facelets.tag.jsf.ComponentHandler;
-import com.sun.facelets.tag.jsf.ComponentSupport;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.UILabel;
import org.apache.myfaces.tobago.component.UISeparator;
+import org.apache.myfaces.tobago.util.ComponentUtils;
import javax.el.ELException;
import javax.el.ValueExpression;
@@ -38,6 +32,11 @@ import javax.faces.application.Applicati
import javax.faces.component.UIComponent;
import javax.faces.component.UIOutput;
import javax.faces.component.UIViewRoot;
+import javax.faces.view.facelets.ComponentConfig;
+import javax.faces.view.facelets.ComponentHandler;
+import javax.faces.view.facelets.FaceletContext;
+import javax.faces.view.facelets.MetaRuleset;
+import javax.faces.view.facelets.TagAttribute;
import java.io.IOException;
public class SeparatorExtensionHandler extends ComponentHandler {
@@ -48,9 +47,9 @@ public class SeparatorExtensionHandler e
labelAttribute = getAttribute(Attributes.LABEL);
}
- protected void applyNextHandler(FaceletContext faceletContext, UIComponent separator)
+ public void applyNextHandler(FaceletContext faceletContext, UIComponent separator)
throws IOException, FacesException, ELException {
- if (ComponentSupport.isNew(separator)) {
+ if (ComponentHandler.isNew(separator)) {
UIComponent component = (UIComponent) separator.getFacets().remove(Facets.LABEL);
nextHandler.apply(faceletContext, component);
separator.getFacets().put(Facets.LABEL, component);
@@ -59,9 +58,9 @@ public class SeparatorExtensionHandler e
}
}
- protected void onComponentCreated(FaceletContext faceletContext, UIComponent separator, UIComponent parent) {
+ public void onComponentCreated(FaceletContext faceletContext, UIComponent separator, UIComponent parent) {
Application application = faceletContext.getFacesContext().getApplication();
- UIViewRoot root = ComponentSupport.getViewRoot(faceletContext, parent);
+ UIViewRoot root = ComponentUtils.findViewRoot(faceletContext, parent);
UIOutput label = (UIOutput) application.createComponent(UILabel.COMPONENT_TYPE);
label.setId(root.createUniqueId());
label.setRendererType("Label");
@@ -72,7 +71,7 @@ public class SeparatorExtensionHandler e
label.setValue(labelAttribute.getValue(faceletContext));
} else {
ValueExpression expression = labelAttribute.getValueExpression(faceletContext, String.class);
- ELAdaptor.setExpression(label, Attributes.VALUE, expression);
+ label.setValueExpression(Attributes.VALUE, expression);
}
}
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TextareaExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TextareaExtensionHandler.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TextareaExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TextareaExtensionHandler.java Fri Feb 22 14:22:36 2013
@@ -19,10 +19,11 @@
package org.apache.myfaces.tobago.facelets.extension;
-import com.sun.facelets.tag.jsf.ComponentConfig;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UITextarea;
+import javax.faces.view.facelets.ComponentConfig;
+
/*
* Date: Aug 8, 2007
* Time: 5:49:07 PM
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TimeExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TimeExtensionHandler.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TimeExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TimeExtensionHandler.java Fri Feb 22 14:22:36 2013
@@ -19,10 +19,11 @@
package org.apache.myfaces.tobago.facelets.extension;
-import com.sun.facelets.tag.jsf.ComponentConfig;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UITime;
+import javax.faces.view.facelets.ComponentConfig;
+
public class TimeExtensionHandler extends TobagoLabelExtensionHandler {
public TimeExtensionHandler(ComponentConfig config) {
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java Fri Feb 22 14:22:36 2013
@@ -19,14 +19,6 @@
package org.apache.myfaces.tobago.facelets.extension;
-import com.sun.facelets.FaceletContext;
-import com.sun.facelets.el.ELAdaptor;
-import com.sun.facelets.tag.MetaRuleset;
-import com.sun.facelets.tag.Metadata;
-import com.sun.facelets.tag.TagAttribute;
-import com.sun.facelets.tag.jsf.ComponentConfig;
-import com.sun.facelets.tag.jsf.ComponentHandler;
-import com.sun.facelets.tag.jsf.ComponentSupport;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.InputSuggest;
@@ -42,6 +34,7 @@ import org.apache.myfaces.tobago.facelet
import org.apache.myfaces.tobago.facelets.SupportsMarkupRule;
import org.apache.myfaces.tobago.facelets.TobagoComponentHandler;
import org.apache.myfaces.tobago.internal.layout.LayoutUtils;
+import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,6 +45,12 @@ import javax.faces.application.Applicati
import javax.faces.component.EditableValueHolder;
import javax.faces.component.UIComponent;
import javax.faces.component.UIViewRoot;
+import javax.faces.view.facelets.ComponentConfig;
+import javax.faces.view.facelets.ComponentHandler;
+import javax.faces.view.facelets.FaceletContext;
+import javax.faces.view.facelets.MetaRuleset;
+import javax.faces.view.facelets.Metadata;
+import javax.faces.view.facelets.TagAttribute;
import java.io.IOException;
/*
@@ -90,9 +89,9 @@ public abstract class TobagoLabelExtensi
return first + ";*";
}
- protected void applyNextHandler(FaceletContext ctx, UIComponent panel)
+ public void applyNextHandler(FaceletContext ctx, UIComponent panel)
throws IOException, FacesException, ELException {
- if (ComponentSupport.isNew(panel)) {
+ if (ComponentHandler.isNew(panel)) {
// ensure that input has no parent (isNew)
UIComponent input = panel.getChildren().remove(1);
try {
@@ -115,10 +114,10 @@ public abstract class TobagoLabelExtensi
}
}
- protected void onComponentCreated(FaceletContext faceletContext, UIComponent panel, UIComponent parent) {
+ public void onComponentCreated(FaceletContext faceletContext, UIComponent panel, UIComponent parent) {
Application application = faceletContext.getFacesContext().getApplication();
- UIViewRoot root = ComponentSupport.getViewRoot(faceletContext, parent);
+ UIViewRoot root = ComponentUtils.findViewRoot(faceletContext, parent);
addGridLayout(faceletContext, panel, root);
@@ -161,7 +160,7 @@ public abstract class TobagoLabelExtensi
panel.setTip(tipAttribute.getValue(faceletContext));
} else {
ValueExpression expression = tipAttribute.getValueExpression(faceletContext, String.class);
- ELAdaptor.setExpression(panel, Attributes.TIP, expression);
+ panel.setValueExpression(Attributes.TIP, expression);
}
}
if (labelAttribute != null) {
@@ -169,7 +168,7 @@ public abstract class TobagoLabelExtensi
label.setValue(labelAttribute.getValue(faceletContext));
} else {
ValueExpression expression = labelAttribute.getValueExpression(faceletContext, String.class);
- ELAdaptor.setExpression(label, Attributes.VALUE, expression);
+ label.setValueExpression(Attributes.VALUE, expression);
}
}
if (markupAttribute != null) {
@@ -177,7 +176,7 @@ public abstract class TobagoLabelExtensi
label.setMarkup(Markup.valueOf(markupAttribute.getValue()));
} else {
ValueExpression expression = markupAttribute.getValueExpression(faceletContext, Object.class);
- ELAdaptor.setExpression(label, Attributes.MARKUP, expression);
+ label.setValueExpression(Attributes.MARKUP, expression);
}
}
panel.getChildren().add(label);
@@ -194,7 +193,7 @@ public abstract class TobagoLabelExtensi
return false;
}
- protected void onComponentPopulated(FaceletContext faceletContext, UIComponent component, UIComponent parent) {
+ public void onComponentPopulated(FaceletContext faceletContext, UIComponent component, UIComponent parent) {
super.onComponentPopulated(faceletContext, component, parent);
if (component.getChildren().size() > 1 && component.getChildren().get(1) instanceof EditableValueHolder) {
TobagoComponentHandler.addDefaultValidators(faceletContext.getFacesContext(),
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java Fri Feb 22 14:22:36 2013
@@ -19,20 +19,20 @@
package org.apache.myfaces.tobago.facelets.extension;
-import com.sun.facelets.FaceletContext;
-import com.sun.facelets.tag.MetaRuleset;
-import com.sun.facelets.tag.Metadata;
-import com.sun.facelets.tag.TagAttribute;
-import com.sun.facelets.tag.jsf.ComponentConfig;
-import com.sun.facelets.tag.jsf.ComponentHandler;
-import com.sun.facelets.tag.jsf.ComponentSupport;
import org.apache.myfaces.tobago.component.Attributes;
+import org.apache.myfaces.tobago.util.ComponentUtils;
import javax.el.ELException;
import javax.faces.FacesException;
import javax.faces.application.Application;
import javax.faces.component.UIComponent;
import javax.faces.component.UIViewRoot;
+import javax.faces.view.facelets.ComponentConfig;
+import javax.faces.view.facelets.ComponentHandler;
+import javax.faces.view.facelets.FaceletContext;
+import javax.faces.view.facelets.MetaRuleset;
+import javax.faces.view.facelets.Metadata;
+import javax.faces.view.facelets.TagAttribute;
import java.io.IOException;
@@ -56,9 +56,9 @@ public abstract class TobagoMenuExtensio
protected abstract String getFacetName();
- protected void applyNextHandler(FaceletContext faceletContext, UIComponent menuCommand)
+ public void applyNextHandler(FaceletContext faceletContext, UIComponent menuCommand)
throws IOException, FacesException, ELException {
- if (ComponentSupport.isNew(menuCommand)) {
+ if (ComponentHandler.isNew(menuCommand)) {
UIComponent component = (UIComponent) menuCommand.getFacets().remove(getFacetName());
nextHandler.apply(faceletContext, component);
menuCommand.getFacets().put(getFacetName(), component);
@@ -67,10 +67,10 @@ public abstract class TobagoMenuExtensio
}
}
- protected void onComponentCreated(FaceletContext faceletContext, UIComponent menuCommand, UIComponent parent) {
+ public void onComponentCreated(FaceletContext faceletContext, UIComponent menuCommand, UIComponent parent) {
Application application = faceletContext.getFacesContext().getApplication();
- UIViewRoot root = ComponentSupport.getViewRoot(faceletContext, parent);
+ UIViewRoot root = ComponentUtils.findViewRoot(faceletContext, parent);
UIComponent component = application.createComponent(getSubComponentType());
final String uid;
if (fieldIdAttribute != null) {
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/resources/META-INF/tobago-extension.taglib.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/resources/META-INF/tobago-extension.taglib.xml?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/resources/META-INF/tobago-extension.taglib.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/resources/META-INF/tobago-extension.taglib.xml Fri Feb 22 14:22:36 2013
@@ -16,9 +16,160 @@
* limitations under the License.
-->
-<!DOCTYPE facelet-taglib PUBLIC
- "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
- "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
-<facelet-taglib>
- <library-class>org.apache.myfaces.tobago.facelets.extension.TobagoExtensionTagLibrary</library-class>
-</facelet-taglib>
\ No newline at end of file
+<facelet-taglib
+ version="2.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd">
+
+ <namespace>http://myfaces.apache.org/tobago/extension</namespace>
+
+ <!-- TODO: generate this content -->
+
+ <tag>
+ <tag-name>date</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.ExtensionPanel</component-type>
+ <renderer-type>Panel</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.extension.DateExtensionHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>file</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.ExtensionPanel</component-type>
+ <renderer-type>Panel</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.extension.FileExtensionHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>in</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.ExtensionPanel</component-type>
+ <renderer-type>Panel</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.extension.InExtensionHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>menuCheckbox</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.MenuCommand</component-type>
+ <renderer-type>MenuCommand</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.extension.MenuCheckboxExtensionHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>menuRadio</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.MenuCommand</component-type>
+ <renderer-type>MenuCommand</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.extension.MenuRadioExtensionHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>selectBooleanCheckbox</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.ExtensionPanel</component-type>
+ <renderer-type>Panel</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.extension.SelectBooleanCheckboxExtensionHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>selectManyCheckbox</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.ExtensionPanel</component-type>
+ <renderer-type>Panel</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.extension.SelectManyCheckboxExtensionHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>selectManyListbox</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.ExtensionPanel</component-type>
+ <renderer-type>Panel</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.extension.SelectManyListboxExtensionHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>selectManyShuttle</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.ExtensionPanel</component-type>
+ <renderer-type>Panel</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.extension.SelectManyShuttleExtensionHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>selectOneChoice</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.ExtensionPanel</component-type>
+ <renderer-type>Panel</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.extension.SelectOneChoiceExtensionHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>selectOneRadio</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.ExtensionPanel</component-type>
+ <renderer-type>Panel</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.extension.SelectOneRadioExtensionHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>selectOneListbox</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.ExtensionPanel</component-type>
+ <renderer-type>Panel</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.extension.SelectOneListboxExtensionHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>separator</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Separator</component-type>
+ <renderer-type>Separator</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.extension.SeparatorExtensionHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>textarea</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.ExtensionPanel</component-type>
+ <renderer-type>Panel</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.extension.TextareaExtensionHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>time</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.ExtensionPanel</component-type>
+ <renderer-type>Panel</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.extension.TimeExtensionHandler</handler-class>
+ </component>
+ </tag>
+
+<!--
+ <tag>
+ <tag-name>wizard</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Wizard</component-type>
+ <renderer-type>Wizard</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+-->
+
+</facelet-taglib>
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/resources/META-INF/tobago-facelet-extension.taglib.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/resources/META-INF/tobago-facelet-extension.taglib.xml?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/resources/META-INF/tobago-facelet-extension.taglib.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/resources/META-INF/tobago-facelet-extension.taglib.xml Fri Feb 22 14:22:36 2013
@@ -16,11 +16,16 @@
* limitations under the License.
-->
-<!DOCTYPE facelet-taglib PUBLIC
- "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
- "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
-<facelet-taglib>
+<facelet-taglib
+ version="2.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd">
+
<namespace>http://myfaces.apache.org/tobago/facelet-extension</namespace>
+
+ <!-- TBD: the future of this lib -->
+
<tag>
<tag-name>in</tag-name>
<source>in.xml</source>
@@ -109,4 +114,4 @@
<tag-name>wizard-navigation</tag-name>
<source>wizard-navigation.xml</source>
</tag>
-</facelet-taglib>
\ No newline at end of file
+</facelet-taglib>
Added: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/resources/META-INF/tobago.faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/resources/META-INF/tobago.faces-config.xml?rev=1449056&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/resources/META-INF/tobago.faces-config.xml (added)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/resources/META-INF/tobago.faces-config.xml Fri Feb 22 14:22:36 2013
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+<faces-config
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
+
+</faces-config>
Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/resources/META-INF/tobago.taglib.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/resources/META-INF/tobago.taglib.xml?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/resources/META-INF/tobago.taglib.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/resources/META-INF/tobago.taglib.xml Fri Feb 22 14:22:36 2013
@@ -16,9 +16,695 @@
* limitations under the License.
-->
-<!DOCTYPE facelet-taglib PUBLIC
- "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
- "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
-<facelet-taglib>
- <library-class>org.apache.myfaces.tobago.facelets.TobagoTagLibrary</library-class>
+<facelet-taglib
+ version="2.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd">
+
+ <namespace>http://myfaces.apache.org/tobago/component</namespace>
+
+ <!-- TODO: generate this content -->
+
+ <tag>
+ <tag-name>attribute</tag-name>
+ <handler-class>org.apache.myfaces.tobago.facelets.AttributeHandler</handler-class>
+ </tag>
+
+ <tag>
+ <tag-name>box</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Box</component-type>
+ <renderer-type>Box</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>button</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Button</component-type>
+ <renderer-type>Button</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>calendar</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Calendar</component-type>
+ <renderer-type>Calendar</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>cell</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Cell</component-type>
+ <renderer-type>Cell</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>columnEvent</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.ColumnEvent</component-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>columnNode</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.ColumnNode</component-type>
+ <renderer-type>TreeNode</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>columnSelector</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.ColumnSelector</component-type>
+ <renderer-type>ColumnSelector</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>column</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Column</component-type>
+ <renderer-type>Column</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>command</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Command</component-type>
+ <renderer-type>Command</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>converter</tag-name>
+ <handler-class>org.apache.myfaces.tobago.facelets.ConverterHandler</handler-class>
+ </tag>
+
+ <tag>
+ <tag-name>dataAttribute</tag-name>
+ <handler-class>org.apache.myfaces.tobago.facelets.DataAttributeHandler</handler-class>
+ </tag>
+
+ <tag>
+ <tag-name>datePicker</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.DatePicker</component-type>
+ <renderer-type>DatePicker</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>date</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Date</component-type>
+ <renderer-type>Date</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>file</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.File</component-type>
+ <renderer-type>File</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>flowLayout</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.FlowLayout</component-type>
+ <renderer-type>FlowLayout</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>form</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Form</component-type>
+ <renderer-type>Form</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>gridLayout</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.GridLayout</component-type>
+ <renderer-type>GridLayout</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>gridLayoutConstraint</tag-name>
+ <handler-class>org.apache.myfaces.tobago.facelets.GridLayoutConstraintHandler</handler-class>
+ </tag>
+
+ <tag>
+ <tag-name>hidden</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Hidden</component-type>
+ <renderer-type>Hidden</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>image</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Image</component-type>
+ <renderer-type>Image</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>in</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.In</component-type>
+ <renderer-type>In</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>label</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Label</component-type>
+ <renderer-type>Label</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>link</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Link</component-type>
+ <renderer-type>Link</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>loadBundle</tag-name>
+ <handler-class>org.apache.myfaces.tobago.facelets.LoadBundleHandler</handler-class>
+ </tag>
+
+ <tag>
+ <tag-name>mediator</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Mediator</component-type>
+ <renderer-type>Mediator</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>menuBar</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.MenuBar</component-type>
+ <renderer-type>MenuBar</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>menuCommand</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.MenuCommand</component-type>
+ <renderer-type>MenuCommand</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>menuItem</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.MenuItem</component-type>
+ <renderer-type>MenuCommand</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>menuSeparator</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.MenuSeparator</component-type>
+ <renderer-type>MenuSeparator</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>menu</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Menu</component-type>
+ <renderer-type>Menu</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>messages</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Messages</component-type>
+ <renderer-type>Messages</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>object</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Object</component-type>
+ <renderer-type>Object</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>out</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Out</component-type>
+ <renderer-type>Out</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>page</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Page</component-type>
+ <renderer-type>Page</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>panel</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Panel</component-type>
+ <renderer-type>Panel</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>popup</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Popup</component-type>
+ <renderer-type>Popup</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>popupReference</tag-name>
+ <handler-class>org.apache.myfaces.tobago.facelets.PopupReferenceHandler</handler-class>
+ </tag>
+
+ <tag>
+ <tag-name>progress</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Progress</component-type>
+ <renderer-type>Progress</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>reload</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Reload</component-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>resetInputActionListener</tag-name>
+ <handler-class>org.apache.myfaces.tobago.facelets.ResetInputActionListenerHandler</handler-class>
+ </tag>
+
+ <tag>
+ <tag-name>script</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Script</component-type>
+ <renderer-type>Script</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.ScriptHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>selectBooleanCheckbox</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.SelectBooleanCheckbox</component-type>
+ <renderer-type>SelectBooleanCheckbox</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+ <tag>
+ <tag-name>selectItem</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.SelectItem</component-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>selectItems</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.SelectItems</component-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>selectManyCheckbox</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.SelectManyCheckbox</component-type>
+ <renderer-type>SelectManyCheckbox</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>selectManyListbox</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.SelectManyListbox</component-type>
+ <renderer-type>SelectManyListbox</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>selectManyShuttle</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.SelectManyShuttle</component-type>
+ <renderer-type>SelectManyShuttle</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>selectOneChoice</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.SelectOneChoice</component-type>
+ <renderer-type>SelectOneChoice</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>selectOneListbox</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.SelectOneListbox</component-type>
+ <renderer-type>SelectOneListbox</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>selectOneRadio</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.SelectOneRadio</component-type>
+ <renderer-type>SelectOneRadio</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>selectReference</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.SelectReference</component-type>
+ <renderer-type>SelectReference</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>separator</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Separator</component-type>
+ <renderer-type>Separator</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>sheetLayout</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.SheetLayout</component-type>
+ <renderer-type>SheetLayout</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>sheet</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Sheet</component-type>
+ <renderer-type>Sheet</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>style</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Style</component-type>
+ <renderer-type>Style</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.StyleHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>tabChangeListener</tag-name>
+ <handler-class>org.apache.myfaces.tobago.facelets.TabChangeListenerHandler</handler-class>
+ </tag>
+
+ <tag>
+ <tag-name>tabGroupLayout</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.TabGroupLayout</component-type>
+ <renderer-type>TabGroupLayout</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>tabGroup</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.TabGroup</component-type>
+ <renderer-type>TabGroup</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>tab</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Tab</component-type>
+ <renderer-type>Tab</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>textarea</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Textarea</component-type>
+ <renderer-type>Textarea</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>time</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Time</component-type>
+ <renderer-type>Time</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>toolBarCommand</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.ToolBarCommand</component-type>
+ <renderer-type>Button</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>toolBarCheck</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.ToolBarCheck</component-type>
+ <renderer-type>MenuCommand</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>toolBarSelectOne</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.ToolBarSelectOne</component-type>
+ <renderer-type>MenuCommand</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>toolBarSeparator</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.ToolBarSeparator</component-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>toolBar</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.ToolBar</component-type>
+ <renderer-type>ToolBar</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>treeCommand</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.TreeCommand</component-type>
+ <renderer-type>TreeCommand</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>treeData</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.TreeData</component-type>
+ <renderer-type>TreeData</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>treeIcon</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.TreeIcon</component-type>
+ <renderer-type>TreeIcon</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>treeIndent</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.TreeIndent</component-type>
+ <renderer-type>TreeIndent</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>treeLabel</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.TreeLabel</component-type>
+ <renderer-type>TreeLabel</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>treeListbox</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.TreeListbox</component-type>
+ <renderer-type>TreeListbox</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>treeMenu</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.TreeMenu</component-type>
+ <renderer-type>TreeMenu</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>treeNode</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.TreeNode</component-type>
+ <renderer-type>TreeNode</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>treeSelect</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.TreeSelect</component-type>
+ <renderer-type>TreeSelect</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>tree</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Tree</component-type>
+ <renderer-type>Tree</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+
+<!-- TBD
+ <tag>
+ <tag-name>wizard</tag-name>
+ <component>
+ <component-type>org.apache.myfaces.tobago.Wizard</component-type>
+ <renderer-type>Wizard</renderer-type>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoComponentHandler</handler-class>
+ </component>
+ </tag>
+-->
+
+ <tag>
+ <tag-name>validateFileItem</tag-name>
+ <validator>
+ <validator-id>org.apache.myfaces.tobago.FileItem</validator-id>
+ <handler-class>org.apache.myfaces.tobago.facelets.TobagoValidateHandler</handler-class>
+ </validator>
+ </tag>
+
+ <tag>
+ <tag-name>validateSubmittedValueLength</tag-name>
+ <validator>
+ <validator-id>org.apache.myfaces.tobago.SubmittedValueLength</validator-id>
+ </validator>
+ </tag>
+
</facelet-taglib>
Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml Fri Feb 22 14:22:36 2013
@@ -32,9 +32,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
-<!--
- <version>1.0</version>
--->
<executions>
<execution>
<id>add-source</id>
@@ -173,6 +170,20 @@
</resources>
</configuration>
</execution>
+ <execution>
+ <id>copy-tld</id>
+ <goals><goal>copy-resources</goal></goals>
+ <phase>process-classes</phase>
+ <configuration>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ <resources>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>${project.build.directory}/generated-tld</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
@@ -260,11 +271,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- <version>${facelets.version}</version>
- </dependency>
- <dependency>
<groupId>maven-taglib</groupId>
<artifactId>maven-taglib-plugin</artifactId>
</dependency>
Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-facelet-sandbox.taglib.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-facelet-sandbox.taglib.xml?rev=1449056&r1=1449055&r2=1449056&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-facelet-sandbox.taglib.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-facelet-sandbox.taglib.xml Fri Feb 22 14:22:36 2013
@@ -15,20 +15,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-<!DOCTYPE facelet-taglib PUBLIC "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
- "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
-<facelet-taglib>
+<facelet-taglib
+ version="2.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd">
+
<namespace>http://myfaces.apache.org/tobago/facelet-sandbox</namespace>
+
+ <!-- TBD: the future of this lib -->
+
<tag>
<tag-name>crud</tag-name>
<source>crud.xml</source>
</tag>
+
<tag>
<tag-name>crud-master-navigation</tag-name>
<source>crud-master-navigation.xml</source>
</tag>
+
<tag>
<tag-name>crud-detail-navigation</tag-name>
<source>crud-detail-navigation.xml</source>
</tag>
+
</facelet-taglib>