JBoss Portal SVN: r13106 - branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-04-01 10:18:09 -0400 (Wed, 01 Apr 2009)
New Revision: 13106
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AuthorizationBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
Log:
- Make AuthorizationBean and subclasses serializable.
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AuthorizationBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AuthorizationBean.java 2009-04-01 10:43:58 UTC (rev 13105)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/AuthorizationBean.java 2009-04-01 14:18:09 UTC (rev 13106)
@@ -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. *
@@ -34,6 +34,7 @@
import org.jboss.portal.security.spi.provider.SecurityConfigurationException;
import javax.faces.model.SelectItem;
+import java.io.Serializable;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -47,7 +48,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision$
*/
-public abstract class AuthorizationBean
+public abstract class AuthorizationBean implements Serializable
{
public AbstractDynamicBean getForRole()
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2009-04-01 10:43:58 UTC (rev 13105)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2009-04-01 14:18:09 UTC (rev 13106)
@@ -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. *
@@ -435,6 +435,7 @@
public class InstanceAuthorizationBean extends AuthorizationBean
{
+ private static final long serialVersionUID = -6284936544525435559L;
public DomainConfigurator getDomainConfigurator()
{
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2009-04-01 10:43:58 UTC (rev 13105)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2009-04-01 14:18:09 UTC (rev 13106)
@@ -742,6 +742,7 @@
public class PortalObjectAuthorizationBean extends AuthorizationBean
{
+ private static final long serialVersionUID = 7281763204029034269L;
public DomainConfigurator getDomainConfigurator()
{
17 years, 1 month
JBoss Portal SVN: r13105 - modules/common/trunk/common/src/main/java/org/jboss/portal/common/net.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-04-01 06:43:58 -0400 (Wed, 01 Apr 2009)
New Revision: 13105
Modified:
modules/common/trunk/common/src/main/java/org/jboss/portal/common/net/URLTools.java
Log:
- Added safeEncodeForHTMLId and safeDecodeForHTMLId methods used to ensure that a PortalObjectPath can be properly used as an HTML/javascript id.
Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/net/URLTools.java
===================================================================
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/net/URLTools.java 2009-03-31 16:44:15 UTC (rev 13104)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/net/URLTools.java 2009-04-01 10:43:58 UTC (rev 13105)
@@ -122,7 +122,8 @@
if (System.getProperty("http.proxyUser") != null)
{
- Authenticator.setDefault(new Authenticator(){
+ Authenticator.setDefault(new Authenticator()
+ {
protected PasswordAuthentication getPasswordAuthentication()
{
@@ -130,7 +131,7 @@
}
});
}
-
+
//
URLConnection conn;
try
@@ -466,4 +467,25 @@
return buf.toString();
}
+ public static String safeEncodeForHTMLId(String value)
+ {
+ value = value.replace("=", EQUALS);
+ value = value.replace("/", SLASH);
+ value = value.replace(".", DOT);
+ return value.replace("+", PLUS);
+ }
+
+ public static String safeDecodeForHTMLId(String value)
+ {
+ value = value.replace(EQUALS, "=");
+ value = value.replace(SLASH, "/");
+ value = value.replace(DOT, ".");
+ return value.replace(PLUS, "+");
+ }
+
+ private static final String EQUALS = "_e";
+ private static final String SLASH = "_s";
+ private static final String DOT = "_d";
+ private static final String PLUS = "_p";
+
}
17 years, 1 month