You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/12/04 13:08:33 UTC
svn commit: r1042158 - in /myfaces/extensions/cdi/trunk:
examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/WEB-INF/
jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/
jee-modules/jsf-module/api/src/m...
Author: gpetracek
Date: Sat Dec 4 12:08:32 2010
New Revision: 1042158
URL: http://svn.apache.org/viewvc?rev=1042158&view=rev
Log:
cleanup
Added:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/ClientConfig.java
- copied, changed from r1042057, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/ClientInformation.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultClientConfig.java
- copied, changed from r1042057, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientInformationImpl.java
Removed:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/ClientInformation.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientInformationImpl.java
Modified:
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/WEB-INF/web.xml
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/Page.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientSideWindowHandler.java
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/WEB-INF/web.xml?rev=1042158&r1=1042157&r2=1042158&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/WEB-INF/web.xml Sat Dec 4 12:08:32 2010
@@ -29,6 +29,12 @@
<param-value>Development</param-value>
</context-param>
+ <!-- we use geronimos jasper-el version for now as EL-2.2 implementation -->
+ <context-param>
+ <param-name>org.apache.myfaces.EXPRESSION_FACTORY</param-name>
+ <param-value>de.apache.el.ExpressionFactoryImpl</param-value>
+ </context-param>
+
<listener>
<listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
</listener>
@@ -40,11 +46,6 @@
<load-on-startup>1</load-on-startup>
</servlet>
- <!-- we use geronimos jasper-el version for now as EL-2.2 implementation -->
- <context-param>
- <param-name>org.apache.myfaces.EXPRESSION_FACTORY</param-name>
- <param-value>de.apache.el.ExpressionFactoryImpl</param-value>
- </context-param>
<!-- Faces Servlet Mapping -->
<servlet-mapping>
Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/ClientConfig.java (from r1042057, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/ClientInformation.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/ClientConfig.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/ClientConfig.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/ClientInformation.java&r1=1042057&r2=1042158&rev=1042158&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/ClientInformation.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/ClientConfig.java Sat Dec 4 12:08:32 2010
@@ -30,7 +30,7 @@ import java.io.Serializable;
* This allows the 'customisation' of this html file to e.g.
* adopt the background colour to avoid screen flickering.
*/
-public interface ClientInformation extends Serializable
+public interface ClientConfig extends Serializable
{
/**
* The location of the default windowhandler resource
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/Page.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/Page.java?rev=1042158&r1=1042157&r2=1042158&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/Page.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/Page.java Sat Dec 4 12:08:32 2010
@@ -18,8 +18,6 @@
*/
package org.apache.myfaces.extensions.cdi.jsf.api.config.view;
-//import org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig;
-
import javax.enterprise.inject.Stereotype;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
@@ -53,9 +51,6 @@ public @interface Page
ViewParameter viewParams() default ViewParameter.DEFAULT;
- //TODO
- //Class<? extends ViewConfig> sharedViewConfig() default ViewConfig.class;
-
public interface Extension
{
String XHTML = "xhtml";
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientSideWindowHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientSideWindowHandler.java?rev=1042158&r1=1042157&r2=1042158&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientSideWindowHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientSideWindowHandler.java Sat Dec 4 12:08:32 2010
@@ -24,7 +24,7 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.LifecycleAwareWindowHandler;
import org.apache.myfaces.extensions.cdi.jsf.impl.util.JsfUtils;
import org.apache.myfaces.extensions.cdi.jsf.impl.util.ConversationUtils;
-import org.apache.myfaces.extensions.cdi.jsf.api.config.ClientInformation;
+import org.apache.myfaces.extensions.cdi.jsf.api.config.ClientConfig;
import org.apache.myfaces.extensions.cdi.jsf.api.request.RequestTypeResolver;
import javax.enterprise.context.ApplicationScoped;
@@ -57,7 +57,7 @@ public class ClientSideWindowHandler ext
private static final String NOSCRIPT_PARAMETER = "noscript";
@Inject
- private ClientInformation clientInformation;
+ private ClientConfig clientConfig;
@Inject
private EditableWindowContextManager windowContextManager;
@@ -79,7 +79,7 @@ public class ClientSideWindowHandler ext
@Override
public String encodeURL(String url)
{
- if (this.clientInformation.isJavaScriptEnabled())
+ if (this.clientConfig.isJavaScriptEnabled())
{
// do not add the windowId
return url;
@@ -94,7 +94,7 @@ public class ClientSideWindowHandler ext
@Override
public String restoreWindowId(ExternalContext externalContext)
{
- if (this.clientInformation.isJavaScriptEnabled())
+ if (this.clientConfig.isJavaScriptEnabled())
{
return (String) externalContext.getRequestMap().get(WindowContextManager.WINDOW_CONTEXT_ID_PARAMETER_KEY);
}
@@ -117,7 +117,7 @@ public class ClientSideWindowHandler ext
if (isNoscriptRequest(externalContext))
{
// the client has JavaScript disabled
- clientInformation.setJavaScriptEnabled(false);
+ clientConfig.setJavaScriptEnabled(false);
return;
}
@@ -154,7 +154,7 @@ public class ClientSideWindowHandler ext
{
// no POST request and javascript enabled
// NOTE that for POST-requests the windowId is saved in the state (see WindowContextIdHolderComponent)
- return !this.requestTypeResolver.isPostRequest() && this.clientInformation.isJavaScriptEnabled();
+ return !this.requestTypeResolver.isPostRequest() && this.clientConfig.isJavaScriptEnabled();
}
private boolean isNoscriptRequest(ExternalContext externalContext)
@@ -173,7 +173,7 @@ public class ClientSideWindowHandler ext
httpResponse.setStatus(HttpServletResponse.SC_OK);
httpResponse.setContentType("text/html");
- String windowHandlerHtml = this.clientInformation.getWindowHandlerHtml();
+ String windowHandlerHtml = this.clientConfig.getWindowHandlerHtml();
if (windowId == null)
{
Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultClientConfig.java (from r1042057, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientInformationImpl.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultClientConfig.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultClientConfig.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientInformationImpl.java&r1=1042057&r2=1042158&rev=1042158&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ClientInformationImpl.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultClientConfig.java Sat Dec 4 12:08:32 2010
@@ -20,7 +20,7 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.projectstage.ProjectStage;
import org.apache.myfaces.extensions.cdi.core.api.util.ClassUtils;
-import org.apache.myfaces.extensions.cdi.jsf.api.config.ClientInformation;
+import org.apache.myfaces.extensions.cdi.jsf.api.config.ClientConfig;
import javax.enterprise.context.SessionScoped;
import javax.inject.Inject;
@@ -37,7 +37,7 @@ import java.io.InputStream;
* adopt the background colour to avoid screen flickering.
*/
@SessionScoped
-public class ClientInformationImpl implements ClientInformation
+public class DefaultClientConfig implements ClientConfig
{
private static final long serialVersionUID = -3264016646002116064L;