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/04/02 13:43:02 UTC
svn commit: r1463493 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/application/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/l...
Author: lofwyr
Date: Tue Apr 2 11:43:02 2013
New Revision: 1463493
URL: http://svn.apache.org/r1463493
Log:
TOBAGO-1229: Using Facelets 2.0 from JSF 2.0 instead of Facelets 1.1 from Sun
Added:
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/application/
- copied from r1463451, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/application/
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/
- copied from r1463451, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/resources/
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/resources/META-INF/
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/resources/META-INF/services/
- copied from r1463451, myfaces/tobago/trunk/tobago-core/src/main/resources/META-INF/services/
Removed:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/application/
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/
myfaces/tobago/trunk/tobago-core/src/main/resources/META-INF/services/
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/ApplyRequestValuesExecutor.java
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/InvokeApplicationExecutor.java
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/PhaseExecutor.java
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/PhaseListenerManager.java
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/ProcessValidationsExecutor.java
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/RenderResponseExecutor.java
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/RestoreViewExecutor.java
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycle.java
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycleFactory.java
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/UpdateModelValuesExecutor.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java?rev=1463493&r1=1463492&r2=1463493&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/ajax/AjaxResponseRenderer.java Tue Apr 2 11:43:02 2013
@@ -20,7 +20,6 @@
package org.apache.myfaces.tobago.internal.ajax;
import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.internal.lifecycle.TobagoLifecycle;
import org.apache.myfaces.tobago.internal.util.FacesContextUtils;
import org.apache.myfaces.tobago.internal.util.ResponseUtils;
import org.apache.myfaces.tobago.internal.webapp.JsonResponseWriter;
@@ -70,10 +69,10 @@ public class AjaxResponseRenderer {
RenderKit renderKit = renderFactory.getRenderKit(
facesContext, viewRoot.getRenderKitId());
- UIViewRoot incomingViewRoot = (UIViewRoot)
- facesContext.getExternalContext().getRequestMap().get(TobagoLifecycle.VIEW_ROOT_KEY);
LOG.error("TODO: Reimplement AJAX stuff for JSF 2.0");
/* XXX: reimplement it for JSF 2.0? Works only, when the TobagoLifecycle is active...
+ UIViewRoot incomingViewRoot = (UIViewRoot)
+ facesContext.getExternalContext().getRequestMap().get(TobagoLifecycle.VIEW_ROOT_KEY);
if (viewRoot != incomingViewRoot) {
if (LOG.isDebugEnabled()) {
LOG.debug("requesting full page reload because of navigation to {} from {}",
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/ApplyRequestValuesExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/ApplyRequestValuesExecutor.java?rev=1463493&r1=1463451&r2=1463493&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/ApplyRequestValuesExecutor.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/ApplyRequestValuesExecutor.java Tue Apr 2 11:43:02 2013
@@ -26,7 +26,12 @@ import javax.faces.event.PhaseId;
* Implements the lifecycle as described in Spec. 1.0 PFD Chapter 2
* <p/>
* Apply request values phase (JSF Spec 2.2.2)
+ *
+ * Not longer needed.
+ *
+ * @deprecated since Tobago 1.6.0
*/
+@Deprecated
class ApplyRequestValuesExecutor implements PhaseExecutor {
public boolean execute(FacesContext facesContext) {
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/InvokeApplicationExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/InvokeApplicationExecutor.java?rev=1463493&r1=1463451&r2=1463493&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/InvokeApplicationExecutor.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/InvokeApplicationExecutor.java Tue Apr 2 11:43:02 2013
@@ -26,7 +26,12 @@ import javax.faces.event.PhaseId;
* Implements the lifecycle as described in Spec. 1.0 PFD Chapter 2
* <p/>
* Invoke application phase (JSF Spec 2.2.5)
+ *
+ * Not longer needed.
+ *
+ * @deprecated since Tobago 1.6.0
*/
+@Deprecated
class InvokeApplicationExecutor implements PhaseExecutor {
public boolean execute(FacesContext facesContext) {
facesContext.getViewRoot().processApplication(facesContext);
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/PhaseExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/PhaseExecutor.java?rev=1463493&r1=1463451&r2=1463493&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/PhaseExecutor.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/PhaseExecutor.java Tue Apr 2 11:43:02 2013
@@ -24,7 +24,12 @@ import javax.faces.event.PhaseId;
/**
* Implements the PhaseExecutor for a lifecycle
+ *
+ * Not longer needed.
+ *
+ * @deprecated since Tobago 1.6.0
*/
+@Deprecated
interface PhaseExecutor {
/**
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/PhaseListenerManager.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/PhaseListenerManager.java?rev=1463493&r1=1463451&r2=1463493&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/PhaseListenerManager.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/PhaseListenerManager.java Tue Apr 2 11:43:02 2013
@@ -34,7 +34,12 @@ import java.util.Map;
* This class encapsulates the logic used to call PhaseListeners. It was
* needed because of issue 9 of the JSF 1.2 spec. See section 11.3 for more
* details.
+ *
+ * Not longer needed.
+ *
+ * @deprecated since Tobago 1.6.0
*/
+@Deprecated
class PhaseListenerManager {
private static final Logger LOG = LoggerFactory.getLogger(PhaseListenerManager.class);
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/ProcessValidationsExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/ProcessValidationsExecutor.java?rev=1463493&r1=1463451&r2=1463493&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/ProcessValidationsExecutor.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/ProcessValidationsExecutor.java Tue Apr 2 11:43:02 2013
@@ -25,7 +25,12 @@ import javax.faces.event.PhaseId;
/**
* Implements the lifecycle as described in Spec. 1.0 PFD Chapter 2
* Process validations phase (JSF Spec 2.2.3)
+ *
+ * Not longer needed.
+ *
+ * @deprecated since Tobago 1.6.0
*/
+@Deprecated
class ProcessValidationsExecutor implements PhaseExecutor {
public boolean execute(FacesContext facesContext) {
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/RenderResponseExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/RenderResponseExecutor.java?rev=1463493&r1=1463451&r2=1463493&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/RenderResponseExecutor.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/RenderResponseExecutor.java Tue Apr 2 11:43:02 2013
@@ -32,7 +32,12 @@ import java.io.IOException;
* Implements the lifecycle as described in Spec. 1.0 PFD Chapter 2
* <p/>
* render response phase (JSF Spec 2.2.6)
+ *
+ * Not longer needed.
+ *
+ * @deprecated since Tobago 1.6.0
*/
+@Deprecated
class RenderResponseExecutor implements PhaseExecutor {
public boolean execute(FacesContext facesContext) {
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/RestoreViewExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/RestoreViewExecutor.java?rev=1463493&r1=1463451&r2=1463493&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/RestoreViewExecutor.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/RestoreViewExecutor.java Tue Apr 2 11:43:02 2013
@@ -49,7 +49,12 @@ import java.util.Map;
* Implements the life cycle as described in Spec. 1.0 PFD Chapter 2
* <p/>
* Restore view phase (JSF Spec 2.2.1)
+ *
+ * Not longer needed.
+ *
+ * @deprecated since Tobago 1.6.0
*/
+@Deprecated
class RestoreViewExecutor implements PhaseExecutor {
private static final Logger LOG = LoggerFactory.getLogger(RestoreViewExecutor.class);
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycle.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycle.java?rev=1463493&r1=1463451&r2=1463493&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycle.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycle.java Tue Apr 2 11:43:02 2013
@@ -34,7 +34,12 @@ import java.util.List;
/**
* Implements the lifecycle as described in Spec. 1.0 PFD Chapter 2
+ *
+ * Not longer needed.
+ *
+ * @deprecated since Tobago 1.6.0
*/
+@Deprecated
public class TobagoLifecycle extends Lifecycle {
private static final Logger LOG = LoggerFactory.getLogger(TobagoLifecycle.class);
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycleFactory.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycleFactory.java?rev=1463493&r1=1463451&r2=1463493&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycleFactory.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycleFactory.java Tue Apr 2 11:43:02 2013
@@ -26,6 +26,12 @@ import javax.faces.lifecycle.Lifecycle;
import javax.faces.lifecycle.LifecycleFactory;
import java.util.Iterator;
+/**
+ * Not longer needed.
+ *
+ * @deprecated since Tobago 1.6.0
+ */
+@Deprecated
public class TobagoLifecycleFactory extends LifecycleFactory {
private static final Logger LOG = LoggerFactory.getLogger(TobagoLifecycleFactory.class);
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/UpdateModelValuesExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/UpdateModelValuesExecutor.java?rev=1463493&r1=1463451&r2=1463493&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/UpdateModelValuesExecutor.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/UpdateModelValuesExecutor.java Tue Apr 2 11:43:02 2013
@@ -25,7 +25,12 @@ import javax.faces.event.PhaseId;
/**
* Implements the lifecycle as described in Spec. 1.0 PFD Chapter 2
* Update model values phase (JSF Spec 2.2.4)
+ *
+ * Not longer needed.
+ *
+ * @deprecated since Tobago 1.6.0
*/
+@Deprecated
class UpdateModelValuesExecutor implements PhaseExecutor {