JBoss Portal SVN: r11157 - branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-26 06:29:40 -0400 (Thu, 26 Jun 2008)
New Revision: 11157
Modified:
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationManagerImpl.java
Log:
Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationManagerImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationManagerImpl.java 2008-06-26 10:28:42 UTC (rev 11156)
+++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationManagerImpl.java 2008-06-26 10:29:40 UTC (rev 11157)
@@ -93,7 +93,7 @@
}
//initialize the authorization/policy enforcer
- enforcer = new ACLEnforcer(this);
+ setEnforcer(new ACLEnforcer(this));
}
//---PortalAuthorizationManagerFactory implementation-----------------------------------------------
@@ -121,4 +121,9 @@
{
return this.checkPermission(permission);
}
+
+ protected void setEnforcer(ACLEnforcer enforcer)
+ {
+ this.enforcer = enforcer;
+ }
}
17 years, 10 months
JBoss Portal SVN: r11156 - in branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms: security and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-26 06:28:42 -0400 (Thu, 26 Jun 2008)
New Revision: 11156
Modified:
branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java
branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/security/AuthorizationManagerImpl.java
Log:
Enable extensibility
Modified: branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java 2008-06-26 10:27:56 UTC (rev 11155)
+++ branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java 2008-06-26 10:28:42 UTC (rev 11156)
@@ -34,9 +34,11 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
@@ -48,21 +50,14 @@
*/
public class ACLEnforcer
{
- private Collection readCommands = new ArrayList(); //a list of commands that perform read action on the cms
- private Collection writeCommands = new ArrayList();//a list of commands that perform write action on the cms
- private Collection manageCommands = new ArrayList();//a list of commands that perform manage action on the cms
+ public static enum Type { READ, WRITE, MANAGE, UNKNOWN };
+
+ private Map<Type, List<String>> aclCommands = new HashMap<Type, List<String>>();
- private static final int read = 0;
- private static final int write = 1;
- private static final int manage = 2;
-// private static final int manageWorkflow = 3;
-
private AuthorizationManager authorizationManager = null;
-
/**
*
- *
*/
public ACLEnforcer(AuthorizationManager authorizationManager)
{
@@ -72,28 +67,49 @@
String packageName = "org.jboss.portal.cms.impl.jcr.command.";
//load the read related commands
- readCommands.add(packageName + "FolderGetListCommand");
- readCommands.add(packageName + "FolderGetCommand");
- readCommands.add(packageName + "FileGetListCommand");
- readCommands.add(packageName + "FileGetCommand");
+ addACLCommand(Type.READ, packageName + "FolderGetListCommand");
+ addACLCommand(Type.READ, packageName + "FolderGetCommand");
+ addACLCommand(Type.READ, packageName + "FileGetListCommand");
+ addACLCommand(Type.READ, packageName + "FileGetCommand");
//load the write related commands
- writeCommands.add(packageName + "ContentCreateCommand");
- writeCommands.add(packageName + "FileCreateCommand");
- writeCommands.add(packageName + "FolderCreateCommand");
- writeCommands.add(packageName + "FileUpdateCommand");
- writeCommands.add(packageName + "StoreArchiveCommand");
- writeCommands.add("org.jboss.portal.cms.impl.jcr.composite.NewFileCommand");
- writeCommands.add("org.jboss.portal.cms.impl.jcr.composite.UpdateFileCommand");
+ addACLCommand(Type.WRITE, packageName + "ContentCreateCommand");
+ addACLCommand(Type.WRITE, packageName + "FileCreateCommand");
+ addACLCommand(Type.WRITE, packageName + "FolderCreateCommand");
+ addACLCommand(Type.WRITE, packageName + "FileUpdateCommand");
+ addACLCommand(Type.WRITE, packageName + "StoreArchiveCommand");
+ addACLCommand(Type.WRITE, "org.jboss.portal.cms.impl.jcr.composite.NewFileCommand");
+ addACLCommand(Type.WRITE, "org.jboss.portal.cms.impl.jcr.composite.UpdateFileCommand");
//load the manage related commands
- manageCommands.add(packageName + "CopyCommand");
- manageCommands.add(packageName + "DeleteCommand");
- manageCommands.add(packageName + "MoveCommand");
+ addACLCommand(Type.MANAGE, packageName + "CopyCommand");
+ addACLCommand(Type.MANAGE, packageName + "DeleteCommand");
+ addACLCommand(Type.MANAGE, packageName + "MoveCommand");
}
-
/**
+ * Add a command to check for security control
+ *
+ * @param commandClassName The fully qualified name of the command
+ */
+ protected void addACLCommand(Type type, String commandClassName)
+ {
+ if (type == null || type == Type.UNKNOWN)
+ {
+ throw new IllegalArgumentException("Type cannot be null or of type UNKNOWN");
+ }
+
+ List<String> commands = aclCommands.get(type);
+ if (commands == null)
+ {
+ commands = new ArrayList<String>();
+ }
+ commands.add(commandClassName);
+ aclCommands.put(type, commands);
+ }
+
+
+ /**
* @param securityContext
* @return
*/
@@ -104,23 +120,23 @@
JCRCommand command = (JCRCommand)cmsSecurityContext.getAttribute("command");
//get the action code of the action being protected
- int actionCode = -1;
+ Type actionType = Type.UNKNOWN;
if (command != null)
{
- actionCode = this.getActionCode(command);
+ actionType = this.getActionType(command);
}
- switch (actionCode)
+ switch (actionType)
{
- case read:
+ case READ:
hasAccess = this.hasReadAccess(loggedInUser, command);
break;
- case write:
+ case WRITE:
hasAccess = this.hasWriteAccess(loggedInUser, command);
break;
- case manage:
+ case MANAGE:
hasAccess = this.hasManageAccess(loggedInUser, command);
break;
@@ -154,23 +170,17 @@
* @param command
* @return
*/
- private int getActionCode(JCRCommand command)
+ private Type getActionType(JCRCommand command)
{
- int actionCode = -1;
-
- if (this.readCommands.contains(command.getClass().getName()))
+ for (Type type: Type.values())
{
- actionCode = read;
+ List<String> commands = aclCommands.get(type);
+ if (commands != null && commands.contains(command.getClass().getName()))
+ {
+ return type;
+ }
}
- else if (this.writeCommands.contains(command.getClass().getName()))
- {
- actionCode = write;
- }
- else if (this.manageCommands.contains(command.getClass().getName()))
- {
- actionCode = manage;
- }
- return actionCode;
+ return Type.UNKNOWN;
}
//---------------------------------------------------------------------------------------------------------------------------------------
Modified: branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/security/AuthorizationManagerImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/security/AuthorizationManagerImpl.java 2008-06-26 10:27:56 UTC (rev 11155)
+++ branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/security/AuthorizationManagerImpl.java 2008-06-26 10:28:42 UTC (rev 11156)
@@ -93,7 +93,7 @@
}
//initialize the authorization/policy enforcer
- enforcer = new ACLEnforcer(this);
+ setEnforcer(new ACLEnforcer(this));
}
//---PortalAuthorizationManagerFactory implementation-----------------------------------------------
@@ -121,4 +121,9 @@
{
return this.checkPermission(permission);
}
+
+ protected void setEnforcer(ACLEnforcer enforcer)
+ {
+ this.enforcer = enforcer;
+ }
}
17 years, 10 months
JBoss Portal SVN: r11155 - branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-26 06:27:56 -0400 (Thu, 26 Jun 2008)
New Revision: 11155
Modified:
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java
Log:
Enable extensibility
Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java 2008-06-26 05:45:15 UTC (rev 11154)
+++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java 2008-06-26 10:27:56 UTC (rev 11155)
@@ -34,9 +34,11 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
@@ -48,21 +50,14 @@
*/
public class ACLEnforcer
{
- private Collection readCommands = new ArrayList(); //a list of commands that perform read action on the cms
- private Collection writeCommands = new ArrayList();//a list of commands that perform write action on the cms
- private Collection manageCommands = new ArrayList();//a list of commands that perform manage action on the cms
+ public static enum Type { READ, WRITE, MANAGE, UNKNOWN };
+
+ private Map<Type, List<String>> aclCommands = new HashMap<Type, List<String>>();
- private static final int read = 0;
- private static final int write = 1;
- private static final int manage = 2;
-// private static final int manageWorkflow = 3;
-
private AuthorizationManager authorizationManager = null;
-
/**
*
- *
*/
public ACLEnforcer(AuthorizationManager authorizationManager)
{
@@ -72,28 +67,49 @@
String packageName = "org.jboss.portal.cms.impl.jcr.command.";
//load the read related commands
- readCommands.add(packageName + "FolderGetListCommand");
- readCommands.add(packageName + "FolderGetCommand");
- readCommands.add(packageName + "FileGetListCommand");
- readCommands.add(packageName + "FileGetCommand");
+ addACLCommand(Type.READ, packageName + "FolderGetListCommand");
+ addACLCommand(Type.READ, packageName + "FolderGetCommand");
+ addACLCommand(Type.READ, packageName + "FileGetListCommand");
+ addACLCommand(Type.READ, packageName + "FileGetCommand");
//load the write related commands
- writeCommands.add(packageName + "ContentCreateCommand");
- writeCommands.add(packageName + "FileCreateCommand");
- writeCommands.add(packageName + "FolderCreateCommand");
- writeCommands.add(packageName + "FileUpdateCommand");
- writeCommands.add(packageName + "StoreArchiveCommand");
- writeCommands.add("org.jboss.portal.cms.impl.jcr.composite.NewFileCommand");
- writeCommands.add("org.jboss.portal.cms.impl.jcr.composite.UpdateFileCommand");
+ addACLCommand(Type.WRITE, packageName + "ContentCreateCommand");
+ addACLCommand(Type.WRITE, packageName + "FileCreateCommand");
+ addACLCommand(Type.WRITE, packageName + "FolderCreateCommand");
+ addACLCommand(Type.WRITE, packageName + "FileUpdateCommand");
+ addACLCommand(Type.WRITE, packageName + "StoreArchiveCommand");
+ addACLCommand(Type.WRITE, "org.jboss.portal.cms.impl.jcr.composite.NewFileCommand");
+ addACLCommand(Type.WRITE, "org.jboss.portal.cms.impl.jcr.composite.UpdateFileCommand");
//load the manage related commands
- manageCommands.add(packageName + "CopyCommand");
- manageCommands.add(packageName + "DeleteCommand");
- manageCommands.add(packageName + "MoveCommand");
+ addACLCommand(Type.MANAGE, packageName + "CopyCommand");
+ addACLCommand(Type.MANAGE, packageName + "DeleteCommand");
+ addACLCommand(Type.MANAGE, packageName + "MoveCommand");
}
-
/**
+ * Add a command to check for security control
+ *
+ * @param commandClassName The fully qualified name of the command
+ */
+ protected void addACLCommand(Type type, String commandClassName)
+ {
+ if (type == null || type == Type.UNKNOWN)
+ {
+ throw new IllegalArgumentException("Type cannot be null or of type UNKNOWN");
+ }
+
+ List<String> commands = aclCommands.get(type);
+ if (commands == null)
+ {
+ commands = new ArrayList<String>();
+ }
+ commands.add(commandClassName);
+ aclCommands.put(type, commands);
+ }
+
+
+ /**
* @param securityContext
* @return
*/
@@ -104,23 +120,23 @@
JCRCommand command = (JCRCommand)cmsSecurityContext.getAttribute("command");
//get the action code of the action being protected
- int actionCode = -1;
+ Type actionType = Type.UNKNOWN;
if (command != null)
{
- actionCode = this.getActionCode(command);
+ actionType = this.getActionType(command);
}
- switch (actionCode)
+ switch (actionType)
{
- case read:
+ case READ:
hasAccess = this.hasReadAccess(loggedInUser, command);
break;
- case write:
+ case WRITE:
hasAccess = this.hasWriteAccess(loggedInUser, command);
break;
- case manage:
+ case MANAGE:
hasAccess = this.hasManageAccess(loggedInUser, command);
break;
@@ -154,23 +170,17 @@
* @param command
* @return
*/
- private int getActionCode(JCRCommand command)
+ private Type getActionType(JCRCommand command)
{
- int actionCode = -1;
-
- if (this.readCommands.contains(command.getClass().getName()))
+ for (Type type: Type.values())
{
- actionCode = read;
+ List<String> commands = aclCommands.get(type);
+ if (commands != null && commands.contains(command.getClass().getName()))
+ {
+ return type;
+ }
}
- else if (this.writeCommands.contains(command.getClass().getName()))
- {
- actionCode = write;
- }
- else if (this.manageCommands.contains(command.getClass().getName()))
- {
- actionCode = manage;
- }
- return actionCode;
+ return Type.UNKNOWN;
}
//---------------------------------------------------------------------------------------------------------------------------------------
17 years, 10 months
JBoss Portal SVN: r11154 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-06-26 01:45:15 -0400 (Thu, 26 Jun 2008)
New Revision: 11154
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml
Log:
making 'relational database management system' upper case
to make acronym (RDBMS) clearer
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml 2008-06-26 05:08:22 UTC (rev 11153)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml 2008-06-26 05:45:15 UTC (rev 11154)
@@ -56,7 +56,7 @@
<listitem>MaxDB</listitem>
</itemizedlist>
<note>
- <para>JBoss Portal employs Hibernate as an interface to a relational database management system (RDBMS). Most relational database management systems supported by Hibernate will work with JBoss Portal.</para>
+ <para>JBoss Portal employs Hibernate as an interface to a Relational Database Management System (RDBMS). Most Relational Database Management Systems supported by Hibernate will work with JBoss Portal.</para>
</note>
</sect1>
<sect1>
17 years, 10 months
JBoss Portal SVN: r11153 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-06-26 01:08:22 -0400 (Thu, 26 Jun 2008)
New Revision: 11153
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml
Log:
- trademarks for JDBC (Sun)
- fixing my a/an errors for "RDBMS"
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2008-06-25 21:52:26 UTC (rev 11152)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2008-06-26 05:08:22 UTC (rev 11153)
@@ -108,7 +108,7 @@
</listitem>
<listitem>
<para>
- <emphasis role="bold">Deploy a RDBMS JDBC connector:</emphasis> a RDBMS JDBC connector is required for JBoss Portal to communicate with a database. Copy the connector into the <filename>$JBOSS_HOME/server/default/lib/</filename> directory. For example, a RDBMS JDBC connector for MySQL can be download from <ulink url="http://www.mysql.com/products/connector/j/"></ulink>. For the correct RDMBS JDBC connector, please refer to the database documentation.
+ <emphasis role="bold">Deploy an RDBMS <trademark class="trade">JDBC</trademark> connector:</emphasis> an RDBMS JDBC connector is required for JBoss Portal to communicate with a database. Copy the connector into the <filename>$JBOSS_HOME/server/default/lib/</filename> directory. For example, an RDBMS JDBC connector for MySQL can be download from <ulink url="http://www.mysql.com/products/connector/j/"></ulink>. For the correct RDMBS JDBC connector, please refer to the database documentation.
</para>
</listitem>
</orderedlist>
@@ -403,7 +403,7 @@
</listitem>
<listitem>
<para>
- <emphasis role="bold">Deploy a RDBMS JDBC connector:</emphasis> a RDBMS JDBC connector is required for JBoss Portal to communicate with a database. Copy the connector into the <filename>$JBOSS_HOME/server/default/lib/</filename> directory. For example, a RDBMS JDBC connector for MySQL can be download from <ulink url="http://www.mysql.com/products/connector/j/"></ulink>. For the correct RDMBS JDBC connector, please refer to the database documentation.
+ <emphasis role="bold">Deploy an RDBMS JDBC connector:</emphasis> an RDBMS JDBC connector is required for JBoss Portal to communicate with a database. Copy the connector into the <filename>$JBOSS_HOME/server/default/lib/</filename> directory. For example, an RDBMS JDBC connector for MySQL can be download from <ulink url="http://www.mysql.com/products/connector/j/"></ulink>. For the correct RDMBS JDBC connector, please refer to the database documentation.
</para>
</listitem>
</orderedlist>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml 2008-06-25 21:52:26 UTC (rev 11152)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml 2008-06-26 05:08:22 UTC (rev 11153)
@@ -1,7 +1,7 @@
<preface id="trademarks">
<title>Please Read: Important Trademark Information</title>
<para>
- Sun, JavaServer, JSP, Java, JMX, JDK, Java runtime environment, J2EE, JVM, Javadoc, 100% Pure Java, and JavaScript are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.
+ Sun, JavaServer, JSP, Java, JMX, JDK, Java runtime environment, J2EE, JVM, Javadoc, 100% Pure Java, JDBC, and JavaScript are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.
</para>
<para>
JBoss is a registered trademark of Red Hat, Inc. in the U.S. and other countries.
17 years, 10 months
JBoss Portal SVN: r11152 - in branches/JBoss_Portal_Branch_2_7: core/src/main/org/jboss/portal/test/core/model/instance and 2 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-06-25 17:52:26 -0400 (Wed, 25 Jun 2008)
New Revision: 11152
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/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/instance/PortletInvokerSupport.java
branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/JBossPortletInterceptorStackFactory.java
Log:
- More generification and clean-ups.
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java 2008-06-25 21:51:06 UTC (rev 11151)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java 2008-06-25 21:52:26 UTC (rev 11152)
@@ -22,24 +22,11 @@
******************************************************************************/
package org.jboss.portal.core.deployment.jboss;
-import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import javax.xml.parsers.DocumentBuilder;
-
import org.jboss.deployment.DeploymentException;
import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.portal.common.io.IOTools;
import org.jboss.portal.common.net.URLNavigator;
import org.jboss.portal.common.net.URLVisitor;
-import org.jboss.portal.common.value.StringValue;
-import org.jboss.portal.common.value.Value;
import org.jboss.portal.common.xml.NullEntityResolver;
import org.jboss.portal.common.xml.XMLTools;
import org.jboss.portal.core.metadata.ServiceMetaData;
@@ -66,6 +53,16 @@
import org.w3c.dom.Element;
import org.xml.sax.EntityResolver;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.xml.parsers.DocumentBuilder;
+import java.io.File;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision$
@@ -118,7 +115,7 @@
String serviceClass = serviceMD.getClassName();
String serviceRef = serviceMD.getRef();
log.debug("Trying to inject service '" + serviceName + "' (ref: '" + serviceRef + "' class: " + serviceClass +
- ") in the servlet context of " + pwa.getURL());
+ ") in the servlet context of " + pwa.getURL());
//
if (serviceRef.startsWith(":"))
@@ -345,14 +342,14 @@
catch (NoSuchPortletException e)
{
String msg = "Failed to create instance " + metaDataCtx.metaData.getId() + " of portlet " + e.getPortletId() +
- " because portlet " + e.getPortletId() + " is not available";
+ " because portlet " + e.getPortletId() + " is not available";
log.warn(msg);
log.debug(msg, e);
}
catch (InvalidPortletIdException e)
{
String msg = "Failed to create instance " + metaDataCtx.metaData.getId() + " of portlet " + e.getPortletId() +
- " because portlet id " + e.getPortletId() + " is invalid";
+ " because portlet id " + e.getPortletId() + " is invalid";
log.warn(msg);
log.debug(msg, e);
}
@@ -399,16 +396,15 @@
private void configureInstance(Instance instance, InstanceMetaData metaData) throws PortletInvokerException, SecurityConfigurationException
{
- List changes = new ArrayList();
+ List<PropertyChange> changes = new ArrayList<PropertyChange>();
// Reset all preferences that are not overridden
PortletPreferencesMetaData preferencesMetaData = metaData.getPreferences();
PropertyMap propertyMap = instance.getProperties();
if (propertyMap != null && propertyMap.size() > 0)
{
- for (Iterator i = propertyMap.keySet().iterator(); i.hasNext();)
+ for (String key : propertyMap.keySet())
{
- String key = (String)i.next();
if (preferencesMetaData == null || preferencesMetaData.getPortletPreferences() == null || preferencesMetaData.getPortletPreferences().get(key) == null)
{
changes.add(PropertyChange.newReset(key));
@@ -419,17 +415,16 @@
// Configure preferences only if needed
if (preferencesMetaData != null && preferencesMetaData.getPortletPreferences() != null && preferencesMetaData.getPortletPreferences().size() > 0)
{
- for (Iterator i = preferencesMetaData.getPortletPreferences().values().iterator(); i.hasNext();)
+ for (PortletPreferenceMetaData preference : preferencesMetaData.getPortletPreferences().values())
{
- PortletPreferenceMetaData preference = (PortletPreferenceMetaData)i.next();
- Value value = new StringValue(preference.getValue());
- changes.add(PropertyChange.newUpdate(preference.getName(), value.asStringArray()));
+ List<String> preferenceValues = preference.getValue();
+ changes.add(PropertyChange.newUpdate(preference.getName(), preferenceValues.toArray(new String[preferenceValues.size()])));
}
}
if (changes.size() > 0)
{
- instance.setProperties((PropertyChange[])changes.toArray(new PropertyChange[changes.size()]));
+ instance.setProperties(changes.toArray(new PropertyChange[changes.size()]));
}
// Configure security
@@ -457,8 +452,8 @@
// Configure
configureInstance(instance, metaData);
}
-
-
+
+
private String resolvePortletRef(String ref)
{
return "local." + getAppId() + "." + ref;
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/instance/PortletInvokerSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/instance/PortletInvokerSupport.java 2008-06-25 21:51:06 UTC (rev 11151)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/instance/PortletInvokerSupport.java 2008-06-25 21:52:26 UTC (rev 11152)
@@ -32,13 +32,13 @@
import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+import org.jboss.portal.portlet.state.DestroyCloneFailure;
import org.jboss.portal.portlet.state.PropertyChange;
import org.jboss.portal.portlet.state.PropertyMap;
import org.jboss.portal.portlet.state.SimplePropertyMap;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -51,11 +51,11 @@
{
/** . */
- private Map portlets;
+ private Map<String, Portlet> portlets;
public PortletInvokerSupport()
{
- this.portlets = new HashMap();
+ this.portlets = new HashMap<String, Portlet>();
}
public void setValid(String portletId, boolean valid)
@@ -109,9 +109,9 @@
return portlet;
}
- public Set getPortlets()
+ public Set<Portlet> getPortlets()
{
- return new HashSet(portlets.values());
+ return new HashSet<Portlet>(portlets.values());
}
public Portlet getPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
@@ -138,7 +138,7 @@
{
throw new NoSuchPortletException(portletId);
}
- if (portlet.isValid() == false)
+ if (!portlet.isValid())
{
throw new InvalidPortletIdException(portletId);
}
@@ -158,7 +158,7 @@
private boolean valid;
/** . */
- private Map state;
+ private Map<String, List<String>> state;
public InternalPortlet(String portletId, PortletSupport support)
{
@@ -173,7 +173,7 @@
this.portletContext = PortletContext.createPortletContext(portletId);
this.support = support;
this.valid = true;
- this.state = new HashMap();
+ this.state = new HashMap<String, List<String>>();
}
public void addPreference(String key, List<String> value)
@@ -213,10 +213,10 @@
{
InternalPortlet internalPortlet = internalGetPortlet(portletContext);
PropertyMap props = new SimplePropertyMap();
- for (Iterator i = keys.iterator(); i.hasNext();)
+ for (Object object : keys)
{
- String key = (String)i.next();
- List<String> value = (List<String>)internalPortlet.state.get(key);
+ String key = (String)object;
+ List<String> value = internalPortlet.state.get(key);
if (value != null)
{
props.put(key, value);
@@ -229,10 +229,9 @@
{
InternalPortlet internalPortlet = internalGetPortlet(portletContext);
PropertyMap props = new SimplePropertyMap();
- for (Iterator i = internalPortlet.state.keySet().iterator(); i.hasNext();)
+ for (String key : internalPortlet.state.keySet())
{
- String key = (String)i.next();
- List<String> value = (List<String>)internalPortlet.state.get(key);
+ List<String> value = internalPortlet.state.get(key);
if (value != null)
{
props.put(key, value);
@@ -246,7 +245,7 @@
throw new UnsupportedOperationException();
}
- public List destroyClones(List portletContexts) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ public List<DestroyCloneFailure> destroyClones(List portletContexts) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
{
throw new UnsupportedOperationException();
}
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 2008-06-25 21:51:06 UTC (rev 11151)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2008-06-25 21:52:26 UTC (rev 11152)
@@ -48,7 +48,6 @@
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -101,7 +100,7 @@
private Instance selectedInstance;
/** . */
- private List instances;
+ private List<InstanceDefinition> instances;
/** . */
private AuthorizationBean auth = new InstanceAuthorizationBean();
@@ -181,7 +180,7 @@
int index = getInstances().indexOf(getSelectedInstance());
if (index != -1)
{
- selectedRow = new Integer(index);
+ selectedRow = index;
selectedFrom = (index / paginationSize) * paginationSize;
}
}
@@ -222,9 +221,9 @@
PreferencesInfo prefsInfo = selectedInstance.getPortlet().getInfo().getPreferences();
Set keys = prefsInfo.getKeys();
PropertyMap props = selectedInstance.getProperties();
- for (Iterator i = keys.iterator(); i.hasNext();)
+ for (Object o : keys)
{
- String key = (String)i.next();
+ String key = (String)o;
PreferenceInfo prefInfo = prefsInfo.getPreference(key);
List<String> value = props.getProperty(key);
selectedPrefs.addEntry(prefInfo, value);
@@ -245,26 +244,23 @@
return auth;
}
- private List getInstances()
+ private List<InstanceDefinition> getInstances()
{
if (instances == null)
{
// Remove content editors
- List tmpInstances = new ArrayList();
+ List<InstanceDefinition> tmpInstances = new ArrayList<InstanceDefinition>();
nextInstance:
- for (Iterator i = instanceContainer.getDefinitions().iterator(); i.hasNext();)
+ for (InstanceDefinition instance : instanceContainer.getDefinitions())
{
- Instance instance = (Instance)i.next();
-
//
try
{
// Filter portlets that are editors
Portlet portlet = instance.getPortlet();
PortletInfo info = portlet.getInfo();
- for (Iterator j = info.getCapabilities().getAllModes().iterator(); j.hasNext();)
+ for (ModeInfo modeInfo : info.getCapabilities().getAllModes())
{
- ModeInfo modeInfo = (ModeInfo)j.next();
if (modeInfo.getMode().equals(INTERNAL_EDIT_CONTENT))
{
continue nextInstance;
@@ -284,9 +280,9 @@
return instances;
}
- public Collection getSelectedInstances()
+ public Collection<InstanceDefinition> getSelectedInstances()
{
- List list = getInstances();
+ List<InstanceDefinition> list = getInstances();
//
int to = Math.min(selectedFrom + paginationSize, list.size());
@@ -297,13 +293,12 @@
public Map getSelectedInstancesPrefs()
{
- Map map = new HashMap();
- Collection instances = getSelectedInstances();
- Iterator it = instances.iterator();
+ Map<String, PropertyMap> map = new HashMap<String, PropertyMap>();
+ Collection<InstanceDefinition> instances = getSelectedInstances();
- while (it.hasNext())
+ for (Instance instance : instances)
{
- InstanceDefinition instanceDef = (InstanceDefinition)it.next();
+ InstanceDefinition instanceDef = (InstanceDefinition)instance;
try
{
map.put(instanceDef.getId(), instanceDef.getProperties());
@@ -394,18 +389,18 @@
{
try
{
- List tmp = new ArrayList();
+ List<PropertyChange> tmp = new ArrayList<PropertyChange>();
List entries = selectedPrefs.getEntries();
- for (int i = 0; i < entries.size(); i++)
+ for (Object entry1 : entries)
{
- PreferenceBean entry = (PreferenceBean)entries.get(i);
+ PreferenceBean entry = (PreferenceBean)entry1;
if (entry.isStale())
{
PropertyChange change = PropertyChange.newUpdate(entry.getName(), entry.getValue());
tmp.add(change);
}
}
- PropertyChange[] changes = (PropertyChange[])tmp.toArray(new PropertyChange[tmp.size()]);
+ PropertyChange[] changes = tmp.toArray(new PropertyChange[tmp.size()]);
getSelectedInstance().setProperties(changes);
// Todo handle that change was ok in the UI
@@ -430,12 +425,10 @@
}
/** A comparator for portlets. */
- static final Comparator INSTANCE_COMPARATOR = new Comparator()
+ static final Comparator<Instance> INSTANCE_COMPARATOR = new Comparator<Instance>()
{
- public int compare(Object o1, Object o2)
+ public int compare(Instance i1, Instance i2)
{
- Instance i1 = (Instance)o1;
- Instance i2 = (Instance)o2;
return i1.getId().compareToIgnoreCase(i2.getId());
}
};
Modified: branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/JBossPortletInterceptorStackFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/JBossPortletInterceptorStackFactory.java 2008-06-25 21:51:06 UTC (rev 11151)
+++ branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/invocation/JBossPortletInterceptorStackFactory.java 2008-06-25 21:52:26 UTC (rev 11152)
@@ -113,17 +113,17 @@
PortletInvokerInterceptor[] interceptors = new PortletInvokerInterceptor[names.size()];
if (names.size() == 1)
{
- ObjectName name = (ObjectName)names.get(0);
+ ObjectName name = names.get(0);
log.debug("Adding interceptor " + name + " to the stack");
PortletInvokerInterceptor a = (PortletInvokerInterceptor)server.getAttribute(name, "ManagedResource");
interceptors[0] = a;
}
for (int i = 0; i < names.size()-1; i++)
{
- ObjectName name = (ObjectName)names.get(i);
+ ObjectName name = names.get(i);
log.debug("Adding interceptor " + name + " to the stack");
PortletInvokerInterceptor a = (PortletInvokerInterceptor)server.getAttribute(name, "ManagedResource");
- name = (ObjectName)names.get(i+1);
+ name = names.get(i+1);
log.debug("Adding interceptor " + name + " to the stack");
PortletInvokerInterceptor b = (PortletInvokerInterceptor)server.getAttribute(name, "ManagedResource");
a.setNext(b);
17 years, 10 months
JBoss Portal SVN: r11151 - branches/JBoss_Portal_Branch_2_7/wsrp.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-06-25 17:51:06 -0400 (Wed, 25 Jun 2008)
New Revision: 11151
Modified:
branches/JBoss_Portal_Branch_2_7/wsrp/build.xml
Log:
- Fixed tests-local target.
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/build.xml 2008-06-25 21:50:02 UTC (rev 11150)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/build.xml 2008-06-25 21:51:06 UTC (rev 11151)
@@ -639,7 +639,7 @@
</target>
<target name="tests-local" depends="clean,output">
- <!--<server:start name="default"/>-->
+ <server:start name="default"/>
<antcall target="agent-deploy"/>
<antcall target="protocolv1-producer-test"/>
<antcall target="protocolv1-consumer-test"/>
@@ -648,7 +648,7 @@
<antcall target="consumer-test"/>
<antcall target="producer-configuration-test"/>
<antcall target="agent-undeploy"/>
- <!--<server:stop name="default"/>-->
+ <server:stop name="default"/>
<antcall target="reports"/>
</target>
17 years, 10 months
JBoss Portal SVN: r11150 - in branches/JBoss_Portal_Branch_2_7/wsrp/src/resources: tests/test-wsrp-producer-sar/META-INF and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-06-25 17:50:02 -0400 (Wed, 25 Jun 2008)
New Revision: 11150
Modified:
branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml
branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml
Log:
- Added missing delegation to ContainerPortletDispatcher. Fixes Markup tests. All tests should now pass again.
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2008-06-25 21:33:53 UTC (rev 11149)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2008-06-25 21:50:02 UTC (rev 11150)
@@ -30,8 +30,7 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="Invoker" proxy-type="attribute">portal:service=PortletInvoker,type=Producer
- </depends>
+ <depends optional-attribute-name="Invoker" proxy-type="attribute">portal:service=PortletInvoker,type=Producer</depends>
<depends optional-attribute-name="RegistrationManager" proxy-type="attribute">
portal.wsrp:service=RegistrationManager,type=Producer
</depends>
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml 2008-06-25 21:33:53 UTC (rev 11149)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml 2008-06-25 21:50:02 UTC (rev 11150)
@@ -67,6 +67,11 @@
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
+ <mbean code="org.jboss.portal.portlet.container.ContainerPortletDispatcher"
+ name="portal:service=Dispatcher,type=Portlet,name=ContainerPortlet" xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ </mbean>
<mbean code="org.jboss.portal.server.impl.invocation.JBossPortletInterceptorStackFactory"
name="portal:service=InterceptorStackFactory,type=Container" xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
@@ -74,6 +79,7 @@
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextDispatcher</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=ProducerCache</depends-list-element>
+ <depends-list-element>portal:service=Dispatcher,type=Portlet,name=ContainerPortlet</depends-list-element>
</depends-list>
</mbean>
@@ -118,8 +124,8 @@
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>-->
-
+
<!-- The portlet container invoker -->
<mbean code="org.jboss.portal.portlet.container.ContainerPortletInvoker"
name="portal:service=PortletInvoker,type=Container" xmbean-dd=""
17 years, 10 months
JBoss Portal SVN: r11149 - branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/test/cms/commands.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-25 17:33:53 -0400 (Wed, 25 Jun 2008)
New Revision: 11149
Modified:
branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/test/cms/commands/TestSearch.java
Log:
oups
Modified: branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/test/cms/commands/TestSearch.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/test/cms/commands/TestSearch.java 2008-06-25 19:44:41 UTC (rev 11148)
+++ branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/test/cms/commands/TestSearch.java 2008-06-25 21:33:53 UTC (rev 11149)
@@ -27,6 +27,7 @@
import org.jboss.portal.cms.Command;
import org.jboss.portal.cms.model.File;
import org.jboss.portal.search.FederatedQuery;
+import org.jboss.portal.search.QueryConversionException;
import org.jboss.portal.search.impl.jcr.JCRQuery;
import org.jboss.portal.search.impl.jcr.JCRQueryConverter;
@@ -47,7 +48,7 @@
}
/** Tests retrieval of the version labeled LIVE. */
- public void testFileGet() throws CMSException
+ public void testFileGet() throws CMSException, QueryConversionException
{
FederatedQuery query = new FederatedQuery("risks");
17 years, 10 months
JBoss Portal SVN: r11148 - branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-06-25 15:44:41 -0400 (Wed, 25 Jun 2008)
New Revision: 11148
Modified:
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestSearch.java
Log:
throw QueryConversionException so that test compiles
Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestSearch.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestSearch.java 2008-06-25 15:41:53 UTC (rev 11147)
+++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestSearch.java 2008-06-25 19:44:41 UTC (rev 11148)
@@ -29,6 +29,7 @@
import org.jboss.portal.search.FederatedQuery;
import org.jboss.portal.search.impl.jcr.JCRQuery;
import org.jboss.portal.search.impl.jcr.JCRQueryConverter;
+import org.jboss.portal.search.QueryConversionException;
import java.util.List;
@@ -47,7 +48,7 @@
}
/** Tests retrieval of the version labeled LIVE. */
- public void testFileGet() throws CMSException
+ public void testFileGet() throws CMSException, QueryConversionException
{
FederatedQuery query = new FederatedQuery("risks");
17 years, 10 months