JBoss Portal SVN: r13186 - modules/portlet/branches/JBP_PORTLET_2_0_5_JBEPP-60/portlet/src/main/java/org/jboss/portal/portlet/impl/spi.
by portal-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2009-04-08 09:06:22 -0400 (Wed, 08 Apr 2009)
New Revision: 13186
Modified:
modules/portlet/branches/JBP_PORTLET_2_0_5_JBEPP-60/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractServerContext.java
Log:
[JBEPP-60] [JBEPP-54] - Using PortletResponse.addProperty(javax.servlet.http.Cookie) does not set the cookie in the response
Modified: modules/portlet/branches/JBP_PORTLET_2_0_5_JBEPP-60/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractServerContext.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_2_0_5_JBEPP-60/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractServerContext.java 2009-04-08 12:30:44 UTC (rev 13185)
+++ modules/portlet/branches/JBP_PORTLET_2_0_5_JBEPP-60/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractServerContext.java 2009-04-08 13:06:22 UTC (rev 13186)
@@ -68,4 +68,9 @@
{
return servletContainer.include(targetServletContext, clientRequest, clientResponse, callback, handback);
}
+
+ public HttpServletResponse getResponse()
+ {
+ return clientResponse;
+ }
}
15 years, 2 months
JBoss Portal SVN: r13185 - modules/portlet/branches.
by portal-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2009-04-08 08:30:44 -0400 (Wed, 08 Apr 2009)
New Revision: 13185
Removed:
modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/
Log:
[JBEPP-60] Patch needs 2.0.5
15 years, 2 months
JBoss Portal SVN: r13184 - modules/portlet/branches.
by portal-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2009-04-08 08:24:01 -0400 (Wed, 08 Apr 2009)
New Revision: 13184
Added:
modules/portlet/branches/JBP_PORTLET_2_0_5_JBEPP-60/
Log:
[JBEPP-60] Branch for patch
Copied: modules/portlet/branches/JBP_PORTLET_2_0_5_JBEPP-60 (from rev 12555, modules/portlet/tags/JBP_PORTLET_2_0_5)
15 years, 2 months
JBoss Portal SVN: r13183 - branches.
by portal-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2009-04-08 07:35:23 -0400 (Wed, 08 Apr 2009)
New Revision: 13183
Added:
branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-60/
Log:
[JBEPP-60] Branch for patch
Copied: branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-60 (from rev 13090, branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-51)
15 years, 2 months
JBoss Portal SVN: r13182 - in modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60: mc and 4 other directories.
by portal-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2009-04-08 04:59:54 -0400 (Wed, 08 Apr 2009)
New Revision: 13182
Modified:
modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/mc/pom.xml
modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/pom.xml
modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/portal/pom.xml
modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/portlet/pom.xml
modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/samples/pom.xml
modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/test/pom.xml
Log:
[JBEPP-60] Modifying pom versions
Modified: modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/mc/pom.xml
===================================================================
--- modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/mc/pom.xml 2009-04-08 08:58:53 UTC (rev 13181)
+++ modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/mc/pom.xml 2009-04-08 08:59:54 UTC (rev 13182)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.4</version>
+ <version>2.0.4_JBEPP-60</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/pom.xml
===================================================================
--- modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/pom.xml 2009-04-08 08:58:53 UTC (rev 13181)
+++ modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/pom.xml 2009-04-08 08:59:54 UTC (rev 13182)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Portlet Module Aggregator</name>
- <version>2.0.4</version>
+ <version>2.0.4_JBEPP-60</version>
<url>http://labs.jboss.com/jbossportal</url>
<dependencies/>
Modified: modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/portal/pom.xml
===================================================================
--- modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/portal/pom.xml 2009-04-08 08:58:53 UTC (rev 13181)
+++ modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/portal/pom.xml 2009-04-08 08:59:54 UTC (rev 13182)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.4</version>
+ <version>2.0.4_JBEPP-60</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/portlet/pom.xml
===================================================================
--- modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/portlet/pom.xml 2009-04-08 08:58:53 UTC (rev 13181)
+++ modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/portlet/pom.xml 2009-04-08 08:59:54 UTC (rev 13182)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.4</version>
+ <version>2.0.4_JBEPP-60</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/samples/pom.xml
===================================================================
--- modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/samples/pom.xml 2009-04-08 08:58:53 UTC (rev 13181)
+++ modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/samples/pom.xml 2009-04-08 08:59:54 UTC (rev 13182)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.4</version>
+ <version>2.0.4_JBEPP-60</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/test/pom.xml
===================================================================
--- modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/test/pom.xml 2009-04-08 08:58:53 UTC (rev 13181)
+++ modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/test/pom.xml 2009-04-08 08:59:54 UTC (rev 13182)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.4</version>
+ <version>2.0.4_JBEPP-60</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
15 years, 2 months
JBoss Portal SVN: r13181 - in modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60: build and 6 other directories.
by portal-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2009-04-08 04:58:53 -0400 (Wed, 08 Apr 2009)
New Revision: 13181
Modified:
modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/bridge/pom.xml
modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/build/pom.xml
modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/controller/pom.xml
modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/docs/pom.xml
modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/federation/pom.xml
modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/jsr168api/pom.xml
modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/management/pom.xml
modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractServerContext.java
Log:
[JBEPP-60] [JBEPP-54] - Using PortletResponse.addProperty(javax.servlet.http.Cookie) does not set the cookie in the response
Modified: modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/bridge/pom.xml
===================================================================
--- modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/bridge/pom.xml 2009-04-08 07:28:11 UTC (rev 13180)
+++ modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/bridge/pom.xml 2009-04-08 08:58:53 UTC (rev 13181)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.4</version>
+ <version>2.0.4_JBEPP-60</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/build/pom.xml
===================================================================
--- modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/build/pom.xml 2009-04-08 07:28:11 UTC (rev 13180)
+++ modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/build/pom.xml 2009-04-08 08:58:53 UTC (rev 13181)
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.4</version>
+ <version>2.0.4_JBEPP-60</version>
<packaging>pom</packaging>
<name>JBoss Portal Portlet Module</name>
<description>JBoss Portal Portlet Module</description>
Modified: modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/controller/pom.xml
===================================================================
--- modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/controller/pom.xml 2009-04-08 07:28:11 UTC (rev 13180)
+++ modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/controller/pom.xml 2009-04-08 08:58:53 UTC (rev 13181)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.4</version>
+ <version>2.0.4_JBEPP-60</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/docs/pom.xml
===================================================================
--- modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/docs/pom.xml 2009-04-08 07:28:11 UTC (rev 13180)
+++ modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/docs/pom.xml 2009-04-08 08:58:53 UTC (rev 13181)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.4</version>
+ <version>2.0.4_JBEPP-60</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<artifactId>docs-aggregator</artifactId>
Modified: modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/federation/pom.xml
===================================================================
--- modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/federation/pom.xml 2009-04-08 07:28:11 UTC (rev 13180)
+++ modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/federation/pom.xml 2009-04-08 08:58:53 UTC (rev 13181)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.4</version>
+ <version>2.0.4_JBEPP-60</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/jsr168api/pom.xml
===================================================================
--- modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/jsr168api/pom.xml 2009-04-08 07:28:11 UTC (rev 13180)
+++ modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/jsr168api/pom.xml 2009-04-08 08:58:53 UTC (rev 13181)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.4</version>
+ <version>2.0.4_JBEPP-60</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/management/pom.xml
===================================================================
--- modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/management/pom.xml 2009-04-08 07:28:11 UTC (rev 13180)
+++ modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/management/pom.xml 2009-04-08 08:58:53 UTC (rev 13181)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.4</version>
+ <version>2.0.4_JBEPP-60</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractServerContext.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractServerContext.java 2009-04-08 07:28:11 UTC (rev 13180)
+++ modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractServerContext.java 2009-04-08 08:58:53 UTC (rev 13181)
@@ -68,4 +68,9 @@
{
return servletContainer.include(targetServletContext, clientRequest, clientResponse, callback, handback);
}
+
+ public HttpServletResponse getResponse()
+ {
+ return clientResponse;
+ }
}
15 years, 2 months
JBoss Portal SVN: r13180 - in branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui: dashboard and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-04-08 03:28:11 -0400 (Wed, 08 Apr 2009)
New Revision: 13180
Modified:
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java
branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java
Log:
JBEPP-58: Default portlets store non serializable attributes in the session
Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2009-04-08 05:32:21 UTC (rev 13179)
+++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2009-04-08 07:28:11 UTC (rev 13180)
@@ -59,8 +59,9 @@
* @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision$
*/
-public class InstanceManagerBean
+public class InstanceManagerBean implements Serializable
{
+ private static final long serialVersionUID = 4661096923593747947L;
/** . */
private final Mode INTERNAL_EDIT_CONTENT = Mode.create("edit_content");
@@ -68,13 +69,13 @@
// Wired services
/** . */
- private InstanceContainer instanceContainer;
+ private transient InstanceContainer instanceContainer;
/** . */
- private RoleModule roleModule;
+ private transient RoleModule roleModule;
/** . */
- private DomainConfigurator domainConfigurator;
+ private transient DomainConfigurator domainConfigurator;
// Navigational state of the user
@@ -96,13 +97,13 @@
// Runtime fields depending on the navigational state
/** . */
- private PreferencesBean selectedPrefs;
+ private transient PreferencesBean selectedPrefs;
/** . */
- private Instance selectedInstance;
+ private transient Instance selectedInstance;
/** . */
- private List<InstanceDefinition> instances;
+ private transient List<InstanceDefinition> instances;
/** . */
private AuthorizationBean auth = new InstanceAuthorizationBean();
Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2009-04-08 05:32:21 UTC (rev 13179)
+++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2009-04-08 07:28:11 UTC (rev 13180)
@@ -126,7 +126,7 @@
private String selectedContentURI;
/** . */
- private Map selectedContentParameters = new HashMap();
+// private Map selectedContentParameters = new HashMap();
/** . */
private Map<String, String[]> renderParameters;
@@ -137,34 +137,34 @@
private final AuthorizationBean auth = new PortalObjectAuthorizationBean();
/** . */
- private List selectedObjectPath;
+ private transient List selectedObjectPath;
/** . */
- private PortalObject selectedObject;
+ private transient PortalObject selectedObject;
/** . */
- private PortalObject selectedDeletingObject;
+ private transient PortalObject selectedDeletingObject;
/** . */
- private PropertiesBean selectedProperties;
+ private transient PropertiesBean selectedProperties;
/** . */
- PropertyAction propertyAction;
+ transient PropertyAction propertyAction;
/** . */
- private ControlPropertiesBean controlProperties;
+ private transient ControlPropertiesBean controlProperties;
/** . */
- private PortletInvoker portletDefinitionInvoker;
+ private transient PortletInvoker portletDefinitionInvoker;
/** . */
- private ThemeBean theme;
+ private transient ThemeBean theme;
/** . */
- public PageManagerBean pageManager;
+ public transient PageManagerBean pageManager;
/** . */
- private Boolean maximizedStateExists;
+ private transient Boolean maximizedStateExists;
// Wired services
@@ -326,7 +326,7 @@
this.renderParameters = renderParameters;
}
- public Map getSelectedContentParameters()
+ /*public Map getSelectedContentParameters()
{
return selectedContentParameters;
}
@@ -334,7 +334,7 @@
public void setSelectedContentParameters(Map selectedContentParameters)
{
this.selectedContentParameters = selectedContentParameters;
- }
+ }*/
public DomainConfigurator getDomainConfigurator()
{
Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2009-04-08 05:32:21 UTC (rev 13179)
+++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2009-04-08 07:28:11 UTC (rev 13180)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -44,6 +44,7 @@
import javax.faces.context.FacesContext;
import javax.faces.model.SelectItem;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -58,8 +59,9 @@
* @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision$
*/
-public class PortletManagerBean
+public class PortletManagerBean implements Serializable
{
+ private static final long serialVersionUID = -567346587947451954L;
/** . */
private static final Logger log = Logger.getLogger(PortletManagerBean.class);
@@ -77,16 +79,16 @@
// Wired services
/** . */
- private InstanceContainer instanceContainer;
+ private transient InstanceContainer instanceContainer;
/** . */
- private AuthorizationDomainRegistry authorizationDomainRegistry;
+ private transient AuthorizationDomainRegistry authorizationDomainRegistry;
/** . */
- private RoleModule roleModule;
+ private transient RoleModule roleModule;
/** . */
- private FederatingPortletInvoker federatingPortletInvoker;
+ private transient FederatingPortletInvoker federatingPortletInvoker;
// Navigational state
@@ -108,19 +110,19 @@
// Runtime state
/** . */
- private PreferencesBean selectedPreferences;
+ private transient PreferencesBean selectedPreferences;
/** . */
- private Portlet selectedPortlet;
+ private transient Portlet selectedPortlet;
/** . */
- private Collection portletInvokerItems;
+ private transient Collection portletInvokerItems;
/** . */
- private List portlets;
+ private transient List portlets;
/** . */
- private FederatedPortletInvoker selectedPortletInvoker;
+ private transient FederatedPortletInvoker selectedPortletInvoker;
// Wired services
@@ -241,7 +243,7 @@
{
// Get portlet
Portlet portlet = getSelectedPortlet();
-
+
//
if (portlet != null)
{
@@ -279,9 +281,9 @@
if (portlets == null)
{
portlets = new ArrayList();
-
+
List tmpPortlets = null;
-
+
if (getSelectedPortletInvoker() != null)
{
tmpPortlets = new ArrayList(getSelectedPortletInvoker().getPortlets());
@@ -363,8 +365,8 @@
public String selectPortlet()
{
FacesContext ctx = FacesContext.getCurrentInstance();
- selectedPortletId = (String)ctx.getExternalContext().getRequestParameterMap().get("id");
- selectedPlugin = (String)ctx.getExternalContext().getRequestParameterMap().get("plugin");
+ selectedPortletId = ctx.getExternalContext().getRequestParameterMap().get("id");
+ selectedPlugin = ctx.getExternalContext().getRequestParameterMap().get("plugin");
selectedFrom = 0;
if (selectedPortletId != null && selectedPortletId.length() != 0)
@@ -431,7 +433,7 @@
* A comparator for portlets. Order portlets in the alphabetical order of their display name. If there is no display
* name, fall back to portlet id.
*/
- final Comparator comparator = new Comparator()
+ final transient Comparator comparator = new Comparator()
{
FacesContext ctx = FacesContext.getCurrentInstance();
Locale locale = ctx.getExternalContext().getRequestLocale();
Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java 2009-04-08 05:32:21 UTC (rev 13179)
+++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java 2009-04-08 07:28:11 UTC (rev 13180)
@@ -20,6 +20,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
* 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
******************************************************************************/
+
package org.jboss.portal.core.admin.ui.dashboard;
import org.jboss.portal.common.util.IteratorStatus;
@@ -40,13 +41,14 @@
import javax.faces.context.FacesContext;
import javax.faces.model.SelectItem;
+import java.io.Serializable;
import java.util.Collection;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision$
*/
-public class DashboardBean implements AddPageAction.Listener
+public class DashboardBean implements Serializable, AddPageAction.Listener
{
/** . */
@@ -56,16 +58,16 @@
// Wired services
/** . */
- public PortalObjectContainer portalObjectContainer;
+ public transient PortalObjectContainer portalObjectContainer;
/** . */
- public LayoutService layoutService;
+ public transient LayoutService layoutService;
/** . */
- public ThemeService themeService;
+ public transient ThemeService themeService;
/** . */
- public InstanceContainer instanceContainer;
+ public transient InstanceContainer instanceContainer;
// Navigational state
@@ -75,22 +77,22 @@
// Runtime fields
/** . */
- public Portal userPortal;
+ public transient Portal userPortal;
/** . */
- public String selectedPageTheme;
+ public transient String selectedPageTheme;
/** . */
- public String selectedPageLayout;
+ public transient String selectedPageLayout;
/** . */
- public PageManagerBean pageManager;
+ public transient PageManagerBean pageManager;
/** . */
- public SelectItem[] pageItems;
+ public transient SelectItem[] pageItems;
/** . */
- public boolean selectePageIsDefault;
+ public transient boolean selectePageIsDefault;
//
Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java 2009-04-08 05:32:21 UTC (rev 13179)
+++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java 2009-04-08 07:28:11 UTC (rev 13180)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -46,6 +46,7 @@
import org.jboss.portal.theme.ThemeConstants;
import javax.faces.context.FacesContext;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -56,22 +57,25 @@
* @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
* @version $Revision$
*/
-public class NewWindowWizard
+public class NewWindowWizard implements Serializable
{
+ private static final long serialVersionUID = -223476489826544201L;
- private List steps;
+ private transient List steps;
private int currentStep;
- private FederatingPortletInvoker federatingPortletInvoker;
private String selectedPortletId;
private String selectedPortalId;
private String selectedPageId;
private String selectedRegionId;
private String selectedPortletInvokerId;
+
private String selectedParentPageId;
- private PortalObjectContainer portalObjectContainer;
- private InstanceContainer instanceContainer;
- private LayoutService layoutService;
- private AuthorizationDomainRegistry authorizationDomainRegistry;
+ // Injected services
+ private transient PortalObjectContainer portalObjectContainer;
+ private transient FederatingPortletInvoker federatingPortletInvoker;
+ private transient InstanceContainer instanceContainer;
+ private transient LayoutService layoutService;
+ private transient AuthorizationDomainRegistry authorizationDomainRegistry;
public NewWindowWizard()
{
15 years, 2 months
JBoss Portal SVN: r13179 - in branches/JBoss_Portal_Branch_2_7: core-cms/src/main/org/jboss/portal/core/cms/ui and 1 other directories.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-04-08 01:32:21 -0400 (Wed, 08 Apr 2009)
New Revision: 13179
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
Log:
JBPORTAL-2354 - HA-CMS: NullPointerException after fail-over
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2009-04-08 05:31:56 UTC (rev 13178)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2009-04-08 05:32:21 UTC (rev 13179)
@@ -69,7 +69,7 @@
<componentref name="jboss-portal/modules/test" version="1.0.4"/>
<componentref name="jboss-portal/modules/portlet" version="trunk-SNAPSHOT"/>
<componentref name="jboss-portal/modules/identity" version="1.0.8"/>
- <componentref name="jboss-portal/modules/cms" version="1.2.4"/>
+ <componentref name="jboss-portal/modules/cms" version="1.2.5"/>
<componentref name="antlr" version="2.7.6-brew"/>
<componentref name="apache-ant" version="1.6.5"/>
<componentref name="jackrabbit" version="1.4"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java 2009-04-08 05:31:56 UTC (rev 13178)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java 2009-04-08 05:32:21 UTC (rev 13179)
@@ -215,30 +215,31 @@
protected void doView(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException
{
- // Get the file obtain from doHeaders
- File file = (File)req.getAttribute("file");
-
- if (file == null)
+ File file = null;
+ try
{
- String path = req.getParameter(RENDER_PARAMETER_PATH);
- file = getFile (path, req.getLocale(), req.getPreferences());
- }
- //
- URLFactory textURLFactory = null;
- if (InternalCMSContentProvider.useGlobalURL())
- {
- textURLFactory = new GlobalURLFactory(((JBossRenderRequest)req).getControllerContext());
- }
- if (textURLFactory == null)
- {
- textURLFactory = new LocalURLFactory(resp.createRenderURL());
- }
+ //Get the file obtain from doHeaders
+ file = (File)req.getAttribute("file");
- //
- URLFactory resourceURLFactory = new GlobalURLFactory(((JBossRenderRequest)req).getControllerContext());
-
- try
- {
+ if (file == null)
+ {
+ String path = req.getParameter(RENDER_PARAMETER_PATH);
+ file = getFile (path, req.getLocale(), req.getPreferences());
+ }
+ //
+ URLFactory textURLFactory = null;
+ if (InternalCMSContentProvider.useGlobalURL())
+ {
+ textURLFactory = new GlobalURLFactory(((JBossRenderRequest)req).getControllerContext());
+ }
+ if (textURLFactory == null)
+ {
+ textURLFactory = new LocalURLFactory(resp.createRenderURL());
+ }
+
+ //
+ URLFactory resourceURLFactory = new GlobalURLFactory(((JBossRenderRequest)req).getControllerContext());
+
// Translate links to resources.
String sHTML = null;
resp.setContentType("text/html");
@@ -331,6 +332,18 @@
writer.write(sHTML);
writer.close();
}
+ else if(e.isServiceUnavailable())
+ {
+ resp.setContentType("text/html");
+ PrintWriter writer = resp.getWriter();
+ String sHTML = "";
+ ResourceBundle rb = getPortletConfig().getResourceBundle(req.getLocale());
+
+ sHTML = "<h2>" + rb.getString("SERVICE_UNAVAILABLE")+ "</h2>" + rb.getString("SERVICE_UNAVAILABLE_DESCRIPTION");
+
+ writer.write(sHTML);
+ writer.close();
+ }
else
{
log.error("CMS error", e);
@@ -374,16 +387,23 @@
public void doHeaders(RenderRequest req, RenderResponse resp)
{
- String path = req.getParameter(RENDER_PARAMETER_PATH);
- File file = getFile (path, req.getLocale(), req.getPreferences());
-
- req.setAttribute("file", file);
- if ("true".equals(req.getPreferences().getValue("setBrowserTitle", "false").toLowerCase()) && file.getContent().getTitle() != null)
- {
- Element element = resp.createElement("title");
- element.setTextContent(file.getContent().getTitle());
- resp.addProperty(MimeResponse.MARKUP_HEAD_ELEMENT, element);
- }
+ try
+ {
+ String path = req.getParameter(RENDER_PARAMETER_PATH);
+ File file = getFile (path, req.getLocale(), req.getPreferences());
+
+ req.setAttribute("file", file);
+ if ("true".equals(req.getPreferences().getValue("setBrowserTitle", "false").toLowerCase()) && file.getContent().getTitle() != null)
+ {
+ Element element = resp.createElement("title");
+ element.setTextContent(file.getContent().getTitle());
+ resp.addProperty(MimeResponse.MARKUP_HEAD_ELEMENT, element);
+ }
+ }
+ catch(CMSException cme)
+ {
+ log.error(this, cme);
+ }
}
/**
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2009-04-08 05:31:56 UTC (rev 13178)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2009-04-08 05:32:21 UTC (rev 13179)
@@ -152,4 +152,7 @@
INVALID_ARCHIVE_MESSAGE=The archive being uploaded is not a valid archive file
CMS_MISSING_RESOURCE=Requested CMS Resource could not be Found
+SERVICE_UNAVAILABLE=Service Unavailable
+SERVICE_UNAVAILABLE_DESCRIPTION=The CMS Service is currently unavailable
+
15 years, 2 months
JBoss Portal SVN: r13178 - in modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms: impl/jcr and 1 other directories.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-04-08 01:31:56 -0400 (Wed, 08 Apr 2009)
New Revision: 13178
Modified:
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/CMSException.java
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCMS.java
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java
Log:
JBPORTAL-2354 - HA-CMS: NullPointerException after fail-over
Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/CMSException.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/CMSException.java 2009-04-08 05:13:26 UTC (rev 13177)
+++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/CMSException.java 2009-04-08 05:31:56 UTC (rev 13178)
@@ -32,6 +32,7 @@
private static final long serialVersionUID = 3646107693814633408L;
public static final int INVALID_ARCHIVE = 1;
+ public static final int SERVICE_UNAVAILABLE=2;
private int errorCode = 0;
@@ -71,6 +72,11 @@
return pathFormatFailure;
}
+ public boolean isServiceUnavailable()
+ {
+ return (this.errorCode == SERVICE_UNAVAILABLE);
+ }
+
public String getMessageKey()
{
String key = "";
@@ -81,6 +87,10 @@
key = "INVALID_ARCHIVE_MESSAGE";
break;
+ case SERVICE_UNAVAILABLE:
+ key = "SERVICE_UNAVAILABLE";
+ break;
+
default:
key = "";
break;
Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCMS.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCMS.java 2009-04-08 05:13:26 UTC (rev 13177)
+++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCMS.java 2009-04-08 05:31:56 UTC (rev 13178)
@@ -59,12 +59,9 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.hibernate.Transaction;
-
import javax.transaction.Status;
import javax.transaction.UserTransaction;
import javax.transaction.TransactionManager;
-import javax.naming.InitialContext;
import javax.jcr.Repository;
import javax.jcr.Session;
@@ -112,6 +109,8 @@
private JNDI.Binding jndiBinding;
private String cmsSessionFactory;
+
+ private boolean isServiceAvailable;
private InvocationHandler handler = new InvocationHandler()
{
@@ -362,6 +361,8 @@
{
tm.commit();
}
+
+ this.isServiceAvailable = true;
}
catch(Exception e)
{
@@ -375,7 +376,9 @@
}
public void stopService()
- {
+ {
+ this.isServiceAvailable = false;
+
TransactionManager tm = null;
boolean isStartedHere = false;
try
@@ -418,8 +421,38 @@
}
public Object execute(Command cmd) throws CMSException
+ {
+ if(!this.isServiceAvailable)
+ {
+ throw new CMSException(CMSException.SERVICE_UNAVAILABLE);
+ }
+
+ return this.executeCommand(cmd);
+ }
+
+ /**
+ * Checks for existence of default CMS content.
+ *
+ * @return
+ * @throws Exception
+ */
+ public boolean contentExists() throws Exception
{
- org.apache.jackrabbit.core.XASession session = null;
+ Session session = null;
+ try
+ {
+ session = jcr.login("anonid", "");
+ return session.itemExists("/default");
+ }
+ finally
+ {
+ RepositoryUtil.safeLogout(session);
+ }
+ }
+ //--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ private Object executeCommand(Command cmd) throws CMSException
+ {
+ org.apache.jackrabbit.core.XASession session = null;
Object obj = null;
boolean isClusterDelegatedRequest = false; //used to indicate this request is from another cluster node instead of the master node
boolean clusterWorkflowStatus = false;
@@ -571,7 +604,7 @@
}
return obj;
}
- //--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
private void startJCR() throws Exception
{
// Serialize the embedded configuration
@@ -612,26 +645,6 @@
}
/**
- * Checks for existence of default CMS content.
- *
- * @return
- * @throws Exception
- */
- public boolean contentExists() throws Exception
- {
- Session session = null;
- try
- {
- session = jcr.login("anonid", "");
- return session.itemExists("/default");
- }
- finally
- {
- RepositoryUtil.safeLogout(session);
- }
- }
-
- /**
* Initilizes the repository with initial/boot content
*
* @throws Exception
@@ -688,7 +701,7 @@
Command saveCMD = getCommandFactory().createFolderSaveCommand(folder);
try
{
- execute(saveCMD);
+ executeCommand(saveCMD);
}
catch (CMSException e)
{
@@ -757,7 +770,7 @@
Command newFileCMD = getCommandFactory().createNewFileCommand(file, content);
JCRCMS.turnOffWorkflow();
- execute(newFileCMD);
+ executeCommand(newFileCMD);
}
catch (Exception e)
Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java 2009-04-08 05:13:26 UTC (rev 13177)
+++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java 2009-04-08 05:31:56 UTC (rev 13178)
@@ -109,7 +109,9 @@
{
CMSException cmsException = (CMSException)returnValue;
if(cmsException.toString().indexOf("Access to this resource is denied") != -1 ||
- cmsException.hasPathFormatFailure())
+ cmsException.hasPathFormatFailure() ||
+ cmsException.isServiceUnavailable()
+ )
{
throw cmsException;
}
15 years, 2 months
JBoss Portal SVN: r13177 - modules/portlet/branches.
by portal-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2009-04-08 01:13:26 -0400 (Wed, 08 Apr 2009)
New Revision: 13177
Added:
modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60/
Log:
[JBEPP-60] Branch for patch
Copied: modules/portlet/branches/JBP_PORTLET_2_0_4_JBEPP-60 (from rev 13176, modules/portlet/tags/JBP_PORTLET_2_0_4)
15 years, 2 months