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 2011/07/23 18:10:30 UTC
svn commit: r1150140 [2/3] - in
/myfaces/core/branches/refactor_shared_2_1_x/impl: ./
src/main/java/org/apache/myfaces/application/
src/main/java/org/apache/myfaces/application/jsp/
src/main/java/org/apache/myfaces/config/ src/main/java/org/apache/myfa...
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHeadRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHeadRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHeadRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHeadRenderer.java Sat Jul 23 16:09:56 2011
@@ -27,8 +27,8 @@ import javax.faces.context.ResponseWrite
import javax.faces.render.Renderer;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
/**
* Renderer used by h:head component
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHiddenRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHiddenRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHiddenRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlHiddenRenderer.java Sat Jul 23 16:09:56 2011
@@ -28,11 +28,11 @@ import javax.faces.context.ResponseWrite
import javax.faces.convert.ConverterException;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
/**
*
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlImageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlImageRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlImageRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlImageRenderer.java Sat Jul 23 16:09:56 2011
@@ -19,7 +19,7 @@
package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlImageRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlImageRendererBase;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLabelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLabelRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLabelRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLabelRenderer.java Sat Jul 23 16:09:56 2011
@@ -33,14 +33,14 @@ import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.component.EscapeCapable;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.util.JavascriptUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
+import org.apache.myfaces.shared.component.EscapeCapable;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
/**
*
@@ -133,12 +133,12 @@ public class HtmlLabelRenderer extends H
}
else
{
- escape = RendererUtils.getBooleanAttribute(uiComponent, org.apache.myfaces.shared_impl.renderkit.JSFAttr.ESCAPE_ATTR,
+ escape = RendererUtils.getBooleanAttribute(uiComponent, org.apache.myfaces.shared.renderkit.JSFAttr.ESCAPE_ATTR,
true); //default is to escape
}
if (escape)
{
- writer.writeText(text, org.apache.myfaces.shared_impl.renderkit.JSFAttr.VALUE_ATTR);
+ writer.writeText(text, org.apache.myfaces.shared.renderkit.JSFAttr.VALUE_ATTR);
}
else
{
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLinkRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLinkRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLinkRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlLinkRenderer.java Sat Jul 23 16:09:56 2011
@@ -20,7 +20,7 @@ package org.apache.myfaces.renderkit.htm
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderers;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlLinkRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlLinkRendererBase;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlListboxRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlListboxRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlListboxRenderer.java Sat Jul 23 16:09:56 2011
@@ -20,7 +20,7 @@ package org.apache.myfaces.renderkit.htm
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderers;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlListboxRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlListboxRendererBase;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMenuRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMenuRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMenuRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMenuRenderer.java Sat Jul 23 16:09:56 2011
@@ -20,7 +20,7 @@ package org.apache.myfaces.renderkit.htm
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderers;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlMenuRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlMenuRendererBase;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessageRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessageRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessageRenderer.java Sat Jul 23 16:09:56 2011
@@ -29,8 +29,8 @@ import javax.faces.component.behavior.Cl
import javax.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlMessageRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlMessageRendererBase;
+import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
/**
*
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessagesRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessagesRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessagesRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessagesRenderer.java Sat Jul 23 16:09:56 2011
@@ -29,8 +29,8 @@ import javax.faces.component.behavior.Cl
import javax.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlMessagesRendererBase;
-import org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlMessagesRendererBase;
+import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
/**
*
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlOutcomeTargetButtonRenderer.java Sat Jul 23 16:09:56 2011
@@ -24,7 +24,7 @@ import javax.faces.component.UIComponent
import javax.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlOutcomeTargetButtonRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlOutcomeTargetButtonRendererBase;
/**
* @since 2.0
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRadioRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRadioRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRadioRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRadioRenderer.java Sat Jul 23 16:09:56 2011
@@ -19,7 +19,7 @@
package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRadioRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlRadioRendererBase;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java Sat Jul 23 16:09:56 2011
@@ -39,9 +39,9 @@ import javax.faces.render.Renderer;
import javax.faces.render.ResponseStateManager;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderKit;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlResponseWriterImpl;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlResponseWriterImpl;
+import org.apache.myfaces.shared.config.MyfacesConfig;
/**
* @author Manfred Geiler (latest modification by $Author$)
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java Sat Jul 23 16:09:56 2011
@@ -33,12 +33,12 @@ import org.apache.myfaces.application.St
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
import org.apache.myfaces.renderkit.MyfacesResponseStateManager;
import org.apache.myfaces.renderkit.StateCacheFactoryImpl;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.util.JavascriptUtils;
-import org.apache.myfaces.shared_impl.util.StateUtils;
-import org.apache.myfaces.shared_impl.util.WebConfigParamUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.util.StateUtils;
+import org.apache.myfaces.shared.config.MyfacesConfig;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
+import org.apache.myfaces.shared.util.WebConfigParamUtils;
/**
* @author Manfred Geiler (latest modification by $Author$)
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java Sat Jul 23 16:09:56 2011
@@ -34,10 +34,10 @@ import javax.faces.event.*;
import javax.faces.render.Renderer;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.HTML;
import org.apache.myfaces.view.facelets.PostBuildComponentTreeOnRestoreViewEvent;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlSecretRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlSecretRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlSecretRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlSecretRenderer.java Sat Jul 23 16:09:56 2011
@@ -19,7 +19,7 @@
package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlSecretRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlSecretRendererBase;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java Sat Jul 23 16:09:56 2011
@@ -41,10 +41,10 @@ import javax.faces.event.PostAddToViewEv
import javax.faces.render.Renderer;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.renderkit.html.HTML;
-import org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.HTML;
import org.apache.myfaces.view.facelets.PostBuildComponentTreeOnRestoreViewEvent;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTableRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTableRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTableRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTableRenderer.java Sat Jul 23 16:09:56 2011
@@ -19,7 +19,7 @@
package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlTableRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlTableRendererBase;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextRenderer.java Sat Jul 23 16:09:56 2011
@@ -20,7 +20,7 @@ package org.apache.myfaces.renderkit.htm
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderers;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlTextRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlTextRendererBase;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextareaRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextareaRenderer.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextareaRenderer.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlTextareaRenderer.java Sat Jul 23 16:09:56 2011
@@ -19,7 +19,7 @@
package org.apache.myfaces.renderkit.html;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
-import org.apache.myfaces.shared_impl.renderkit.html.HtmlTextareaRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlTextareaRendererBase;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java Sat Jul 23 16:09:56 2011
@@ -24,12 +24,12 @@ import java.net.URL;
import javax.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
-import org.apache.myfaces.shared_impl.resource.AliasResourceMetaImpl;
-import org.apache.myfaces.shared_impl.resource.ResourceLoader;
-import org.apache.myfaces.shared_impl.resource.ResourceMeta;
-import org.apache.myfaces.shared_impl.resource.ResourceMetaImpl;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
-import org.apache.myfaces.shared_impl.util.WebConfigParamUtils;
+import org.apache.myfaces.shared.resource.AliasResourceMetaImpl;
+import org.apache.myfaces.shared.resource.ResourceLoader;
+import org.apache.myfaces.shared.resource.ResourceMeta;
+import org.apache.myfaces.shared.resource.ResourceMetaImpl;
+import org.apache.myfaces.shared.util.ClassUtils;
+import org.apache.myfaces.shared.util.WebConfigParamUtils;
/**
* A resource loader implementation which loads resources from the thread ClassLoader.
@@ -124,13 +124,13 @@ public class InternalClassLoaderResource
{
//handle jsf.js
if (libraryName != null &&
- org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils.JAVAX_FACES_LIBRARY_NAME.equals(libraryName) &&
- org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils.JSF_JS_RESOURCE_NAME.equals(resourceName))
+ org.apache.myfaces.shared.renderkit.html.util.ResourceUtils.JAVAX_FACES_LIBRARY_NAME.equals(libraryName) &&
+ org.apache.myfaces.shared.renderkit.html.util.ResourceUtils.JSF_JS_RESOURCE_NAME.equals(resourceName))
{
if (_useMultipleJsFilesForJsfUncompressedJs)
{
return new AliasResourceMetaImpl(prefix, libraryName, libraryVersion,
- resourceName, resourceVersion, org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils.JSF_UNCOMPRESSED_JS_RESOURCE_NAME, true);
+ resourceName, resourceVersion, org.apache.myfaces.shared.renderkit.html.util.ResourceUtils.JSF_UNCOMPRESSED_JS_RESOURCE_NAME, true);
}
else
{
@@ -139,11 +139,11 @@ public class InternalClassLoaderResource
}
//handle the oamSubmit.js
else if (libraryName != null &&
- org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils.MYFACES_LIBRARY_NAME.equals(libraryName) &&
- org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils.MYFACES_JS_RESOURCE_NAME.equals(resourceName))
+ org.apache.myfaces.shared.renderkit.html.util.ResourceUtils.MYFACES_LIBRARY_NAME.equals(libraryName) &&
+ org.apache.myfaces.shared.renderkit.html.util.ResourceUtils.MYFACES_JS_RESOURCE_NAME.equals(resourceName))
{
return new AliasResourceMetaImpl(prefix, libraryName, libraryVersion,
- resourceName, resourceVersion, org.apache.myfaces.shared_impl.renderkit.html.util.ResourceUtils.MYFACES_JS_RESOURCE_NAME_UNCOMPRESSED, true);
+ resourceName, resourceVersion, org.apache.myfaces.shared.renderkit.html.util.ResourceUtils.MYFACES_JS_RESOURCE_NAME_UNCOMPRESSED, true);
} else if (libraryName != null && libraryName.startsWith("org.apache.myfaces.core"))
{
return new ResourceMetaImpl(prefix, libraryName, libraryVersion, resourceName, resourceVersion);
Propchange: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/
------------------------------------------------------------------------------
bugtraq:number = true
Propchange: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/
------------------------------------------------------------------------------
bugtraq:number = true
Propchange: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/
------------------------------------------------------------------------------
bugtraq:number = true
Added: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/DelegatedFacesServlet.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/DelegatedFacesServlet.java?rev=1150140&view=auto
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/DelegatedFacesServlet.java (added)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/DelegatedFacesServlet.java Sat Jul 23 16:09:56 2011
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.shared_impl.webapp.webxml;
+
+public interface DelegatedFacesServlet
+{
+}
Added: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/FilterMapping.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/FilterMapping.java?rev=1150140&view=auto
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/FilterMapping.java (added)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/FilterMapping.java Sat Jul 23 16:09:56 2011
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.shared_impl.webapp.webxml;
+
+/**
+ * @author Mario Ivankovits (latest modification by $Author: matzew $)
+ * @version $Revision: 557350 $ $Date: 2007-07-18 13:19:50 -0500 (Mié, 18 Jul 2007) $
+ */
+public class FilterMapping
+{
+ private String _filterName;
+ private Class _filterClass;
+ private String _urlPattern;
+ private boolean _isExtensionMapping = false;
+
+ public FilterMapping(String filterName,
+ Class filterClass,
+ String urlPattern)
+ {
+ _filterName = filterName;
+ _filterClass = filterClass;
+ _urlPattern = urlPattern;
+ if (_urlPattern != null)
+ {
+ if (_urlPattern.startsWith("*."))
+ {
+ _isExtensionMapping = true;
+ }
+ }
+ }
+
+ public boolean isExtensionMapping()
+ {
+ return _isExtensionMapping;
+ }
+
+ public String getFilterName()
+ {
+ return _filterName;
+ }
+
+ public Class getFilterClass()
+ {
+ return _filterClass;
+ }
+
+ public String getUrlPattern()
+ {
+ return _urlPattern;
+ }
+}
Added: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/ServletMapping.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/ServletMapping.java?rev=1150140&view=auto
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/ServletMapping.java (added)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/ServletMapping.java Sat Jul 23 16:09:56 2011
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.shared_impl.webapp.webxml;
+
+/**
+ * @author Manfred Geiler (latest modification by $Author: matzew $)
+ * @version $Revision: 557350 $ $Date: 2007-07-18 13:19:50 -0500 (Mié, 18 Jul 2007) $
+ */
+public class ServletMapping
+{
+ private final String _servletName;
+ private final Class _servletClass;
+ private final String _urlPattern;
+ private final String _extension;
+ private final String _prefix;
+
+ public ServletMapping(String servletName, Class servletClass, String urlPattern)
+ {
+ _servletName = servletName;
+ _servletClass = servletClass;
+ _urlPattern = urlPattern;
+ _extension = _urlPattern != null && _urlPattern.startsWith("*.") ? _urlPattern.substring(_urlPattern
+ .indexOf('.')) : null;
+ if (_extension == null)
+ {
+ int index = _urlPattern.indexOf("/*");
+ if (index != -1)
+ {
+ _prefix = _urlPattern.substring(0, _urlPattern.indexOf("/*"));
+ }
+ else
+ {
+ _prefix = _urlPattern;
+ }
+ }
+ else
+ {
+ _prefix = null;
+ }
+ }
+
+ public boolean isExtensionMapping()
+ {
+ return _extension != null;
+ }
+
+ public String getExtension()
+ {
+ return _extension;
+ }
+
+ public String getPrefix()
+ {
+ return _prefix;
+ }
+
+ public String getServletName()
+ {
+ return _servletName;
+ }
+
+ public Class getServletClass()
+ {
+ return _servletClass;
+ }
+
+ public String getUrlPattern()
+ {
+ return _urlPattern;
+ }
+}
Added: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXml.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXml.java?rev=1150140&view=auto
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXml.java (added)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXml.java Sat Jul 23 16:09:56 2011
@@ -0,0 +1,282 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.shared_impl.webapp.webxml;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.faces.context.ExternalContext;
+import javax.faces.webapp.FacesServlet;
+
+import org.apache.myfaces.shared.config.MyfacesConfig;
+
+/**
+ * @author Manfred Geiler (latest modification by $Author: lu4242 $)
+ * @version $Revision: 1031726 $ $Date: 2010-11-05 14:15:42 -0500 (Vie, 05 Nov 2010) $
+ */
+public class WebXml
+{
+ //private static final Log log = LogFactory.getLog(WebXml.class);
+ private static final Logger log = Logger.getLogger(WebXml.class.getName());
+
+
+ private static long refreshPeriod;
+ private long parsingTime;
+
+ private Map _servlets = new HashMap();
+ private Map _servletMappings = new HashMap();
+ private Map _filters = new HashMap();
+ private Map _filterMappings = new HashMap();
+
+ private volatile List _facesServletMappings = null;
+ private volatile List _facesExtensionsFilterMappings = null;
+
+ private String _delegateFacesServlet = null;
+ private boolean errorPagePresent = false;
+
+ void addServlet(String servletName, String servletClass)
+ {
+ if (_servlets.get(servletName) != null)
+ {
+ log.warning("Servlet " + servletName + " defined more than once, first definition will be used.");
+ }
+ else
+ {
+ _servlets.put(servletName, servletClass);
+ }
+ }
+
+ void addFilter(String filterName, String filterClass)
+ {
+ if (_filters.get(filterName) != null)
+ {
+ log.warning("Filter " + filterName + " defined more than once, first definition will be used.");
+ }
+ else
+ {
+ _filters.put(filterName, filterClass);
+ }
+ }
+
+ boolean containsServlet(String servletName)
+ {
+ return _servlets.containsKey(servletName);
+ }
+
+ boolean containsFilter(String filterName)
+ {
+ return _filters.containsKey(filterName);
+ }
+
+ void addServletMapping(String servletName, String urlPattern)
+ {
+ List mappings = (List)_servletMappings.get(servletName);
+ if (mappings == null)
+ {
+ mappings = new ArrayList();
+ _servletMappings.put(servletName, mappings);
+ }
+ mappings.add(urlPattern);
+ }
+
+ void addFilterMapping(String filterName, String urlPattern)
+ {
+ List mappings = (List)_filterMappings.get(filterName);
+ if (mappings == null)
+ {
+ mappings = new ArrayList();
+ _filterMappings.put(filterName, mappings);
+ }
+ mappings.add(urlPattern);
+ }
+
+ public List getFacesServletMappings()
+ {
+ if (_facesServletMappings != null) return _facesServletMappings;
+
+ List tempFacesServletMappings = new ArrayList();
+ for (Iterator it = _servlets.entrySet().iterator(); it.hasNext(); )
+ {
+ Map.Entry entry = (Map.Entry)it.next();
+ String servletName = (String)entry.getKey();
+ if (null == entry.getValue())
+ {
+ // the value is null in the case of jsp files listed as servlets
+ // in cactus
+ // <servlet>
+ // <servlet-name>JspRedirector</servlet-name>
+ // <jsp-file>/jspRedirector.jsp</jsp-file>
+ // </servlet>
+ continue;
+ }
+ Class servletClass = org.apache.myfaces.shared.util.ClassUtils.simpleClassForName((String)entry.getValue());
+ if (FacesServlet.class.isAssignableFrom(servletClass) ||
+ DelegatedFacesServlet.class.isAssignableFrom(servletClass) ||
+ servletClass.getName().equals(_delegateFacesServlet))
+ {
+ List urlPatterns = (List)_servletMappings.get(servletName);
+ if( urlPatterns != null )
+ {
+ for (Iterator it2 = urlPatterns.iterator(); it2.hasNext(); )
+ {
+ String urlpattern = (String)it2.next();
+ tempFacesServletMappings.add(new org.apache.myfaces.shared_impl.webapp.webxml.ServletMapping(servletName,
+ servletClass,
+ urlpattern));
+ if (log.isLoggable(Level.FINEST))
+ log.finest("adding mapping for servlet + " + servletName + " urlpattern = " + urlpattern);
+ }
+ }
+ }
+ else
+ {
+ if (log.isLoggable(Level.FINEST)) log.finest("ignoring servlet + " + servletName + " " + servletClass + " (no FacesServlet)");
+ }
+ }
+
+ //Expose to all threads
+ _facesServletMappings = tempFacesServletMappings;
+
+ return _facesServletMappings;
+ }
+
+ /**
+ * returns a list of {@see #org.apache.myfaces.shared.webapp.webxml.FilterMapping}s representing a
+ * extensions filter entry
+ */
+ public List getFacesExtensionsFilterMappings()
+ {
+ if (_facesExtensionsFilterMappings != null) return _facesExtensionsFilterMappings;
+
+ List tempExtensionsFilterMappings = new ArrayList();
+ for (Iterator it = _filters.entrySet().iterator(); it.hasNext(); )
+ {
+ Map.Entry entry = (Map.Entry)it.next();
+ String filterName = (String)entry.getKey();
+ String filterClassName = (String)entry.getValue();
+
+ if (!"org.apache.myfaces.component.html.util.ExtensionsFilter".equals(filterClassName) &&
+ !"org.apache.myfaces.webapp.filter.ExtensionsFilter".equals(filterClassName))
+ {
+ // not an extensions filter
+ continue;
+ }
+
+ Class filterClass = org.apache.myfaces.shared.util.ClassUtils.simpleClassForName(filterClassName);
+ List urlPatterns = (List)_filterMappings.get(filterName);
+ if( urlPatterns != null )
+ {
+ for (Iterator it2 = urlPatterns.iterator(); it2.hasNext(); )
+ {
+ String urlpattern = (String)it2.next();
+ tempExtensionsFilterMappings.add(new org.apache.myfaces.shared_impl.webapp.webxml.FilterMapping(
+ filterName, filterClass, urlpattern));
+ if (log.isLoggable(Level.FINEST))
+ log.finest("adding mapping for filter + " + filterName + " urlpattern = " + urlpattern);
+ }
+ }
+ }
+
+ //Expose to all threads
+ _facesExtensionsFilterMappings = tempExtensionsFilterMappings;
+
+ return _facesExtensionsFilterMappings;
+ }
+
+ protected void setParsingTime(long parsingTime)
+ {
+ this.parsingTime = parsingTime;
+ }
+
+ private void setDelegateFacesServlet(String delegateFacesServlet)
+ {
+ this._delegateFacesServlet = delegateFacesServlet;
+ }
+
+ /**
+ * Sets if, the web.xml contains an error-page entry
+ * @param errorPagePresent
+ */
+ public void setErrorPagePresent(boolean errorPagePresent)
+ {
+ this.errorPagePresent = errorPagePresent;
+ }
+
+ /**
+ * Determines, if the web.xml contains an error-page entry
+ * @return
+ */
+ public boolean isErrorPagePresent()
+ {
+ return errorPagePresent;
+ }
+
+ protected boolean isOld(ExternalContext context)
+ {
+ if (refreshPeriod > 0) {
+ long ttl = this.parsingTime + refreshPeriod;
+ if (System.currentTimeMillis() > ttl) {
+ long lastModified = WebXmlParser.getWebXmlLastModified(context);
+ return lastModified == 0 || lastModified > ttl;
+ }
+ }
+ return false;
+ }
+
+ private static final String WEB_XML_ATTR = WebXml.class.getName();
+ public static WebXml getWebXml(ExternalContext context)
+ {
+ WebXml webXml = (WebXml)context.getApplicationMap().get(WEB_XML_ATTR);
+ if (webXml == null)
+ {
+ init(context);
+ webXml = (WebXml)context.getApplicationMap().get(WEB_XML_ATTR);
+ }
+ return webXml;
+ }
+
+ /**
+ * should be called when initialising Servlet
+ * @param context
+ */
+ public static void init(ExternalContext context)
+ {
+ WebXmlParser parser = new WebXmlParser(context);
+ WebXml webXml = parser.parse();
+ context.getApplicationMap().put(WEB_XML_ATTR, webXml);
+ MyfacesConfig mfconfig = MyfacesConfig.getCurrentInstance(context);
+ long configRefreshPeriod = mfconfig.getConfigRefreshPeriod();
+ webXml.setParsingTime(System.currentTimeMillis());
+ webXml.setDelegateFacesServlet(mfconfig.getDelegateFacesServlet());
+ refreshPeriod = (configRefreshPeriod * 1000);
+ }
+
+ public static void update(ExternalContext context)
+ {
+ if (getWebXml(context).isOld(context)){
+ WebXml.init(context);
+ }
+ }
+
+}
Added: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXmlParser.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXmlParser.java?rev=1150140&view=auto
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXmlParser.java (added)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXmlParser.java Sat Jul 23 16:09:56 2011
@@ -0,0 +1,373 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.shared_impl.webapp.webxml;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.faces.FacesException;
+import javax.faces.context.ExternalContext;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.apache.myfaces.shared.util.ClassUtils;
+import org.apache.myfaces.shared.util.xml.MyFacesErrorHandler;
+import org.apache.myfaces.shared.util.xml.XmlUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+
+/**
+ * @author Manfred Geiler (latest modification by $Author: lu4242 $)
+ * @version $Revision: 1041085 $ $Date: 2010-12-01 12:15:31 -0500 (Mié, 01 Dic 2010) $
+ */
+public class WebXmlParser
+{
+ //private static final Log log = LogFactory.getLog(WebXmlParser.class);
+ private static final Logger log = Logger.getLogger(WebXmlParser.class.getName());
+
+ /*
+ private static final String JAXP_SCHEMA_LANGUAGE =
+ "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
+ private static final String W3C_XML_SCHEMA =
+ "http://www.w3.org/2001/XMLSchema";
+ */
+
+ private static final String WEB_XML_PATH = "/WEB-INF/web.xml";
+
+ private static final String WEB_APP_2_2_J2EE_SYSTEM_ID = "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";
+ private static final String WEB_APP_2_2_SYSTEM_ID = "http://java.sun.com/dtd/web-app_2_2.dtd";
+ private static final String WEB_APP_2_2_RESOURCE = "javax/servlet/resources/web-app_2_2.dtd";
+
+ private static final String WEB_APP_2_3_SYSTEM_ID = "http://java.sun.com/dtd/web-app_2_3.dtd";
+ private static final String WEB_APP_2_3_RESOURCE = "javax/servlet/resources/web-app_2_3.dtd";
+
+ private ExternalContext _context;
+ private org.apache.myfaces.shared_impl.webapp.webxml.WebXml _webXml;
+
+ public WebXmlParser(ExternalContext context)
+ {
+ _context = context;
+ }
+
+ public WebXml parse()
+ {
+ _webXml = new WebXml();
+
+ try
+ {
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ dbf.setIgnoringElementContentWhitespace(true);
+ dbf.setIgnoringComments(true);
+ dbf.setNamespaceAware(true);
+ dbf.setValidating(false);
+// dbf.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
+
+ DocumentBuilder db = dbf.newDocumentBuilder();
+ db.setEntityResolver(new _EntityResolver());
+ db.setErrorHandler(new MyFacesErrorHandler(log));
+
+ InputSource is = createContextInputSource(null, WEB_XML_PATH);
+
+ if(is==null)
+ {
+ URL url = _context.getResource(WEB_XML_PATH);
+ log.fine("No web-xml found at : "+(url==null?" null ":url.toString()));
+ return _webXml;
+ }
+
+ Document document = db.parse(is);
+
+ Element webAppElem = document.getDocumentElement();
+ if (webAppElem == null ||
+ !webAppElem.getNodeName().equals("web-app"))
+ {
+ throw new FacesException("No valid web-app root element found!");
+ }
+
+ readWebApp(webAppElem);
+
+ return _webXml;
+ }
+ catch (Exception e)
+ {
+ log.log(Level.SEVERE, "Unable to parse web.xml", e);
+ throw new FacesException(e);
+ }
+ }
+
+ public static long getWebXmlLastModified(ExternalContext context)
+ {
+ try {
+ URL url = context.getResource(WEB_XML_PATH);
+ if (url != null)
+ return url.openConnection().getLastModified();
+ } catch (IOException e) {
+ log.log(Level.SEVERE, "Could not find web.xml in path " + WEB_XML_PATH);
+ }
+ return 0L;
+ }
+
+
+ private InputSource createContextInputSource(String publicId, String systemId)
+ {
+ InputStream inStream = _context.getResourceAsStream(systemId);
+ if (inStream == null)
+ {
+ // there is no such entity
+ return null;
+ }
+ InputSource is = new InputSource(inStream);
+ is.setPublicId(publicId);
+ is.setSystemId(systemId);
+ //the next line was removed - encoding should be determined automatically out of the inputStream
+ //DEFAULT_ENCODING was ISO-8859-1
+ //is.setEncoding(DEFAULT_ENCODING);
+ return is;
+ }
+
+ private InputSource createClassloaderInputSource(String publicId, String systemId)
+ {
+ InputStream inStream = ClassUtils.getResourceAsStream(systemId);
+ if (inStream == null)
+ {
+ // there is no such entity
+ return null;
+ }
+ InputSource is = new InputSource(inStream);
+ is.setPublicId(publicId);
+ is.setSystemId(systemId);
+ //the next line was removed - encoding should be determined automatically out of the inputStream
+ //encoding should be determined automatically out of the inputStream
+ //DEFAULT_ENCODING was ISO-8859-1
+ //is.setEncoding(DEFAULT_ENCODING);
+ return is;
+ }
+
+ private class _EntityResolver implements EntityResolver
+ {
+ public InputSource resolveEntity(String publicId, String systemId) throws IOException
+ {
+ if (systemId == null)
+ {
+ throw new UnsupportedOperationException("systemId must not be null");
+ }
+
+ if (systemId.equals(WebXmlParser.WEB_APP_2_2_SYSTEM_ID) ||
+ systemId.equals(WebXmlParser.WEB_APP_2_2_J2EE_SYSTEM_ID))
+ {
+ //Load DTD from servlet.jar
+ return createClassloaderInputSource(publicId, WebXmlParser.WEB_APP_2_2_RESOURCE);
+ }
+ else if (systemId.equals(WebXmlParser.WEB_APP_2_3_SYSTEM_ID))
+ {
+ //Load DTD from servlet.jar
+ return createClassloaderInputSource(publicId, WebXmlParser.WEB_APP_2_3_RESOURCE);
+ }
+ else
+ {
+ //Load additional entities from web context
+ return createContextInputSource(publicId, systemId);
+ }
+ }
+
+ }
+
+
+ private void readWebApp(Element webAppElem)
+ {
+ NodeList nodeList = webAppElem.getChildNodes();
+ for (int i = 0, len = nodeList.getLength(); i < len; i++)
+ {
+ Node n = nodeList.item(i);
+ if (n.getNodeType() == Node.ELEMENT_NODE)
+ {
+ if (n.getNodeName().equals("servlet"))
+ {
+ readServlet((Element)n);
+ }
+ if (n.getNodeName().equals("servlet-mapping"))
+ {
+ readServletMapping((Element)n);
+ }
+ if (n.getNodeName().equals("filter"))
+ {
+ readFilter((Element)n);
+ }
+ if (n.getNodeName().equals("filter-mapping"))
+ {
+ readFilterMapping((Element)n);
+ }
+ if (n.getNodeName().equals("error-page"))
+ {
+ _webXml.setErrorPagePresent(true);
+ }
+ }
+ else
+ {
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ }
+ }
+ }
+
+ private void readServlet(Element servletElem)
+ {
+ String servletName = null;
+ String servletClass = null;
+ NodeList nodeList = servletElem.getChildNodes();
+ for (int i = 0, len = nodeList.getLength(); i < len; i++)
+ {
+ Node n = nodeList.item(i);
+ if (n.getNodeType() == Node.ELEMENT_NODE)
+ {
+ if (n.getNodeName().equals("servlet-name"))
+ {
+ servletName = XmlUtils.getElementText((Element)n);
+ }
+ else if (n.getNodeName().equals("servlet-class"))
+ {
+ servletClass = org.apache.myfaces.shared.util.xml.XmlUtils.getElementText((Element)n).trim();
+ }
+ else if (n.getNodeName().equals("description") || n.getNodeName().equals("load-on-startup") || n.getNodeName().equals("init-param"))
+ {
+ //ignore
+ }
+ else
+ {
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + servletElem.getNodeName() + "'.");
+ }
+ }
+ else
+ {
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ }
+ }
+ _webXml.addServlet(servletName, servletClass);
+ }
+
+
+ private void readServletMapping(Element servletMappingElem)
+ {
+ String servletName = null;
+ String urlPattern = null;
+ NodeList nodeList = servletMappingElem.getChildNodes();
+ for (int i = 0, len = nodeList.getLength(); i < len; i++)
+ {
+ Node n = nodeList.item(i);
+ if (n.getNodeType() == Node.ELEMENT_NODE)
+ {
+ if (n.getNodeName().equals("servlet-name"))
+ {
+ servletName = org.apache.myfaces.shared.util.xml.XmlUtils.getElementText((Element)n);
+ }
+ else if (n.getNodeName().equals("url-pattern"))
+ {
+ urlPattern = org.apache.myfaces.shared.util.xml.XmlUtils.getElementText((Element)n).trim();
+ }
+ else
+ {
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + servletMappingElem.getNodeName() + "'.");
+ }
+ }
+ else
+ {
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ }
+ }
+ urlPattern = urlPattern.trim();
+ _webXml.addServletMapping(servletName, urlPattern);
+ }
+
+ private void readFilter(Element filterElem)
+ {
+ String filterName = null;
+ String filterClass = null;
+ NodeList nodeList = filterElem.getChildNodes();
+ for (int i = 0, len = nodeList.getLength(); i < len; i++)
+ {
+ Node n = nodeList.item(i);
+ if (n.getNodeType() == Node.ELEMENT_NODE)
+ {
+ if (n.getNodeName().equals("filter-name"))
+ {
+ filterName = XmlUtils.getElementText((Element)n).trim();
+ }
+ else if (n.getNodeName().equals("filter-class"))
+ {
+ filterClass = org.apache.myfaces.shared.util.xml.XmlUtils.getElementText((Element)n).trim();
+ }
+ else if (n.getNodeName().equals("description") || n.getNodeName().equals("init-param"))
+ {
+ //ignore
+ }
+ else
+ {
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + filterElem.getNodeName() + "'.");
+ }
+ }
+ else
+ {
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ }
+ }
+ _webXml.addFilter(filterName, filterClass);
+ }
+
+
+ private void readFilterMapping(Element filterMappingElem)
+ {
+ String filterName = null;
+ String urlPattern = null;
+ NodeList nodeList = filterMappingElem.getChildNodes();
+ for (int i = 0, len = nodeList.getLength(); i < len; i++)
+ {
+ Node n = nodeList.item(i);
+ if (n.getNodeType() == Node.ELEMENT_NODE)
+ {
+ if (n.getNodeName().equals("filter-name"))
+ {
+ filterName = org.apache.myfaces.shared.util.xml.XmlUtils.getElementText((Element)n).trim();
+ }
+ else if (n.getNodeName().equals("url-pattern"))
+ {
+ urlPattern = org.apache.myfaces.shared.util.xml.XmlUtils.getElementText((Element)n).trim();
+ }
+ else if (n.getNodeName().equals("servlet-name"))
+ {
+ // we are not interested in servlet-name based mapping - for now
+ }
+ else
+ {
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + filterMappingElem.getNodeName() + "'.");
+ }
+ }
+ else
+ {
+ if (log.isLoggable(Level.FINE)) log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ }
+ }
+ _webXml.addFilterMapping(filterName, urlPattern);
+ }
+}
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/FactoryFinderProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/FactoryFinderProviderFactory.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/FactoryFinderProviderFactory.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/FactoryFinderProviderFactory.java Sat Jul 23 16:09:56 2011
@@ -22,7 +22,7 @@ import java.lang.reflect.Field;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
/**
* <p>{@link javax.faces.FactoryFinder} is a class with three methods:</p>
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinderFactory.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinderFactory.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinderFactory.java Sat Jul 23 16:09:56 2011
@@ -23,7 +23,7 @@ import javax.faces.context.ExternalConte
import javax.servlet.ServletContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.impl.DefaultServiceProviderFinder;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/WebConfigProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/WebConfigProvider.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/WebConfigProvider.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/WebConfigProvider.java Sat Jul 23 16:09:56 2011
@@ -38,7 +38,7 @@ public abstract class WebConfigProvider
* </p>
* <ol>
* <li>Mappings related to registered servlet class javax.faces.webapp.FacesServlet.</li>
- * <li>Mappings related to registered servlet class implementing org.apache.myfaces.shared_impl.webapp.webxml.DelegatedFacesServlet interface.</li>
+ * <li>Mappings related to registered servlet class implementing org.apache.myfaces.shared.webapp.webxml.DelegatedFacesServlet interface.</li>
* <li>Mappings related to registered servlet class registered using org.apache.myfaces.DELEGATE_FACES_SERVLET web config param.</li>
* </ol>
*
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java Sat Jul 23 16:09:56 2011
@@ -19,7 +19,7 @@
package org.apache.myfaces.spi.impl;
import org.apache.myfaces.config.annotation.DefaultAnnotationProvider;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.AnnotationProvider;
import org.apache.myfaces.spi.AnnotationProviderFactory;
import org.apache.myfaces.spi.ServiceProviderFinderFactory;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java Sat Jul 23 16:09:56 2011
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.spi.impl;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.FaceletConfigResourceProvider;
import org.apache.myfaces.spi.FaceletConfigResourceProviderFactory;
import org.apache.myfaces.spi.ServiceProviderFinderFactory;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java Sat Jul 23 16:09:56 2011
@@ -19,7 +19,7 @@
package org.apache.myfaces.spi.impl;
import org.apache.myfaces.config.DefaultFacesConfigResourceProvider;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.FacesConfigResourceProvider;
import org.apache.myfaces.spi.FacesConfigResourceProviderFactory;
import org.apache.myfaces.spi.ServiceProviderFinderFactory;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationMergerFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationMergerFactory.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationMergerFactory.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationMergerFactory.java Sat Jul 23 16:09:56 2011
@@ -19,7 +19,7 @@
package org.apache.myfaces.spi.impl;
import org.apache.myfaces.config.DefaultFacesConfigurationMerger;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.FacesConfigurationMerger;
import org.apache.myfaces.spi.FacesConfigurationMergerFactory;
import org.apache.myfaces.spi.ServiceProviderFinderFactory;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java Sat Jul 23 16:09:56 2011
@@ -19,7 +19,7 @@
package org.apache.myfaces.spi.impl;
import org.apache.myfaces.config.DefaultFacesConfigurationProvider;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.FacesConfigurationProvider;
import org.apache.myfaces.spi.FacesConfigurationProviderFactory;
import org.apache.myfaces.spi.ServiceProviderFinderFactory;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceProviderFinder.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceProviderFinder.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceProviderFinder.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceProviderFinder.java Sat Jul 23 16:09:56 2011
@@ -31,7 +31,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.ServiceProviderFinder;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java Sat Jul 23 16:09:56 2011
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
import javax.faces.FacesException;
import javax.faces.context.ExternalContext;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.ServiceProviderFinderFactory;
import org.apache.myfaces.spi.WebConfigProvider;
import org.apache.myfaces.spi.WebConfigProviderFactory;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java Sat Jul 23 16:09:56 2011
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
import javax.faces.context.ExternalContext;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.ServiceProviderFinderFactory;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java Sat Jul 23 16:09:56 2011
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.taglib.core;
-import org.apache.myfaces.shared_impl.taglib.UIComponentELTagUtils;
-import org.apache.myfaces.shared_impl.util.LocaleUtils;
+import org.apache.myfaces.shared.taglib.UIComponentELTagUtils;
+import org.apache.myfaces.shared.util.LocaleUtils;
import javax.el.ELContext;
import javax.el.ValueExpression;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java Sat Jul 23 16:09:56 2011
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.taglib.core;
-import org.apache.myfaces.shared_impl.taglib.UIComponentELTagUtils;
+import org.apache.myfaces.shared.taglib.UIComponentELTagUtils;
import javax.el.ELContext;
import javax.el.ValueExpression;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateActionListener.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateActionListener.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateActionListener.java Sat Jul 23 16:09:56 2011
@@ -27,7 +27,7 @@ import javax.faces.event.AbortProcessing
import javax.faces.event.ActionEvent;
import javax.faces.event.ActionListener;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/GenericListenerTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/GenericListenerTag.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/GenericListenerTag.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/GenericListenerTag.java Sat Jul 23 16:09:56 2011
@@ -28,7 +28,7 @@ import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.Tag;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
/**
* @author Andreas Berger (latest modification by $Author$)
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java Sat Jul 23 16:09:56 2011
@@ -38,7 +38,7 @@ import javax.el.ValueExpression;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspAttribute;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspTag;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
/**
* Loads a resource bundle and saves it as a variable in the request scope.
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/ParamTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/ParamTag.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/ParamTag.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/ParamTag.java Sat Jul 23 16:09:56 2011
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.taglib.core;
-import org.apache.myfaces.shared_impl.taglib.UIComponentELTagBase;
+import org.apache.myfaces.shared.taglib.UIComponentELTagBase;
import javax.faces.component.UIComponent;
import javax.el.ValueExpression;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java Sat Jul 23 16:09:56 2011
@@ -36,7 +36,7 @@ import javax.servlet.jsp.tagext.TagSuppo
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspAttribute;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspTag;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
/**
* Register a PhaseListener instance
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/SelectItemTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/SelectItemTag.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/SelectItemTag.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/SelectItemTag.java Sat Jul 23 16:09:56 2011
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.taglib.core;
-import org.apache.myfaces.shared_impl.taglib.core.SelectItemTagBase;
+import org.apache.myfaces.shared.taglib.core.SelectItemTagBase;
/**
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java Sat Jul 23 16:09:56 2011
@@ -20,8 +20,8 @@ package org.apache.myfaces.taglib.core;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspAttribute;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspTag;
-import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
-import org.apache.myfaces.shared_impl.taglib.UIComponentELTagBase;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.taglib.UIComponentELTagBase;
import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java Sat Jul 23 16:09:56 2011
@@ -36,7 +36,7 @@ import javax.servlet.jsp.JspException;
import javax.servlet.jsp.jstl.core.Config;
import org.apache.myfaces.application.jsp.ServletViewResponseWrapper;
-import org.apache.myfaces.shared_impl.util.LocaleUtils;
+import org.apache.myfaces.shared.util.LocaleUtils;
/**
* @author Manfred Geiler (latest modification by $Author$)
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java Sat Jul 23 16:09:56 2011
@@ -21,7 +21,7 @@ package org.apache.myfaces.util;
import javax.faces.context.ExternalContext;
import javax.servlet.ServletContext;
-import org.apache.myfaces.shared_impl.util.ExternalContextUtils;
+import org.apache.myfaces.shared.util.ExternalContextUtils;
/**
* Utilities for determining the current container and for the unified
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementHelper.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementHelper.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementHelper.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementHelper.java Sat Jul 23 16:09:56 2011
@@ -43,8 +43,8 @@ import javax.faces.context.FacesContext;
import org.apache.commons.collections.map.AbstractReferenceMap;
import org.apache.commons.collections.map.ReferenceMap;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.util.MyFacesObjectInputStream;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.util.MyFacesObjectInputStream;
/**
* This helper class contains methods used by DefaultFaceletsStateManagementStrategy that comes
Modified: myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java?rev=1150140&r1=1150139&r2=1150140&view=diff
==============================================================================
--- myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java (original)
+++ myfaces/core/branches/refactor_shared_2_1_x/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java Sat Jul 23 16:09:56 2011
@@ -49,9 +49,9 @@ import javax.faces.view.ViewDeclarationL
import javax.faces.view.ViewMetadata;
import org.apache.myfaces.application.StateManagerImpl;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
-import org.apache.myfaces.shared_impl.util.HashMapUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
+import org.apache.myfaces.shared.util.HashMapUtils;
/**
* This class implements partial state saving feature when facelets