Author: alexsmirnov
Date: 2008-02-05 18:30:22 -0500 (Tue, 05 Feb 2008)
New Revision: 5843
Modified:
trunk/extensions/portletbridge/portletbridge-impl/pom.xml
trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/context/ServletExternalContextImpl.java
trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/lifecycle/LifecyclePhase.java
trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/lifecycle/RestoreViewPhase.java
trunk/extensions/portletbridge/portletbridge-impl/src/test/java/org/ajax4jsf/portlet/context/PortletExternalContextTest.java
trunk/samples/seamPortletEar/pom.xml
Log:
Switch Portlet bridge to a Seam 2.1.0-SNAPSHOT
Modified: trunk/extensions/portletbridge/portletbridge-impl/pom.xml
===================================================================
--- trunk/extensions/portletbridge/portletbridge-impl/pom.xml 2008-02-05 19:08:52 UTC (rev
5842)
+++ trunk/extensions/portletbridge/portletbridge-impl/pom.xml 2008-02-05 23:30:22 UTC (rev
5843)
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<dependency>
Modified:
trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/context/ServletExternalContextImpl.java
===================================================================
---
trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/context/ServletExternalContextImpl.java 2008-02-05
19:08:52 UTC (rev 5842)
+++
trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/context/ServletExternalContextImpl.java 2008-02-05
23:30:22 UTC (rev 5843)
@@ -68,10 +68,13 @@
if (null != stateId) {
PortletViewState windowState = portletStateHolder
.getWindowState(stateId);
- namespace = windowState.getNamespace();
- sessionPrefix = WindowIDRetriver.PORTLET_SCOPE_PREFIX
- + windowState.getWindowId() + '?';
- portalActionUrl = windowState.getPortalActionURL();
+ if (null != windowState) {
+ namespace = windowState.getNamespace();
+ sessionPrefix = WindowIDRetriver.PORTLET_SCOPE_PREFIX
+ + windowState.getWindowId() + '?';
+ portalActionUrl = windowState.getPortalActionURL();
+
+ }
}
}
}
Modified:
trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/lifecycle/LifecyclePhase.java
===================================================================
---
trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/lifecycle/LifecyclePhase.java 2008-02-05
19:08:52 UTC (rev 5842)
+++
trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/lifecycle/LifecyclePhase.java 2008-02-05
23:30:22 UTC (rev 5843)
@@ -52,7 +52,7 @@
try {
executePhase(context);
} catch (Exception e) {
- _log.error("Error execute phase "+getPhaseId().toString());
+ _log.error("Error execute phase "+getPhaseId().toString(),e);
if(PhaseId.RENDER_RESPONSE.compareTo(getPhaseId())==0){
throw new FacesException(e);
}
Modified:
trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/lifecycle/RestoreViewPhase.java
===================================================================
---
trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/lifecycle/RestoreViewPhase.java 2008-02-05
19:08:52 UTC (rev 5842)
+++
trunk/extensions/portletbridge/portletbridge-impl/src/main/java/org/ajax4jsf/portlet/lifecycle/RestoreViewPhase.java 2008-02-05
23:30:22 UTC (rev 5843)
@@ -6,6 +6,7 @@
import java.util.Iterator;
import javax.faces.FactoryFinder;
+import javax.faces.application.ViewExpiredException;
import javax.faces.application.ViewHandler;
import javax.faces.component.UIComponent;
import javax.faces.component.UIViewRoot;
@@ -77,9 +78,13 @@
viewRoot = viewHandler.restoreView(context, viewId);
if (null != viewRoot) {
processBindings(context, viewRoot);
+ } else {
+ // Error restore view. Session Expired ?
+ throw new ViewExpiredException("Error restore view "+viewId+",
session expired?");
}
} else {
viewRoot = viewHandler.createView(context, viewId);
+ context.renderResponse();
}
context.setViewRoot(viewRoot);
}
Modified:
trunk/extensions/portletbridge/portletbridge-impl/src/test/java/org/ajax4jsf/portlet/context/PortletExternalContextTest.java
===================================================================
---
trunk/extensions/portletbridge/portletbridge-impl/src/test/java/org/ajax4jsf/portlet/context/PortletExternalContextTest.java 2008-02-05
19:08:52 UTC (rev 5842)
+++
trunk/extensions/portletbridge/portletbridge-impl/src/test/java/org/ajax4jsf/portlet/context/PortletExternalContextTest.java 2008-02-05
23:30:22 UTC (rev 5843)
@@ -69,6 +69,7 @@
* Test method for {@link
org.ajax4jsf.portlet.context.PortletExternalContextImpl#getInitParameter(java.lang.String)}.
*/
public final void testGetInitParameterString() {
+ servletContext.addInitParameter(MockPortletContext.INIT_PARAMETER,
MockPortletContext.PORTLET_INIT_VALUE);
assertNull(portalFacesContext.getExternalContext().getInitParameter("blabla"));
assertSame(MockPortletContext.PORTLET_INIT_VALUE,
portalFacesContext.getExternalContext().getInitParameter(MockPortletContext.INIT_PARAMETER));
}
Modified: trunk/samples/seamPortletEar/pom.xml
===================================================================
--- trunk/samples/seamPortletEar/pom.xml 2008-02-05 19:08:52 UTC (rev 5842)
+++ trunk/samples/seamPortletEar/pom.xml 2008-02-05 23:30:22 UTC (rev 5843)
@@ -14,7 +14,7 @@
<packaging>pom</packaging>
<name>seam EAR portlet project</name>
<properties>
- <seam>2.0.1.SNAPSHOT</seam>
+ <seam>2.1.0-SNAPSHOT</seam>
</properties>
<modules>
<module>seamBookingPortlet</module>
Show replies by date