dlestrat 2004/06/05 13:10:22
Modified: components/registry/src/java/org/apache/jetspeed/om/portlet/impl
PortletApplicationMetadataImpl.java
PortletDefinitionMetadataImpl.java
PortletApplicationLocalizedFieldImpl.java
PortletDefinitionLocalizedFieldImpl.java
PortletApplicationDefinitionImpl.java
Log:
User info J2 extension. See http://nagoya.apache.org/jira/browse/JS2-64
Revision Changes Path
1.2 +2 -2
jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationMetadataImpl.java
Index: PortletApplicationMetadataImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationMetadataImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortletApplicationMetadataImpl.java 11 Mar 2004 19:14:47 -0000 1.1
+++ PortletApplicationMetadataImpl.java 5 Jun 2004 20:10:21 -0000 1.2
@@ -18,7 +18,7 @@
import java.util.Locale;
import org.apache.jetspeed.om.common.LocalizedField;
-import org.apache.jetspeed.om.common.impl.GenericMetadataImpl;
+import org.apache.jetspeed.om.impl.GenericMetadataImpl;
/**
*
1.2 +2 -2
jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionMetadataImpl.java
Index: PortletDefinitionMetadataImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionMetadataImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortletDefinitionMetadataImpl.java 11 Mar 2004 19:14:26 -0000 1.1
+++ PortletDefinitionMetadataImpl.java 5 Jun 2004 20:10:21 -0000 1.2
@@ -18,7 +18,7 @@
import java.util.Locale;
import org.apache.jetspeed.om.common.LocalizedField;
-import org.apache.jetspeed.om.common.impl.GenericMetadataImpl;
+import org.apache.jetspeed.om.impl.GenericMetadataImpl;
/**
* PortletDefinitionMetadataImpl
1.2 +2 -2
jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationLocalizedFieldImpl.java
Index: PortletApplicationLocalizedFieldImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationLocalizedFieldImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortletApplicationLocalizedFieldImpl.java 11 Mar 2004 19:14:47 -0000 1.1
+++ PortletApplicationLocalizedFieldImpl.java 5 Jun 2004 20:10:21 -0000 1.2
@@ -15,7 +15,7 @@
*/
package org.apache.jetspeed.om.portlet.impl;
-import org.apache.jetspeed.om.common.impl.LocalizedFieldImpl;
+import org.apache.jetspeed.om.impl.LocalizedFieldImpl;
/**
*
1.2 +2 -2
jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionLocalizedFieldImpl.java
Index: PortletDefinitionLocalizedFieldImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionLocalizedFieldImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortletDefinitionLocalizedFieldImpl.java 11 Mar 2004 19:14:26 -0000 1.1
+++ PortletDefinitionLocalizedFieldImpl.java 5 Jun 2004 20:10:21 -0000 1.2
@@ -15,7 +15,7 @@
*/
package org.apache.jetspeed.om.portlet.impl;
-import org.apache.jetspeed.om.common.impl.LocalizedFieldImpl;
+import org.apache.jetspeed.om.impl.LocalizedFieldImpl;
/**
*
1.11 +40 -20
jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.java
Index: PortletApplicationDefinitionImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PortletApplicationDefinitionImpl.java 7 May 2004 13:41:55 -0000 1.10
+++ PortletApplicationDefinitionImpl.java 5 Jun 2004 20:10:21 -0000 1.11
@@ -22,6 +22,7 @@
import org.apache.jetspeed.om.common.GenericMetadata;
import org.apache.jetspeed.om.common.UserAttribute;
+import org.apache.jetspeed.om.common.UserAttributeRef;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
import org.apache.jetspeed.om.impl.UserAttributeImpl;
@@ -68,6 +69,9 @@
private String description;
private Collection portlets;
+
+ /** User attribute refs collection. */
+ private Collection userAttributeRefs;
/** User attributes collection. */
private Collection userAttributes;
@@ -81,6 +85,7 @@
{
portlets = new ArrayList();
userAttributes = new ArrayList();
+ userAttributeRefs = new ArrayList();
}
/**
@@ -164,12 +169,11 @@
*/
public void setId(String objectID)
{
- //((ObjectIDImpl) id).setValue(objectID);
id = JetspeedObjectID.createFromString(objectID).longValue();
}
/**
- * @see
org.apache.jetspeed.om.common.portlet.PortletApplicationComposite#setWebApplicationDefinition(org.apache.pluto.om.servlet.WebApplicationDefinition)
+ * @see
org.apache.jetspeed.om.common.portlet.MutablePortletApplication#setWebApplicationDefinition(org.apache.pluto.om.servlet.WebApplicationDefinition)
*/
public void setWebApplicationDefinition(WebApplicationDefinition wad)
{
@@ -178,7 +182,7 @@
}
/**
- * @see
org.apache.jetspeed.om.common.portlet.PortletApplicationComposite#addPortletDefinition(org.apache.pluto.om.portlet.PortletDefinition)
+ * @see
org.apache.jetspeed.om.common.portlet.MutablePortletApplication#addPortletDefinition(org.apache.pluto.om.portlet.PortletDefinition)
*/
public void addPortletDefinition(PortletDefinition pd)
{
@@ -187,7 +191,7 @@
}
/**
- * @see
org.apache.jetspeed.om.common.portlet.PortletApplicationComposite#getPortletDefinitions()
+ * @see
org.apache.jetspeed.om.common.portlet.MutablePortletApplication#getPortletDefinitions()
*/
public Collection getPortletDefinitions()
{
@@ -195,7 +199,7 @@
}
/**
- * @see
org.apache.jetspeed.om.common.portlet.PortletApplicationComposite#getPortletDefinitionByName(java.lang.String)
+ * @see
org.apache.jetspeed.om.common.portlet.MutablePortletApplication#getPortletDefinitionByName(java.lang.String)
*/
public PortletDefinition getPortletDefinitionByName(String name)
{
@@ -204,7 +208,7 @@
}
/**
- * @see
org.apache.jetspeed.om.common.portlet.PortletApplicationComposite#setPortletDefinitionList(org.apache.pluto.om.portlet.PortletDefinitionList)
+ * @see
org.apache.jetspeed.om.common.portlet.MutablePortletApplication#setPortletDefinitionList(org.apache.pluto.om.portlet.PortletDefinitionList)
*/
public void setPortletDefinitionList(PortletDefinitionList portlets)
{
@@ -212,23 +216,39 @@
}
/**
- * @see
org.apache.jetspeed.om.common.portlet.PortletApplicationComposite#addUserAttribute(java.lang.String,
java.lang.String)
+ * @see
org.apache.jetspeed.om.common.portlet.MutablePortletApplication#setUserAttributeRefs(java.util.Collection)
*/
- public void addUserAttribute(String name, String description)
+ public void setUserAttributeRefs(Collection userAttributeRefs)
{
- userAttributes.add(new UserAttributeImpl(name, description));
+ this.userAttributeRefs = userAttributeRefs;
}
/**
- * @see
org.apache.jetspeed.om.common.portlet.PortletApplicationComposite#addUserAttribute(org.apache.jetspeed.om.common.UserAttribute)
+ * @see
org.apache.jetspeed.om.common.portlet.MutablePortletApplication#getUserAttributeRefs()
+ */
+ public Collection getUserAttributeRefs()
+ {
+ return this.userAttributeRefs;
+ }
+
+ /**
+ * @see
org.apache.jetspeed.om.common.portlet.MutablePortletApplication#addUserAttributeRef(org.apache.jetspeed.om.common.UserAttributeRef)
+ */
+ public void addUserAttributeRef(UserAttributeRef userAttributeRef)
+ {
+ userAttributeRefs.add(userAttributeRef);
+ }
+
+ /**
+ * @see
org.apache.jetspeed.om.common.portlet.MutablePortletApplication#addUserAttribute(org.apache.jetspeed.om.common.UserAttribute)
*/
public void addUserAttribute(UserAttribute userAttribute)
{
userAttributes.add(userAttribute);
}
-
+
/**
- * @see
org.apache.jetspeed.om.common.portlet.PortletApplicationComposite#setUserAttributes(java.util.Collection)
+ * @see
org.apache.jetspeed.om.common.portlet.MutablePortletApplication#setUserAttributes(java.util.Collection)
*/
public void setUserAttributes(Collection userAttributes)
{
@@ -236,7 +256,7 @@
}
/**
- * @see
org.apache.jetspeed.om.common.portlet.PortletApplicationComposite#getUserAttributes()
+ * @see
org.apache.jetspeed.om.common.portlet.MutablePortletApplication#getUserAttributes()
*/
public Collection getUserAttributes()
{
@@ -244,7 +264,7 @@
}
/**
- * @see
org.apache.jetspeed.om.common.portlet.PortletApplicationComposite#setApplicationIdentifier(java.lang.String)
+ * @see
org.apache.jetspeed.om.common.portlet.MutablePortletApplication#setApplicationIdentifier(java.lang.String)
*/
public void setApplicationIdentifier(String applicationIdentifier)
{
@@ -252,14 +272,14 @@
}
/**
- * @see
org.apache.jetspeed.om.common.portlet.PortletApplicationComposite#getApplicationIdentifier()
+ * @see
org.apache.jetspeed.om.common.portlet.MutablePortletApplication#getApplicationIdentifier()
*/
public String getApplicationIdentifier()
{
return this.applicationIdentifier;
}
- /* (non-Javadoc)
+ /**
* @see
org.apache.jetspeed.om.common.portlet.MutablePortletApplication#setApplicationType(int)
*/
public void setApplicationType(int type)
@@ -267,7 +287,7 @@
this.applicationType = type;
}
- /* (non-Javadoc)
+ /**
* @see
org.apache.jetspeed.om.common.portlet.MutablePortletApplication#getApplicationType()
*/
public int getApplicationType()
@@ -275,7 +295,7 @@
return applicationType;
}
- /* (non-Javadoc)
+ /**
* @see
org.apache.jetspeed.om.common.portlet.MutablePortletApplication#getMetadata()
*/
public GenericMetadata getMetadata()
@@ -291,7 +311,7 @@
return metadata;
}
- /* (non-Javadoc)
+ /**
* @see
org.apache.jetspeed.om.common.portlet.MutablePortletApplication#setMetadata(org.apache.jetspeed.om.common.GenericMetadata)
*/
public void setMetadata(GenericMetadata metadata)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
