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 2013/11/08 01:13:52 UTC
svn commit: r1539875 - in /myfaces/core/trunk/impl/src:
main/java/org/apache/myfaces/application/
main/java/org/apache/myfaces/application/jsp/
main/java/org/apache/myfaces/cdi/checkenv/
main/java/org/apache/myfaces/config/ main/java/org/apache/myfaces...
Author: lu4242
Date: Fri Nov 8 00:13:51 2013
New Revision: 1539875
URL: http://svn.apache.org/r1539875
Log:
MYFACES-3822 General cleanup and remove unused web config params
Removed:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/MyfacesStateManager.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/checkenv/
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/LastVariableResolverInChain.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletFacesContextImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILiteralText.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILiteralTextHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UIText.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UITextHandler.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/jsp/
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/MyfacesResponseStateManager.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
myfaces/core/trunk/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/MyfacesResponseStateManager.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/MyfacesResponseStateManager.java?rev=1539875&r1=1539874&r2=1539875&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/MyfacesResponseStateManager.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/MyfacesResponseStateManager.java Fri Nov 8 00:13:51 2013
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.renderkit;
-import javax.faces.application.StateManager;
import javax.faces.context.FacesContext;
import javax.faces.render.ResponseStateManager;
@@ -31,18 +30,6 @@ public abstract class MyfacesResponseSta
{
/**
- * Writes url parameters with the state info to be saved. {@link org.apache.myfaces.application.MyfacesStateManager}
- * delegates calls to {@link org.apache.myfaces.application.MyfacesStateManager#writeState} to this method.
- *
- * @deprecated
- */
- @Deprecated
- public void writeStateAsUrlParams(FacesContext facescontext, StateManager.SerializedView serializedview)
- {
- throw new UnsupportedOperationException("long been deprecated...");
- }
-
- /**
* Execute additional operations like save the state on a cache when server
* side state saving is used.
*/
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java?rev=1539875&r1=1539874&r2=1539875&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java Fri Nov 8 00:13:51 2013
@@ -327,92 +327,44 @@ final class TextUnit extends Compilation
protected void flushBufferToConfig(boolean child)
{
+ this.flushTextBuffer(child);
- // NEW IMPLEMENTATION
- if (true)
+ int size = this.instructionBuffer.size();
+ if (size > 0)
{
-
- this.flushTextBuffer(child);
-
- int size = this.instructionBuffer.size();
- if (size > 0)
+ try
{
- try
+ String s = this.buffer.toString();
+ if (child)
{
- String s = this.buffer.toString();
- if (child)
- {
- s = trimRight(s);
- }
- ELText txt = ELText.parse(s);
- if (txt != null)
- {
- if (compressSpaces)
- {
- // Use the logic behind the instructions to remove unnecessary instructions
- // containing only spaces, or recreating new ones containing only the necessary
- // spaces.
- size = compressSpaces(instructionBuffer, size);
- }
- Instruction[] instructions = (Instruction[]) this.instructionBuffer
- .toArray(new Instruction[size]);
- this.children.add(new UIInstructionHandler(this.alias, this.id, instructions, txt));
- this.instructionBuffer.clear();
- }
-
+ s = trimRight(s);
}
- catch (ELException e)
+ ELText txt = ELText.parse(s);
+ if (txt != null)
{
- if (this.tags.size() > 0)
- {
- throw new TagException((Tag) this.tags.peek(), e.getMessage());
- }
- else
+ if (compressSpaces)
{
- throw new ELException(this.alias + ": " + e.getMessage(), e.getCause());
- }
+ // Use the logic behind the instructions to remove unnecessary instructions
+ // containing only spaces, or recreating new ones containing only the necessary
+ // spaces.
+ size = compressSpaces(instructionBuffer, size);
+ }
+ Instruction[] instructions = (Instruction[]) this.instructionBuffer
+ .toArray(new Instruction[size]);
+ this.children.add(new UIInstructionHandler(this.alias, this.id, instructions, txt));
+ this.instructionBuffer.clear();
}
- }
- // KEEP THESE SEPARATE SO LOGIC DOESN'T GET FUBARED
- }
- else if (this.buffer.length() > 0)
- {
- String s = this.buffer.toString();
- if (s.trim().length() > 0)
+ }
+ catch (ELException e)
{
- if (child)
+ if (this.tags.size() > 0)
{
- s = trimRight(s);
+ throw new TagException((Tag) this.tags.peek(), e.getMessage());
}
- if (s.length() > 0)
+ else
{
- try
- {
- ELText txt = ELText.parse(s);
- if (txt != null)
- {
- if (txt.isLiteral())
- {
- this.children.add(new UILiteralTextHandler(txt.toString()));
- }
- else
- {
- this.children.add(new UITextHandler(this.alias, txt));
- }
- }
- }
- catch (ELException e)
- {
- if (this.tags.size() > 0)
- {
- throw new TagException((Tag) this.tags.peek(), e.getMessage());
- }
- else
- {
- throw new ELException(this.alias + ": " + e.getMessage(), e.getCause());
- }
- }
+ throw new ELException(this.alias + ": " + e.getMessage(), e.getCause());
}
}
}
Modified: myfaces/core/trunk/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension?rev=1539875&r1=1539874&r2=1539875&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension (original)
+++ myfaces/core/trunk/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension Fri Nov 8 00:13:51 2013
@@ -1,5 +1,4 @@
org.apache.myfaces.cdi.view.ViewScopeContextExtension
org.apache.myfaces.flow.cdi.FlowBuilderCDIExtension
org.apache.myfaces.flow.cdi.FlowScopeCDIExtension
-org.apache.myfaces.cdi.checkenv.CheckInjectionWithWebServerExtension
org.apache.myfaces.cdi.dependent.DependentBeanExtension