You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2008/01/30 03:59:04 UTC
svn commit: r616601 [7/7] - in /myfaces/tomahawk/branches/1_2_0: ./
assembly/ core/ core/src/main/conf/ core/src/main/java-templates/
core/src/main/java-templates/org/ core/src/main/java-templates/org/apache/
core/src/main/java-templates/org/apache/myf...
Added: myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/navmenu/_MethodBindingToMethodExpression.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/navmenu/_MethodBindingToMethodExpression.java?rev=616601&view=auto
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/navmenu/_MethodBindingToMethodExpression.java (added)
+++ myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/navmenu/_MethodBindingToMethodExpression.java Tue Jan 29 18:58:48 2008
@@ -0,0 +1,244 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed 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.custom.navmenu;
+
+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.component.StateHolder;
+import javax.faces.context.FacesContext;
+import javax.faces.el.EvaluationException;
+import javax.faces.el.MethodBinding;
+
+import org.apache.myfaces.shared_tomahawk.util.ClassUtils;
+
+/**
+ * Converts a MethodBinding to a MethodExpression
+ *
+ * TODO: find a way to share the implementation of class with impl.
+ *
+ * @author Stan Silvert
+ */
+@SuppressWarnings("deprecation")
+class _MethodBindingToMethodExpression extends MethodExpression implements StateHolder
+{
+ private static final Class[] EXPECTED_TYPES = new Class[] { MethodBinding.class, StateHolder.class };
+
+ private MethodBinding methodBinding;
+
+ private boolean _transientFlag;
+
+ private transient MethodInfo methodInfo;
+
+ /**
+ * No-arg constructor used during restoreState
+ */
+ protected _MethodBindingToMethodExpression()
+ {
+ }
+
+ /** Creates a new instance of MethodBindingToMethodExpression */
+ public _MethodBindingToMethodExpression(MethodBinding methodBinding)
+ {
+ checkNullArgument(methodBinding, "methodBinding");
+ this.methodBinding = methodBinding;
+ }
+
+ /**
+ * Return the wrapped MethodBinding.
+ */
+ public MethodBinding getMethodBinding()
+ {
+ return methodBinding;
+ }
+
+ void setMethodBinding(MethodBinding methodBinding)
+ {
+ this.methodBinding = methodBinding;
+ }
+
+ /**
+ * Note: MethodInfo.getParamTypes() may incorrectly return an empty class array if invoke() has not been called.
+ *
+ * @throws IllegalStateException
+ * if expected params types have not been determined.
+ */
+ public MethodInfo getMethodInfo(ELContext context) throws PropertyNotFoundException, MethodNotFoundException,
+ ELException
+ {
+ checkNullArgument(context, "elcontext");
+ checkNullState(methodBinding, "methodBinding");
+
+ if (methodInfo == null)
+ {
+ final FacesContext facesContext = (FacesContext) context.getContext(FacesContext.class);
+ if (facesContext != null)
+ {
+ methodInfo = invoke(new Invoker<MethodInfo>()
+ {
+ public MethodInfo invoke()
+ {
+ return new MethodInfo(null, methodBinding.getType(facesContext), null);
+ }
+ });
+ }
+ }
+ return methodInfo;
+ }
+
+ public Object invoke(ELContext context, final Object[] params) throws PropertyNotFoundException,
+ MethodNotFoundException, ELException
+ {
+ checkNullArgument(context, "elcontext");
+ checkNullState(methodBinding, "methodBinding");
+ final FacesContext facesContext = (FacesContext) context.getContext(FacesContext.class);
+ if (facesContext != null)
+ {
+ return invoke(new Invoker<Object>()
+ {
+ public Object invoke()
+ {
+ return methodBinding.invoke(facesContext, params);
+ }
+ });
+ }
+ return null;
+ }
+
+ public boolean isLiteralText()
+ {
+ if (methodBinding == null)
+ throw new IllegalStateException("methodBinding is null");
+ String expr = methodBinding.getExpressionString();
+ return !(expr.startsWith("#{") && expr.endsWith("}"));
+ }
+
+ public String getExpressionString()
+ {
+ return methodBinding.getExpressionString();
+ }
+
+ public Object saveState(FacesContext context)
+ {
+ if (!isTransient())
+ {
+ if (methodBinding instanceof StateHolder)
+ {
+ Object[] state = new Object[2];
+ state[0] = methodBinding.getClass().getName();
+ state[1] = ((StateHolder) methodBinding).saveState(context);
+ return state;
+ }
+ else
+ {
+ return methodBinding;
+ }
+ }
+ return null;
+ }
+
+ public void restoreState(FacesContext context, Object state)
+ {
+ if (state instanceof MethodBinding)
+ {
+ methodBinding = (MethodBinding) state;
+ methodInfo = null;
+ }
+ else if (state != null)
+ {
+ Object[] values = (Object[]) state;
+ methodBinding = (MethodBinding) ClassUtils.newInstance(values[0].toString(), EXPECTED_TYPES);
+ ((StateHolder) methodBinding).restoreState(context, values[1]);
+ methodInfo = null;
+ }
+ }
+
+ public void setTransient(boolean transientFlag)
+ {
+ _transientFlag = transientFlag;
+ }
+
+ public boolean isTransient()
+ {
+ return _transientFlag;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int PRIME = 31;
+ int result = 1;
+ result = PRIME * result + ((methodBinding == null) ? 0 : methodBinding.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ final _MethodBindingToMethodExpression other = (_MethodBindingToMethodExpression) obj;
+ if (methodBinding == null)
+ {
+ if (other.methodBinding != null)
+ return false;
+ }
+ else if (!methodBinding.equals(other.methodBinding))
+ return false;
+ return true;
+ }
+
+ private void checkNullState(Object notNullInstance, String instanceName)
+ {
+ if (notNullInstance == null)
+ throw new IllegalStateException(instanceName + " is null");
+ }
+
+ private void checkNullArgument(Object notNullInstance, String instanceName)
+ {
+ if (notNullInstance == null)
+ throw new IllegalArgumentException(instanceName + " is null");
+ }
+
+ private <T> T invoke(Invoker<T> invoker)
+ {
+ try
+ {
+ return invoker.invoke();
+ }
+ catch (javax.faces.el.MethodNotFoundException e)
+ {
+ throw new MethodNotFoundException(e.getMessage(), e);
+ }
+ catch (EvaluationException e)
+ {
+ throw new ELException(e.getMessage(), e);
+ }
+ }
+
+ private interface Invoker<T>
+ {
+ T invoke();
+ }
+}
Propchange: myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/navmenu/_MethodBindingToMethodExpression.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/navmenu/_MethodBindingToMethodExpression.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/navmenu/_MethodExpressionToMethodBinding.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/navmenu/_MethodExpressionToMethodBinding.java?rev=616601&view=auto
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/navmenu/_MethodExpressionToMethodBinding.java (added)
+++ myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/navmenu/_MethodExpressionToMethodBinding.java Tue Jan 29 18:58:48 2008
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed 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.custom.navmenu;
+
+import javax.el.ELException;
+import javax.el.MethodExpression;
+import javax.faces.component.StateHolder;
+import javax.faces.context.FacesContext;
+import javax.faces.el.EvaluationException;
+import javax.faces.el.MethodBinding;
+import javax.faces.el.MethodNotFoundException;
+
+/**
+ * Converts a MethodExpression to a MethodBinding.
+ * See JSF 1.2 spec section 5.8.4
+ *
+ * ATTENTION: If you make changes to this class, treat
+ * org.apache.myfaces.el.convert.MethodExpressionToMethodBinding
+ * accordingly.
+ *
+ * @author Stan Silvert
+ * @see org.apache.myfaces.el.convert.MethodExpressionToMethodBinding
+ */
+class _MethodExpressionToMethodBinding extends MethodBinding implements StateHolder {
+
+ private MethodExpression methodExpression;
+
+ private boolean isTransient = false;
+
+ public _MethodExpressionToMethodBinding() {
+ methodExpression = null;
+ }
+
+ /** Creates a new instance of MethodExpressionToMethodBinding */
+ public _MethodExpressionToMethodBinding(MethodExpression methodExpression) {
+ this.methodExpression = methodExpression;
+ }
+
+ @Override
+ public String getExpressionString()
+ {
+ return methodExpression.getExpressionString();
+ }
+
+ public Class getType(FacesContext facesContext)
+ throws MethodNotFoundException {
+
+ try {
+ return methodExpression.getMethodInfo(facesContext.getELContext()).getReturnType();
+ } catch (javax.el.MethodNotFoundException e) {
+ throw new javax.faces.el.MethodNotFoundException(e);
+ } catch (ELException e) {
+ throw new EvaluationException(e);
+ }
+ }
+
+ public Object invoke(FacesContext facesContext, Object[] params)
+ throws EvaluationException, MethodNotFoundException {
+
+ try {
+ return methodExpression.invoke(facesContext.getELContext(), params);
+ } catch (javax.el.MethodNotFoundException e) {
+ throw new javax.faces.el.MethodNotFoundException(e);
+ } catch (ELException e) {
+ throw new EvaluationException(e);
+ }
+ }
+
+// -------- StateHolder methods -------------------------------------------
+
+ public void restoreState(FacesContext context, Object state) {
+ if(state != null)
+ methodExpression = (MethodExpression)state;
+ }
+
+ public Object saveState(FacesContext context) {
+ if(!isTransient)
+ return methodExpression;
+ return null;
+ }
+
+ public void setTransient(boolean newTransientValue) {
+ isTransient = newTransientValue;
+ }
+
+ public boolean isTransient() {
+ return isTransient;
+ }
+
+}
Propchange: myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/navmenu/_MethodExpressionToMethodBinding.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/navmenu/_MethodExpressionToMethodBinding.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/schedule/UISchedule.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/schedule/UISchedule.java?rev=616601&r1=616600&r2=616601&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/schedule/UISchedule.java (original)
+++ myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/schedule/UISchedule.java Tue Jan 29 18:58:48 2008
@@ -22,6 +22,8 @@
import java.util.Date;
import java.util.Iterator;
+import javax.el.MethodExpression;
+import javax.el.ValueExpression;
import javax.faces.component.ActionSource;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
@@ -68,14 +70,14 @@
}
private static final long serialVersionUID = -8333458172939036755L;
- private MethodBinding _action;
+ //private MethodBinding _action;
private MethodBinding _actionListener;
private ScheduleActionListener _scheduleListener;
private ScheduleEntry _submittedEntry;
private Date _lastClickedDateAndTime = null;
- private MethodBinding _mouseListener = null;
+
public UISchedule()
{
@@ -152,11 +154,116 @@
return null;
}
+
+ /**
+ * @deprecated Use setActionExpression instead.
+ */
+ public void setAction(MethodBinding action)
+ {
+ if(action != null)
+ {
+ setActionExpression(new _MethodBindingToMethodExpression(action));
+ }
+ else
+ {
+ setActionExpression(null);
+ }
+ }
+ /**
+ * @deprecated Use getActionExpression() instead.
+ */
public MethodBinding getAction()
{
- return _action;
+ MethodExpression actionExpression = getActionExpression();
+ if (actionExpression instanceof _MethodBindingToMethodExpression) {
+ return ((_MethodBindingToMethodExpression)actionExpression).getMethodBinding();
+ }
+ if(actionExpression != null)
+ {
+ return new _MethodExpressionToMethodBinding(actionExpression);
+ }
+ return null;
}
+
+ // Property: actionExpression
+ private MethodExpression _actionExpression;
+
+ /**
+ * Gets Specifies the action to take when this command is invoked.
+ * If the value is an expression, it is expected to be a method
+ * binding EL expression that identifies an action method. An action method
+ * accepts no parameters and has a String return value, called the action
+ * outcome, that identifies the next view displayed. The phase that this
+ * event is fired in can be controlled via the immediate attribute.
+ *
+ * If the value is a string literal, it is treated as a navigation outcome
+ * for the current view. This is functionally equivalent to a reference to
+ * an action method that returns the string literal.
+ *
+ * @return the new actionExpression value
+ */
+ public MethodExpression getActionExpression()
+ {
+ if (_actionExpression != null)
+ {
+ return _actionExpression;
+ }
+ ValueExpression expression = getValueExpression("actionExpression");
+ if (expression != null)
+ {
+ return (MethodExpression)expression.getValue(getFacesContext().getELContext());
+ }
+ return null;
+ }
+
+ /**
+ * Sets Specifies the action to take when this command is invoked.
+ * If the value is an expression, it is expected to be a method
+ * binding EL expression that identifies an action method. An action method
+ * accepts no parameters and has a String return value, called the action
+ * outcome, that identifies the next view displayed. The phase that this
+ * event is fired in can be controlled via the immediate attribute.
+ *
+ * If the value is a string literal, it is treated as a navigation outcome
+ * for the current view. This is functionally equivalent to a reference to
+ * an action method that returns the string literal.
+ *
+ * @param actionExpression the new actionExpression value
+ */
+ public void setActionExpression(MethodExpression actionExpression)
+ {
+ this._actionExpression = actionExpression;
+ }
+
+
+ // Property: mouseListenerExpression
+ private MethodExpression _mouseListenerExpression;
+
+ public MethodExpression getMouseListenerExpression()
+ {
+ if (_mouseListenerExpression != null)
+ {
+ return _mouseListenerExpression;
+ }
+ ValueExpression expression = getValueExpression("mouseListenerExpression");
+ if (expression != null)
+ {
+ return (MethodExpression)expression.getValue(getFacesContext().getELContext());
+ }
+ return null;
+ }
+
+ public void setMouseListenerExpression(MethodExpression mouseListenerExpression)
+ {
+ this._mouseListenerExpression = mouseListenerExpression;
+ }
+
+ /*
+ public MethodBinding getAction()
+ {
+ return _action;
+ }*/
public MethodBinding getActionListener()
{
@@ -178,15 +285,39 @@
{
return _lastClickedDateAndTime;
}
+
+ /**
+ * @deprecated Use setMouseListenerExpression instead.
+ */
+ public void setMouseListener(MethodBinding mouseListener)
+ {
+ if(mouseListener != null)
+ {
+ setMouseListenerExpression(new _MethodBindingToMethodExpression(mouseListener));
+ }
+ else
+ {
+ setMouseListenerExpression(null);
+ }
+ }
/**
- * @return the method binding to the mouse listener method
+ * @deprecated Use getMouseListenerExpression() instead.
*/
public MethodBinding getMouseListener()
{
- return _mouseListener;
+ MethodExpression mouseListenerExpression = getMouseListenerExpression();
+ if (mouseListenerExpression instanceof _MethodBindingToMethodExpression) {
+ return ((_MethodBindingToMethodExpression)mouseListenerExpression).getMethodBinding();
+ }
+ if(mouseListenerExpression != null)
+ {
+ return new _MethodExpressionToMethodBinding(mouseListenerExpression);
+ }
+ return null;
}
-
+
+
/**
* @return the submittedEntry
*/
@@ -242,8 +373,8 @@
_lastClickedDateAndTime = (Date) values[1];
_actionListener = (MethodBinding) restoreAttachedState(context,
values[2]);
- _action = (MethodBinding) restoreAttachedState(context, values[3]);
- _mouseListener = (MethodBinding) restoreAttachedState(context, values[4]);
+ _actionExpression = (MethodExpression) restoreAttachedState(context, values[3]);
+ _mouseListenerExpression = (MethodExpression) restoreAttachedState(context, values[4]);
addActionListener(_scheduleListener);
}
@@ -258,19 +389,12 @@
values[0] = super.saveState(context);
values[1] = _lastClickedDateAndTime;
values[2] = saveAttachedState(context, _actionListener);
- values[3] = saveAttachedState(context, _action);
- values[4] = saveAttachedState(context, _mouseListener);
+ values[3] = saveAttachedState(context, _actionExpression);
+ values[4] = saveAttachedState(context, _mouseListenerExpression);
return values;
}
-
-
- public void setAction(MethodBinding action)
- {
- this._action = action;
- }
-
public void setActionListener(MethodBinding actionListener)
{
this._actionListener = actionListener;
@@ -289,14 +413,6 @@
this._lastClickedDateAndTime = lastClickedDateAndTime;
}
-
- /**
- * @param listener the method binding to the mouse listener method
- */
- public void setMouseListener(MethodBinding listener)
- {
- _mouseListener = listener;
- }
/**
* @param submittedEntry the submittedEntry to set
Added: myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/schedule/_MethodBindingToMethodExpression.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/schedule/_MethodBindingToMethodExpression.java?rev=616601&view=auto
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/schedule/_MethodBindingToMethodExpression.java (added)
+++ myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/schedule/_MethodBindingToMethodExpression.java Tue Jan 29 18:58:48 2008
@@ -0,0 +1,244 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed 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.custom.schedule;
+
+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.component.StateHolder;
+import javax.faces.context.FacesContext;
+import javax.faces.el.EvaluationException;
+import javax.faces.el.MethodBinding;
+
+import org.apache.myfaces.shared_tomahawk.util.ClassUtils;
+
+/**
+ * Converts a MethodBinding to a MethodExpression
+ *
+ * TODO: find a way to share the implementation of class with impl.
+ *
+ * @author Stan Silvert
+ */
+@SuppressWarnings("deprecation")
+class _MethodBindingToMethodExpression extends MethodExpression implements StateHolder
+{
+ private static final Class[] EXPECTED_TYPES = new Class[] { MethodBinding.class, StateHolder.class };
+
+ private MethodBinding methodBinding;
+
+ private boolean _transientFlag;
+
+ private transient MethodInfo methodInfo;
+
+ /**
+ * No-arg constructor used during restoreState
+ */
+ protected _MethodBindingToMethodExpression()
+ {
+ }
+
+ /** Creates a new instance of MethodBindingToMethodExpression */
+ public _MethodBindingToMethodExpression(MethodBinding methodBinding)
+ {
+ checkNullArgument(methodBinding, "methodBinding");
+ this.methodBinding = methodBinding;
+ }
+
+ /**
+ * Return the wrapped MethodBinding.
+ */
+ public MethodBinding getMethodBinding()
+ {
+ return methodBinding;
+ }
+
+ void setMethodBinding(MethodBinding methodBinding)
+ {
+ this.methodBinding = methodBinding;
+ }
+
+ /**
+ * Note: MethodInfo.getParamTypes() may incorrectly return an empty class array if invoke() has not been called.
+ *
+ * @throws IllegalStateException
+ * if expected params types have not been determined.
+ */
+ public MethodInfo getMethodInfo(ELContext context) throws PropertyNotFoundException, MethodNotFoundException,
+ ELException
+ {
+ checkNullArgument(context, "elcontext");
+ checkNullState(methodBinding, "methodBinding");
+
+ if (methodInfo == null)
+ {
+ final FacesContext facesContext = (FacesContext) context.getContext(FacesContext.class);
+ if (facesContext != null)
+ {
+ methodInfo = invoke(new Invoker<MethodInfo>()
+ {
+ public MethodInfo invoke()
+ {
+ return new MethodInfo(null, methodBinding.getType(facesContext), null);
+ }
+ });
+ }
+ }
+ return methodInfo;
+ }
+
+ public Object invoke(ELContext context, final Object[] params) throws PropertyNotFoundException,
+ MethodNotFoundException, ELException
+ {
+ checkNullArgument(context, "elcontext");
+ checkNullState(methodBinding, "methodBinding");
+ final FacesContext facesContext = (FacesContext) context.getContext(FacesContext.class);
+ if (facesContext != null)
+ {
+ return invoke(new Invoker<Object>()
+ {
+ public Object invoke()
+ {
+ return methodBinding.invoke(facesContext, params);
+ }
+ });
+ }
+ return null;
+ }
+
+ public boolean isLiteralText()
+ {
+ if (methodBinding == null)
+ throw new IllegalStateException("methodBinding is null");
+ String expr = methodBinding.getExpressionString();
+ return !(expr.startsWith("#{") && expr.endsWith("}"));
+ }
+
+ public String getExpressionString()
+ {
+ return methodBinding.getExpressionString();
+ }
+
+ public Object saveState(FacesContext context)
+ {
+ if (!isTransient())
+ {
+ if (methodBinding instanceof StateHolder)
+ {
+ Object[] state = new Object[2];
+ state[0] = methodBinding.getClass().getName();
+ state[1] = ((StateHolder) methodBinding).saveState(context);
+ return state;
+ }
+ else
+ {
+ return methodBinding;
+ }
+ }
+ return null;
+ }
+
+ public void restoreState(FacesContext context, Object state)
+ {
+ if (state instanceof MethodBinding)
+ {
+ methodBinding = (MethodBinding) state;
+ methodInfo = null;
+ }
+ else if (state != null)
+ {
+ Object[] values = (Object[]) state;
+ methodBinding = (MethodBinding) ClassUtils.newInstance(values[0].toString(), EXPECTED_TYPES);
+ ((StateHolder) methodBinding).restoreState(context, values[1]);
+ methodInfo = null;
+ }
+ }
+
+ public void setTransient(boolean transientFlag)
+ {
+ _transientFlag = transientFlag;
+ }
+
+ public boolean isTransient()
+ {
+ return _transientFlag;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int PRIME = 31;
+ int result = 1;
+ result = PRIME * result + ((methodBinding == null) ? 0 : methodBinding.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ final _MethodBindingToMethodExpression other = (_MethodBindingToMethodExpression) obj;
+ if (methodBinding == null)
+ {
+ if (other.methodBinding != null)
+ return false;
+ }
+ else if (!methodBinding.equals(other.methodBinding))
+ return false;
+ return true;
+ }
+
+ private void checkNullState(Object notNullInstance, String instanceName)
+ {
+ if (notNullInstance == null)
+ throw new IllegalStateException(instanceName + " is null");
+ }
+
+ private void checkNullArgument(Object notNullInstance, String instanceName)
+ {
+ if (notNullInstance == null)
+ throw new IllegalArgumentException(instanceName + " is null");
+ }
+
+ private <T> T invoke(Invoker<T> invoker)
+ {
+ try
+ {
+ return invoker.invoke();
+ }
+ catch (javax.faces.el.MethodNotFoundException e)
+ {
+ throw new MethodNotFoundException(e.getMessage(), e);
+ }
+ catch (EvaluationException e)
+ {
+ throw new ELException(e.getMessage(), e);
+ }
+ }
+
+ private interface Invoker<T>
+ {
+ T invoke();
+ }
+}
Propchange: myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/schedule/_MethodBindingToMethodExpression.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/schedule/_MethodBindingToMethodExpression.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/schedule/_MethodExpressionToMethodBinding.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/schedule/_MethodExpressionToMethodBinding.java?rev=616601&view=auto
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/schedule/_MethodExpressionToMethodBinding.java (added)
+++ myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/schedule/_MethodExpressionToMethodBinding.java Tue Jan 29 18:58:48 2008
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed 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.custom.schedule;
+
+import javax.el.ELException;
+import javax.el.MethodExpression;
+import javax.faces.component.StateHolder;
+import javax.faces.context.FacesContext;
+import javax.faces.el.EvaluationException;
+import javax.faces.el.MethodBinding;
+import javax.faces.el.MethodNotFoundException;
+
+/**
+ * Converts a MethodExpression to a MethodBinding.
+ * See JSF 1.2 spec section 5.8.4
+ *
+ * ATTENTION: If you make changes to this class, treat
+ * org.apache.myfaces.el.convert.MethodExpressionToMethodBinding
+ * accordingly.
+ *
+ * @author Stan Silvert
+ * @see org.apache.myfaces.el.convert.MethodExpressionToMethodBinding
+ */
+class _MethodExpressionToMethodBinding extends MethodBinding implements StateHolder {
+
+ private MethodExpression methodExpression;
+
+ private boolean isTransient = false;
+
+ public _MethodExpressionToMethodBinding() {
+ methodExpression = null;
+ }
+
+ /** Creates a new instance of MethodExpressionToMethodBinding */
+ public _MethodExpressionToMethodBinding(MethodExpression methodExpression) {
+ this.methodExpression = methodExpression;
+ }
+
+ @Override
+ public String getExpressionString()
+ {
+ return methodExpression.getExpressionString();
+ }
+
+ public Class getType(FacesContext facesContext)
+ throws MethodNotFoundException {
+
+ try {
+ return methodExpression.getMethodInfo(facesContext.getELContext()).getReturnType();
+ } catch (javax.el.MethodNotFoundException e) {
+ throw new javax.faces.el.MethodNotFoundException(e);
+ } catch (ELException e) {
+ throw new EvaluationException(e);
+ }
+ }
+
+ public Object invoke(FacesContext facesContext, Object[] params)
+ throws EvaluationException, MethodNotFoundException {
+
+ try {
+ return methodExpression.invoke(facesContext.getELContext(), params);
+ } catch (javax.el.MethodNotFoundException e) {
+ throw new javax.faces.el.MethodNotFoundException(e);
+ } catch (ELException e) {
+ throw new EvaluationException(e);
+ }
+ }
+
+// -------- StateHolder methods -------------------------------------------
+
+ public void restoreState(FacesContext context, Object state) {
+ if(state != null)
+ methodExpression = (MethodExpression)state;
+ }
+
+ public Object saveState(FacesContext context) {
+ if(!isTransient)
+ return methodExpression;
+ return null;
+ }
+
+ public void setTransient(boolean newTransientValue) {
+ isTransient = newTransientValue;
+ }
+
+ public boolean isTransient() {
+ return isTransient;
+ }
+
+}
Propchange: myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/schedule/_MethodExpressionToMethodBinding.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/schedule/_MethodExpressionToMethodBinding.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/tree/HtmlTree.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/tree/HtmlTree.java?rev=616601&r1=616600&r2=616601&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/tree/HtmlTree.java (original)
+++ myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/tree/HtmlTree.java Tue Jan 29 18:58:48 2008
@@ -28,7 +28,7 @@
import javax.faces.component.UIViewRoot;
import javax.faces.component.html.HtmlPanelGroup;
import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
+import javax.el.ValueExpression;
import org.apache.myfaces.custom.tree.event.TreeSelectionEvent;
import org.apache.myfaces.custom.tree.event.TreeSelectionListener;
@@ -107,11 +107,11 @@
public TreeModel getModel(FacesContext context)
{
- ValueBinding binding = getValueBinding("model");
+ ValueExpression binding = getValueExpression("model");
if (binding != null)
{
- TreeModel model = (TreeModel) binding.getValue(context);
+ TreeModel model = (TreeModel) binding.getValue(context.getELContext());
if (model != null)
{
return model;
@@ -168,10 +168,10 @@
{
return value;
}
- ValueBinding vb = getValueBinding(vbName);
+ ValueExpression vb = getValueExpression(vbName);
if(vb != null)
{
- Object obj = vb.getValue(getFacesContext());
+ Object obj = vb.getValue(getFacesContext().getELContext());
if(obj != null)
{
return obj.toString();
@@ -419,10 +419,10 @@
{
return expireListeners.longValue();
}
- ValueBinding vb = getValueBinding("expireListeners");
+ ValueExpression vb = getValueExpression("expireListeners");
if(vb != null)
{
- Object obj = vb.getValue(getFacesContext());
+ Object obj = vb.getValue(getFacesContext().getELContext());
if(obj instanceof java.lang.Number)
{
return ((java.lang.Number)obj).longValue();
Modified: myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeTag.java?rev=616601&r1=616600&r2=616601&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeTag.java (original)
+++ myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeTag.java Tue Jan 29 18:58:48 2008
@@ -22,11 +22,12 @@
import org.apache.myfaces.custom.tree.model.TreeModel;
import org.apache.myfaces.custom.tree.model.TreePath;
import org.apache.myfaces.custom.tree.HtmlTree;
-import org.apache.myfaces.shared_tomahawk.taglib.UIComponentTagBase;
+
+import javax.el.ValueExpression;
+import javax.faces.webapp.UIComponentELTag;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
import javax.servlet.jsp.JspException;
/**
@@ -37,57 +38,8 @@
* @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller </a>
* @version $Revision$ $Date: 2004/10/13 11:50:58
*/
-public class TreeTag extends UIComponentTagBase {
-
- private String value;
-
- private String var;
-
- private String iconLine;
-
- private String iconNoline;
-
- private String iconChildFirst;
-
- private String iconChildMiddle;
-
- private String iconChildLast;
-
- private String iconNodeOpen;
-
- private String iconNodeOpenFirst;
-
- private String iconNodeOpenMiddle;
-
- private String iconNodeOpenLast;
-
- private String iconNodeClose;
-
- private String iconNodeCloseFirst;
-
- private String iconNodeCloseMiddle;
+public class TreeTag extends UIComponentELTag {
- private String iconNodeCloseLast;
-
- private String styleClass;
-
- private String rowClasses;
-
- private String columnClasses;
-
- private String headerClass;
-
- private String footerClass;
-
- private String nodeClass;
-
- private String selectedNodeClass;
-
- private String iconClass;
-
- private boolean expandRoot;
-
- private String expireListeners;
public String getComponentType() {
return "org.apache.myfaces.HtmlTree";
@@ -96,240 +48,170 @@
public String getRendererType() {
return "org.apache.myfaces.HtmlTree";
}
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String newValue) {
- value = newValue;
- }
-
- /**
- * @return Returns the var.
- */
- public String getVar() {
- return var;
- }
-
- /**
- * @param var
- * The var to set.
- */
- public void setVar(String var) {
- this.var = var;
- }
-
- public String getIconLine() {
- return iconLine;
- }
-
- public void setIconLine(String iconLine) {
- this.iconLine = iconLine;
- }
-
- public String getIconNoline() {
- return iconNoline;
- }
-
- public void setIconNoline(String iconNoline) {
- this.iconNoline = iconNoline;
- }
-
- /**
- * @return Returns the rowClasses.
- */
- public String getRowClasses() {
- return rowClasses;
- }
-
- /**
- * @param rowClasses
- * The rowClasses to set.
- */
- public void setRowClasses(String rowClasses) {
- this.rowClasses = rowClasses;
- }
-
- /**
- * @return Returns the columnClasses.
- */
- public String getColumnClasses() {
- return columnClasses;
- }
-
- /**
- * @param columnClasses
- * The columnClasses to set.
- */
- public void setColumnClasses(String columnClasses) {
- this.columnClasses = columnClasses;
+
+ private ValueExpression _style;
+ public void setStyle(ValueExpression style)
+ {
+ _style = style;
}
- public String getIconChildFirst() {
- return iconChildFirst;
+ private ValueExpression _styleClass;
+ public void setStyleClass(ValueExpression styleClass)
+ {
+ _styleClass = styleClass;
}
- public void setIconChildFirst(String iconChildFirst) {
- this.iconChildFirst = iconChildFirst;
+ private ValueExpression _layout;
+ public void setLayout(ValueExpression layout)
+ {
+ _layout = layout;
}
- public String getIconChildMiddle() {
- return iconChildMiddle;
+ private ValueExpression _value;
+ public void setValue(ValueExpression value)
+ {
+ _value = value;
}
- public void setIconChildMiddle(String iconChildMiddle) {
- this.iconChildMiddle = iconChildMiddle;
+ private ValueExpression _var;
+ public void setVar(ValueExpression var)
+ {
+ _var = var;
}
- public String getIconChildLast() {
- return iconChildLast;
+ private ValueExpression _nodeClass;
+ public void setNodeClass(ValueExpression nodeClass)
+ {
+ _nodeClass = nodeClass;
}
- public void setIconChildLast(String iconChildLast) {
- this.iconChildLast = iconChildLast;
+ private ValueExpression _selectedNodeClass;
+ public void setSelectedNodeClass(ValueExpression selectedNodeClass)
+ {
+ _selectedNodeClass = selectedNodeClass;
}
- public String getIconNodeOpen() {
- return iconNodeOpen;
+ private ValueExpression _headerClass;
+ public void setHeaderClass(ValueExpression headerClass)
+ {
+ _headerClass = headerClass;
}
- public void setIconNodeOpen(String iconNodeOpen) {
- this.iconNodeOpen = iconNodeOpen;
+ private ValueExpression _footerClass;
+ public void setFooterClass(ValueExpression footerClass)
+ {
+ _footerClass = footerClass;
}
- public String getIconNodeOpenFirst() {
- return iconNodeOpenFirst;
+ private ValueExpression _rowClasses;
+ public void setRowClasses(ValueExpression rowClasses)
+ {
+ _rowClasses = rowClasses;
}
- public void setIconNodeOpenFirst(String iconNodeOpenFirst) {
- this.iconNodeOpenFirst = iconNodeOpenFirst;
+ private ValueExpression _columnClasses;
+ public void setColumnClasses(ValueExpression columnClasses)
+ {
+ _columnClasses = columnClasses;
}
- public String getIconNodeOpenMiddle() {
- return iconNodeOpenMiddle;
+ private ValueExpression _iconClass;
+ public void setIconClass(ValueExpression iconClass)
+ {
+ _iconClass = iconClass;
}
- public void setIconNodeOpenMiddle(String iconNodeOpenMiddle) {
- this.iconNodeOpenMiddle = iconNodeOpenMiddle;
+ private ValueExpression _iconLine;
+ public void setIconLine(ValueExpression iconLine)
+ {
+ _iconLine = iconLine;
}
- public String getIconNodeOpenLast() {
- return iconNodeOpenLast;
+ private ValueExpression _iconNoline;
+ public void setIconNoline(ValueExpression iconNoline)
+ {
+ _iconNoline = iconNoline;
}
- public void setIconNodeOpenLast(String iconNodeOpenLast) {
- this.iconNodeOpenLast = iconNodeOpenLast;
+ private ValueExpression _iconChildFirst;
+ public void setIconChildFirst(ValueExpression iconChildFirst)
+ {
+ _iconChildFirst = iconChildFirst;
}
- public String getIconNodeClose() {
- return iconNodeClose;
+ private ValueExpression _iconChildMiddle;
+ public void setIconChildMiddle(ValueExpression iconChildMiddle)
+ {
+ _iconChildMiddle = iconChildMiddle;
}
- public void setIconNodeClose(String iconNodeClose) {
- this.iconNodeClose = iconNodeClose;
+ private ValueExpression _iconChildLast;
+ public void setIconChildLast(ValueExpression iconChildLast)
+ {
+ _iconChildLast = iconChildLast;
}
- public String getIconNodeCloseFirst() {
- return iconNodeCloseFirst;
+ private ValueExpression _iconNodeOpen;
+ public void setIconNodeOpen(ValueExpression iconNodeOpen)
+ {
+ _iconNodeOpen = iconNodeOpen;
}
- public void setIconNodeCloseFirst(String iconNodeCloseFirst) {
- this.iconNodeCloseFirst = iconNodeCloseFirst;
+ private ValueExpression _iconNodeOpenFirst;
+ public void setIconNodeOpenFirst(ValueExpression iconNodeOpenFirst)
+ {
+ _iconNodeOpenFirst = iconNodeOpenFirst;
}
- public String getIconNodeCloseMiddle() {
- return iconNodeCloseMiddle;
+ private ValueExpression _iconNodeOpenMiddle;
+ public void setIconNodeOpenMiddle(ValueExpression iconNodeOpenMiddle)
+ {
+ _iconNodeOpenMiddle = iconNodeOpenMiddle;
}
- public void setIconNodeCloseMiddle(String iconNodeCloseMiddle) {
- this.iconNodeCloseMiddle = iconNodeCloseMiddle;
+ private ValueExpression _iconNodeOpenLast;
+ public void setIconNodeOpenLast(ValueExpression iconNodeOpenLast)
+ {
+ _iconNodeOpenLast = iconNodeOpenLast;
}
- public String getIconNodeCloseLast() {
- return iconNodeCloseLast;
+ private ValueExpression _iconNodeClose;
+ public void setIconNodeClose(ValueExpression iconNodeClose)
+ {
+ _iconNodeClose = iconNodeClose;
}
- public void setIconNodeCloseLast(String iconNodeCloseLast) {
- this.iconNodeCloseLast = iconNodeCloseLast;
+ private ValueExpression _iconNodeCloseFirst;
+ public void setIconNodeCloseFirst(ValueExpression iconNodeCloseFirst)
+ {
+ _iconNodeCloseFirst = iconNodeCloseFirst;
}
- public String getStyleClass() {
- return styleClass;
+ private ValueExpression _iconNodeCloseMiddle;
+ public void setIconNodeCloseMiddle(ValueExpression iconNodeCloseMiddle)
+ {
+ _iconNodeCloseMiddle = iconNodeCloseMiddle;
}
- public void setStyleClass(String styleClass) {
- this.styleClass = styleClass;
+ private ValueExpression _iconNodeCloseLast;
+ public void setIconNodeCloseLast(ValueExpression iconNodeCloseLast)
+ {
+ _iconNodeCloseLast = iconNodeCloseLast;
}
- public String getNodeClass() {
- return nodeClass;
- }
-
- public void setNodeClass(String nodeClass) {
- this.nodeClass = nodeClass;
- }
-
- public String getSelectedNodeClass() {
- return selectedNodeClass;
- }
-
- public void setSelectedNodeClass(String selectedNodeClass) {
- this.selectedNodeClass = selectedNodeClass;
- }
-
- public String getIconClass() {
- return iconClass;
- }
-
- public void setIconClass(String iconClass) {
- this.iconClass = iconClass;
- }
-
- /**
- * @return Returns the footerClass.
- */
- public String getFooterClass() {
- return footerClass;
- }
-
- /**
- * @param footerClass
- * The footerClass to set.
- */
- public void setFooterClass(String footerClass) {
- this.footerClass = footerClass;
- }
-
- /**
- * @return Returns the headerClass.
- */
- public String getHeaderClass() {
- return headerClass;
- }
-
- /**
- * @param headerClass
- * The headerClass to set.
- */
- public void setHeaderClass(String headerClass) {
- this.headerClass = headerClass;
+ private ValueExpression _expireListeners;
+ public void setExpireListeners(ValueExpression expireListeners)
+ {
+ _expireListeners = expireListeners;
}
+ private boolean _expandRoot;
public boolean isExpandRoot() {
- return expandRoot;
+ return _expandRoot;
}
public void setExpandRoot(boolean expandRoot) {
- this.expandRoot = expandRoot;
- }
-
- public String getExpireListeners() {
- return expireListeners;
- }
-
- public void setExpireListeners(String expireListeners) {
- this.expireListeners = expireListeners;
+ this._expandRoot = expandRoot;
}
/**
@@ -338,21 +220,21 @@
public int doStartTag() throws JspException {
FacesContext context = FacesContext.getCurrentInstance();
- if (value != null) {
- ValueBinding valueBinding = context.getApplication()
- .createValueBinding(value);
- TreeModel treeModel = (TreeModel) (valueBinding.getValue(context));
+ if (_value != null) {
+ //ValueExpression valueBinding = context.getApplication()
+ // .createValueBinding(value);
+ TreeModel treeModel = (TreeModel) (_value.getValue(context.getELContext()));
if (treeModel == null) {
// create default model
treeModel = new DefaultTreeModel();
- valueBinding.setValue(context, treeModel);
+ _value.setValue(context.getELContext(), treeModel);
}
}
int answer = super.doStartTag();
HtmlTree tree = (HtmlTree) getComponentInstance();
- if (getCreated() && expandRoot) {
+ if (getCreated() && _expandRoot) {
// component was created, so expand the root node
TreeModel model = tree.getModel(context);
@@ -366,35 +248,39 @@
return answer;
}
- public void release() {
- super.release();
- value = null;
- var = null;
- iconLine = null;
- iconNoline = null;
- iconChildFirst = null;
- iconChildMiddle = null;
- iconChildLast = null;
- iconNodeOpen = null;
- iconNodeOpenFirst = null;
- iconNodeOpenMiddle = null;
- iconNodeOpenLast = null;
- iconNodeClose = null;
- iconNodeCloseFirst = null;
- iconNodeCloseMiddle = null;
- iconNodeCloseLast = null;
- styleClass = null;
- rowClasses = null;
- columnClasses = null;
- headerClass = null;
- footerClass = null;
- nodeClass = null;
- selectedNodeClass = null;
- iconClass = null;
- expandRoot = false;
- expireListeners = null;
+ @Override
+ public void release()
+ {
+ super.release();
+ _columnClasses = null;
+ _iconChildLast = null;
+ _iconClass = null;
+ _iconNoline = null;
+ _iconChildMiddle = null;
+ _iconNodeCloseFirst = null;
+ _iconNodeOpen = null;
+ _layout = null;
+ _expandRoot = false;
+ _rowClasses = null;
+ _style = null;
+ _headerClass = null;
+ _expireListeners = null;
+ _iconNodeOpenMiddle = null;
+ _styleClass = null;
+ _var = null;
+ _iconChildFirst = null;
+ _iconNodeCloseMiddle = null;
+ _nodeClass = null;
+ _iconLine = null;
+ _iconNodeOpenLast = null;
+ _iconNodeOpenFirst = null;
+ _footerClass = null;
+ _iconNodeClose = null;
+ _iconNodeCloseLast = null;
+ _value = null;
+ _selectedNodeClass = null;
}
-
+
/**
* Applies attributes to the tree component
*/
@@ -402,43 +288,134 @@
super.setProperties(component);
FacesContext context = FacesContext.getCurrentInstance();
- if (value != null) {
- if (isValueReference(value)) {
- ValueBinding binding = context.getApplication()
- .createValueBinding(value);
- component.setValueBinding("model", binding);
+ if (_value != null) {
+ if (!_value.isLiteralText()) {
+ component.setValueExpression("model", _value);
}
} else {
- ValueBinding binding = component.getValueBinding("model");
+ ValueExpression binding = component.getValueExpression("model");
if (binding == null) {
- binding = context.getApplication().createValueBinding(
- "#{sessionScope.tree}");
+ binding = context.getApplication().
+ getExpressionFactory().createValueExpression(
+ context.getELContext(),"#{sessionScope.tree}", Object.class);
}
- component.setValueBinding("model", binding);
+ component.setValueExpression("model", binding);
}
-
- setStringProperty(component, "var", var);
- setStringProperty(component, "iconLine", iconLine);
- setStringProperty(component, "iconNoline", iconNoline);
- setStringProperty(component, "iconChildFirst", iconChildFirst);
- setStringProperty(component, "iconChildMiddle", iconChildMiddle);
- setStringProperty(component, "iconChildLast", iconChildLast);
- setStringProperty(component, "iconNodeOpen", iconNodeOpen);
- setStringProperty(component, "iconNodeOpenFirst", iconNodeOpenFirst);
- setStringProperty(component, "iconNodeOpenMiddle", iconNodeOpenMiddle);
- setStringProperty(component, "iconNodeOpenLast", iconNodeOpenLast);
- setStringProperty(component, "iconNodeClose", iconNodeClose);
- setStringProperty(component, "iconNodeCloseFirst", iconNodeCloseFirst);
- setStringProperty(component, "iconNodeCloseMiddle", iconNodeCloseMiddle);
- setStringProperty(component, "iconNodeCloseLast", iconNodeCloseLast);
- setStringProperty(component, "styleClass", styleClass);
- setStringProperty(component, "rowClasses", rowClasses);
- setStringProperty(component, "columnClasses", columnClasses);
- setStringProperty(component, "headerClass", headerClass);
- setStringProperty(component, "footerClass", footerClass);
- setStringProperty(component, "nodeClass", nodeClass);
- setStringProperty(component, "selectedNodeClass", selectedNodeClass);
- setStringProperty(component, "iconClass", iconClass);
- setLongProperty(component, "expireListeners", expireListeners);
+
+ if (!(component instanceof HtmlTree))
+ {
+ throw new IllegalArgumentException("Component " + component.getClass().getName() + " is no HtmlTree");
+ }
+ HtmlTree comp = (HtmlTree)component;
+
+ if (_columnClasses != null)
+ {
+ comp.setValueExpression("columnClasses", _columnClasses);
+ }
+ if (_iconChildLast != null)
+ {
+ comp.setValueExpression("iconChildLast", _iconChildLast);
+ }
+ if (_iconClass != null)
+ {
+ comp.setValueExpression("iconClass", _iconClass);
+ }
+ if (_iconNoline != null)
+ {
+ comp.setValueExpression("iconNoline", _iconNoline);
+ }
+ if (_iconChildMiddle != null)
+ {
+ comp.setValueExpression("iconChildMiddle", _iconChildMiddle);
+ }
+ if (_iconNodeCloseFirst != null)
+ {
+ comp.setValueExpression("iconNodeCloseFirst", _iconNodeCloseFirst);
+ }
+ if (_iconNodeOpen != null)
+ {
+ comp.setValueExpression("iconNodeOpen", _iconNodeOpen);
+ }
+ if (_layout != null)
+ {
+ comp.setValueExpression("layout", _layout);
+ }
+ //if (_expandRoot != null)
+ //{
+ // comp.setValueExpression("expandRoot", _expandRoot);
+ //}
+ if (_rowClasses != null)
+ {
+ comp.setValueExpression("rowClasses", _rowClasses);
+ }
+ if (_style != null)
+ {
+ comp.setValueExpression("style", _style);
+ }
+ if (_headerClass != null)
+ {
+ comp.setValueExpression("headerClass", _headerClass);
+ }
+ if (_expireListeners != null)
+ {
+ comp.setValueExpression("expireListeners", _expireListeners);
+ }
+ if (_iconNodeOpenMiddle != null)
+ {
+ comp.setValueExpression("iconNodeOpenMiddle", _iconNodeOpenMiddle);
+ }
+ if (_styleClass != null)
+ {
+ comp.setValueExpression("styleClass", _styleClass);
+ }
+ if (_var != null)
+ {
+ comp.setValueExpression("var", _var);
+ }
+ if (_iconChildFirst != null)
+ {
+ comp.setValueExpression("iconChildFirst", _iconChildFirst);
+ }
+ if (_iconNodeCloseMiddle != null)
+ {
+ comp.setValueExpression("iconNodeCloseMiddle", _iconNodeCloseMiddle);
+ }
+ if (_nodeClass != null)
+ {
+ comp.setValueExpression("nodeClass", _nodeClass);
+ }
+ if (_iconLine != null)
+ {
+ comp.setValueExpression("iconLine", _iconLine);
+ }
+ if (_iconNodeOpenLast != null)
+ {
+ comp.setValueExpression("iconNodeOpenLast", _iconNodeOpenLast);
+ }
+ if (_iconNodeOpenFirst != null)
+ {
+ comp.setValueExpression("iconNodeOpenFirst", _iconNodeOpenFirst);
+ }
+ if (_footerClass != null)
+ {
+ comp.setValueExpression("footerClass", _footerClass);
+ }
+ if (_iconNodeClose != null)
+ {
+ comp.setValueExpression("iconNodeClose", _iconNodeClose);
+ }
+ if (_iconNodeCloseLast != null)
+ {
+ comp.setValueExpression("iconNodeCloseLast", _iconNodeCloseLast);
+ }
+ if (_value != null)
+ {
+ comp.setValueExpression("value", _value);
+ }
+ if (_selectedNodeClass != null)
+ {
+ comp.setValueExpression("selectedNodeClass", _selectedNodeClass);
+ }
+
}
}
Modified: myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/updateactionlistener/UpdateActionListenerTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/updateactionlistener/UpdateActionListenerTag.java?rev=616601&r1=616600&r2=616601&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/updateactionlistener/UpdateActionListenerTag.java (original)
+++ myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/custom/updateactionlistener/UpdateActionListenerTag.java Tue Jan 29 18:58:48 2008
@@ -18,11 +18,13 @@
*/
package org.apache.myfaces.custom.updateactionlistener;
+import javax.el.ValueExpression;
import javax.faces.application.Application;
import javax.faces.component.ActionSource;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
+import javax.faces.webapp.UIComponentClassicTagBase;
import javax.faces.webapp.UIComponentTag;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.Tag;
@@ -39,20 +41,20 @@
{
private static final long serialVersionUID = -6916153064327074092L;
//private static final Log log = LogFactory.getLog(UpdateActionListenerTag.class);
- private String _property;
- private String _value;
+ private ValueExpression _property;
+ private ValueExpression _value;
private String _converter;
public UpdateActionListenerTag()
{
}
- public void setProperty(String property)
+ public void setProperty(ValueExpression property)
{
_property = property;
}
- public void setValue(String value)
+ public void setValue(ValueExpression value)
{
_value = value;
}
@@ -66,28 +68,31 @@
{
if (_property == null) throw new JspException("property attribute not set");
if (_value == null) throw new JspException("value attribute not set");
- if (!UIComponentTag.isValueReference(_property)) throw new JspException("property attribute is no valid value reference: " + _property);
+ if (_property.isLiteralText()) throw new JspException("property attribute is no valid value reference: " + _property);
//Find parent UIComponentTag
- UIComponentTag componentTag = UIComponentTag.getParentUIComponentTag(pageContext);
- if (componentTag == null)
- {
- throw new JspException("UpdateActionListenerTag has no UIComponentTag ancestor");
+ UIComponentClassicTagBase componentELTag = UIComponentClassicTagBase.getParentUIComponentClassicTagBase(pageContext);
+ if (componentELTag == null){
+ UIComponentTag componentTag = UIComponentTag.getParentUIComponentTag(pageContext);
+ if (componentTag == null)
+ {
+ throw new JspException("UpdateActionListenerTag has no UIComponentTag ancestor");
+ }
}
- if (componentTag.getCreated())
+ if (componentELTag.getCreated())
{
//Component was just created, so we add the Listener
- UIComponent component = componentTag.getComponentInstance();
+ UIComponent component = componentELTag.getComponentInstance();
if (component instanceof ActionSource)
{
FacesContext facesContext = FacesContext.getCurrentInstance();
Application application = facesContext.getApplication();
UpdateActionListener al = new UpdateActionListener();
- al.setPropertyBinding(application.createValueBinding(_property));
- if (UIComponentTag.isValueReference(_value))
+ al.setPropertyBinding(application.createValueBinding(_property.getExpressionString()));
+ if (!_value.isLiteralText())
{
- al.setValueBinding(application.createValueBinding(_value));
+ al.setValueBinding(application.createValueBinding(_value.getExpressionString()));
}
else
{
Modified: myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/dateformat/DateFormatSymbols.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/dateformat/DateFormatSymbols.java?rev=616601&r1=616600&r2=616601&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/dateformat/DateFormatSymbols.java (original)
+++ myfaces/tomahawk/branches/1_2_0/core/src/main/java/org/apache/myfaces/dateformat/DateFormatSymbols.java Tue Jan 29 18:58:48 2008
@@ -62,7 +62,11 @@
public DateFormatSymbols(Locale l)
{
- java.text.DateFormatSymbols src = java.text.DateFormatSymbols.getInstance(l);
+ //Since the code should be 1.5 compatible
+ //java.text.DateFormatSymbols.getInstance(l) does not
+ //exists (since 1.6), so we need to do this
+ //new java.text.DateFormatSymbols(l)
+ java.text.DateFormatSymbols src = new java.text.DateFormatSymbols(l);
this.eras = src.getEras();
this.months = src.getMonths();
this.shortMonths = src.getShortMonths();
Modified: myfaces/tomahawk/branches/1_2_0/core/src/test/java/org/apache/myfaces/test/MyFacesTagLibTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/core/src/test/java/org/apache/myfaces/test/MyFacesTagLibTestCase.java?rev=616601&r1=616600&r2=616601&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/core/src/test/java/org/apache/myfaces/test/MyFacesTagLibTestCase.java (original)
+++ myfaces/tomahawk/branches/1_2_0/core/src/test/java/org/apache/myfaces/test/MyFacesTagLibTestCase.java Tue Jan 29 18:58:48 2008
@@ -32,9 +32,9 @@
// TODO get the sandbox in here
tldPaths = new String[3];
- tldPaths[0] = META_INF + "myfaces_html.tld";
+ tldPaths[0] = META_INF + "h.tld";
tldPaths[1] = META_INF + "myfaces_core.tld";
- tldPaths[2] = META_INF + "tomahawk.tld";
+ tldPaths[2] = META_INF + "t.tld";
// tldPaths[3] = META_INF + "myfaces_sandbox.tld";
}
Modified: myfaces/tomahawk/branches/1_2_0/examples/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/examples/assembly/pom.xml?rev=616601&r1=616600&r2=616601&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/examples/assembly/pom.xml (original)
+++ myfaces/tomahawk/branches/1_2_0/examples/assembly/pom.xml Tue Jan 29 18:58:48 2008
@@ -10,7 +10,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk-examples-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<scm>
Modified: myfaces/tomahawk/branches/1_2_0/examples/blank/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/examples/blank/pom.xml?rev=616601&r1=616600&r2=616601&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/examples/blank/pom.xml (original)
+++ myfaces/tomahawk/branches/1_2_0/examples/blank/pom.xml Tue Jan 29 18:58:48 2008
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk-examples-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tomahawk/trunk/examples/blank</connection>
Modified: myfaces/tomahawk/branches/1_2_0/examples/simple/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/examples/simple/pom.xml?rev=616601&r1=616600&r2=616601&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/examples/simple/pom.xml (original)
+++ myfaces/tomahawk/branches/1_2_0/examples/simple/pom.xml Tue Jan 29 18:58:48 2008
@@ -72,6 +72,12 @@
<version>1.0.4</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.commons</groupId>
+ <artifactId>myfaces-validators</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
Modified: myfaces/tomahawk/branches/1_2_0/examples/simple/src/main/webapp/validate.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/examples/simple/src/main/webapp/validate.jsp?rev=616601&r1=616600&r2=616601&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/examples/simple/src/main/webapp/validate.jsp (original)
+++ myfaces/tomahawk/branches/1_2_0/examples/simple/src/main/webapp/validate.jsp Tue Jan 29 18:58:48 2008
@@ -4,6 +4,7 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
+<%@ taglib uri="http://myfaces.apache.org/commons/validators" prefix="mcv" %>
<html>
<%@ include file="inc/head.inc" %>
@@ -49,25 +50,25 @@
<h:outputLabel for="email" value="#{example_messages['validate_email']}"/>
<h:inputText id="email" value="#{validateForm.email}" required="true">
- <f:validator validatorId="org.apache.myfaces.validator.Email"/>
+ <f:validator validatorId="org.apache.myfaces.commons.validator.Email"/>
</h:inputText>
<t:message id="emailError" for="email" styleClass="error"/>
<h:outputLabel for="email2" value="#{example_messages['validate_email']}2"/>
<h:inputText id="email2" value="#{validateForm.email2}" required="true">
- <t:validateEmail detailMessage="Not a valid email address."/>
+ <mcv:validateEmail detailMessage="Not a valid email address."/>
</h:inputText>
<t:message id="emailError2" for="email2" styleClass="error"/>
<h:outputLabel for="creditCardNumber" value="#{example_messages['validate_credit']}"/>
<h:inputText id="creditCardNumber" value="#{validateForm.creditCardNumber}" required="true">
- <t:validateCreditCard detailMessage='#{"{0} is not a valid credit card number."}'/>
+ <mcv:validateCreditCard detailMessage='#{"{0} is not a valid credit card number."}'/>
</h:inputText>
<t:message id="creditCardNumberError" for="creditCardNumber" styleClass="error"/>
<h:outputLabel for="regExprValue" value="#{example_messages['validate_regexp']}"/>
<h:inputText id="regExprValue" value="#{validateForm.regExpr}" required="true">
- <t:validateRegExpr pattern='\d{5}' detailMessage='#{"{0} is not valid in this field." }'/>
+ <mcv:validateRegExpr pattern='\d{5}' detailMessage='#{"{0} is not valid in this field." }'/>
</h:inputText>
<t:message id="regExprValueError" for="regExprValue" styleClass="error"/>
@@ -77,7 +78,7 @@
<h:outputLabel for="equal2" value="#{example_messages['validate_equal']}2"/>
<h:inputText id="equal2" value="#{validateForm.equal2}" required="true">
- <t:validateEqual for="equal"
+ <mcv:validateEqual for="equal"
summaryMessage='#{"Value {0} should equal {1}"}'
detailMessage='#{"The value of this field, {0}, should equal the value of that other field, {1}"}'/>
</h:inputText>
Modified: myfaces/tomahawk/branches/1_2_0/examples/tiles/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/examples/tiles/pom.xml?rev=616601&r1=616600&r2=616601&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/examples/tiles/pom.xml (original)
+++ myfaces/tomahawk/branches/1_2_0/examples/tiles/pom.xml Tue Jan 29 18:58:48 2008
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk-examples-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tomahawk/trunk/examples/tiles</connection>
Modified: myfaces/tomahawk/branches/1_2_0/examples/wap/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/examples/wap/pom.xml?rev=616601&r1=616600&r2=616601&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/examples/wap/pom.xml (original)
+++ myfaces/tomahawk/branches/1_2_0/examples/wap/pom.xml Tue Jan 29 18:58:48 2008
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk-examples-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tomahawk/trunk/examples/wap</connection>
Modified: myfaces/tomahawk/branches/1_2_0/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/pom.xml?rev=616601&r1=616600&r2=616601&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/pom.xml (original)
+++ myfaces/tomahawk/branches/1_2_0/pom.xml Tue Jan 29 18:58:48 2008
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces</artifactId>
- <version>2</version>
+ <version>5</version>
</parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
@@ -194,8 +194,10 @@
<modules>
<module>core</module>
- <!--<module>examples</module>
- <module>sandbox</module>-->
+ <module>build</module>
+ <module>examples</module>
+ <module>sandbox</module>
+ <module>sandbox15</module>
</modules>
<build>
@@ -212,8 +214,8 @@
</build>
<properties>
- <myfaces.version>1.2.1-SNAPSHOT</myfaces.version>
- <myfaces-shared.version>3.0.1-SNAPSHOT</myfaces-shared.version>
+ <myfaces.version>1.2.3-SNAPSHOT</myfaces.version>
+ <myfaces-shared.version>3.0.3-SNAPSHOT</myfaces-shared.version>
<jsf-impl.scope>test</jsf-impl.scope>
</properties>
Modified: myfaces/tomahawk/branches/1_2_0/sandbox/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/sandbox/assembly/pom.xml?rev=616601&r1=616600&r2=616601&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/sandbox/assembly/pom.xml (original)
+++ myfaces/tomahawk/branches/1_2_0/sandbox/assembly/pom.xml Tue Jan 29 18:58:48 2008
@@ -10,7 +10,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>sandbox-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<scm>
Modified: myfaces/tomahawk/branches/1_2_0/sandbox/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/sandbox/core/pom.xml?rev=616601&r1=616600&r2=616601&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/sandbox/core/pom.xml (original)
+++ myfaces/tomahawk/branches/1_2_0/sandbox/core/pom.xml Tue Jan 29 18:58:48 2008
@@ -11,7 +11,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>sandbox-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<scm>
Modified: myfaces/tomahawk/branches/1_2_0/sandbox/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/sandbox/examples/pom.xml?rev=616601&r1=616600&r2=616601&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/sandbox/examples/pom.xml (original)
+++ myfaces/tomahawk/branches/1_2_0/sandbox/examples/pom.xml Tue Jan 29 18:58:48 2008
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>sandbox-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<scm>
Modified: myfaces/tomahawk/branches/1_2_0/sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/sandbox/pom.xml?rev=616601&r1=616600&r2=616601&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/sandbox/pom.xml (original)
+++ myfaces/tomahawk/branches/1_2_0/sandbox/pom.xml Tue Jan 29 18:58:48 2008
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tomahawk/trunk/sandbox</connection>
Modified: myfaces/tomahawk/branches/1_2_0/sandbox15/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/sandbox15/core/pom.xml?rev=616601&r1=616600&r2=616601&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/sandbox15/core/pom.xml (original)
+++ myfaces/tomahawk/branches/1_2_0/sandbox15/core/pom.xml Tue Jan 29 18:58:48 2008
@@ -11,7 +11,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>sandbox15-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<scm>
Modified: myfaces/tomahawk/branches/1_2_0/sandbox15/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/sandbox15/examples/pom.xml?rev=616601&r1=616600&r2=616601&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/sandbox15/examples/pom.xml (original)
+++ myfaces/tomahawk/branches/1_2_0/sandbox15/examples/pom.xml Tue Jan 29 18:58:48 2008
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>sandbox15-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<scm>
Modified: myfaces/tomahawk/branches/1_2_0/sandbox15/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/sandbox15/pom.xml?rev=616601&r1=616600&r2=616601&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/sandbox15/pom.xml (original)
+++ myfaces/tomahawk/branches/1_2_0/sandbox15/pom.xml Tue Jan 29 18:58:48 2008
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tomahawk/trunk/sandbox15</connection>