dlestrat 2004/05/07 06:41:13
Modified: commons/src/java/org/apache/jetspeed/om/common/portlet
MutablePortletApplication.java
PortletDefinitionComposite.java
Log:
PLT 17: Fixes in loading user-attributes.
Revision Changes Path
1.11 +28 -2
jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/om/common/portlet/MutablePortletApplication.java
Index: MutablePortletApplication.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/om/common/portlet/MutablePortletApplication.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MutablePortletApplication.java 25 Mar 2004 22:20:45 -0000 1.10
+++ MutablePortletApplication.java 7 May 2004 13:41:13 -0000 1.11
@@ -19,6 +19,7 @@
import java.util.Collection;
import org.apache.jetspeed.om.common.GenericMetadata;
+import org.apache.jetspeed.om.common.UserAttribute;
import org.apache.pluto.om.portlet.PortletApplicationDefinition;
import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.om.portlet.PortletDefinitionList;
@@ -62,6 +63,31 @@
PortletDefinition getPortletDefinitionByName(String name);
void setPortletDefinitionList(PortletDefinitionList portlets);
+
+ /**
+ * <p>Adds a user attribute to the user attribute set.</p>
+ * @param name The user attribute name.
+ * @param description The user attribute description.
+ */
+ void addUserAttribute(String name, String description);
+
+ /**
+ * <p>Adds a user attribute to the user attribute set.</p>
+ * @param userAttribute The user attribute.
+ */
+ void addUserAttribute(UserAttribute userAttribute);
+
+ /**
+ * <p>Sets a user-attribute to the collection of user attributes associated
+ * with this portlet application.</p>
+ */
+ void setUserAttributes(Collection userAttributes);
+
+ /**
+ * <p>Gets the collection of user attributes associated
+ * with this portlet application.</p>
+ */
+ Collection getUserAttributes();
void setApplicationIdentifier(String applicationIndentifier);
1.10 +1 -27
jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/om/common/portlet/PortletDefinitionComposite.java
Index: PortletDefinitionComposite.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/om/common/portlet/PortletDefinitionComposite.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PortletDefinitionComposite.java 25 Apr 2004 16:30:56 -0000 1.9
+++ PortletDefinitionComposite.java 7 May 2004 13:41:13 -0000 1.10
@@ -31,7 +31,6 @@
import org.apache.pluto.om.common.PreferenceSet;
import org.apache.pluto.om.common.SecurityRoleRef;
import org.apache.pluto.om.common.SecurityRoleRefSet;
-import org.apache.jetspeed.om.common.UserAttribute;
import org.apache.pluto.om.portlet.ContentType;
import org.apache.pluto.om.portlet.ContentTypeSet;
import org.apache.pluto.om.portlet.PortletApplicationDefinition;
@@ -71,31 +70,6 @@
void setContentTypeSet(ContentTypeSet contentTypes);
void setInitSecurityRoleRefSet(SecurityRoleRefSet securityRefs);
-
- /**
- * <p>Adds a user attribute to the user attribute set.</p>
- * @param name The user attribute name.
- * @param description The user attribute description.
- */
- void addUserAttribute(String name, String description);
-
- /**
- * <p>Adds a user attribute to the user attribute set.</p>
- * @param userAttribute The user attribute.
- */
- void addUserAttribute(UserAttribute userAttribute);
-
- /**
- * <p>Sets a user-attribute to the set of user attributes associated
- * with this portlet.</p>
- */
- void setUserAttributeSet(Collection userAttributeSet);
-
- /**
- * <p>Gets the collection of user attributes associated
- * with this portlet.</p>
- */
- Collection getUserAttributeSet();
/**
* Convenience method for directly adding init parameters
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
