portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r707224 [3/3] - in /portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade: components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/ components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folde...
Date Wed, 22 Oct 2008 23:46:50 GMT
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletApplication.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletApplication.java?rev=707224&r1=707223&r2=707224&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletApplication.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletApplication.java
Wed Oct 22 16:46:45 2008
@@ -16,17 +16,15 @@
  */
 package org.apache.jetspeed.om.portlet;
 
+import java.io.Serializable;
 import java.util.List;
 
 import javax.portlet.PortletMode;
 import javax.portlet.WindowState;
+import javax.xml.namespace.QName;
 
-import org.apache.jetspeed.om.common.GenericMetadata;
-import org.apache.jetspeed.om.common.JetspeedServiceReference;
-import org.apache.jetspeed.om.common.UserAttributeRef;
 import org.apache.jetspeed.om.servlet.WebApplicationDefinition;
 import org.apache.pluto.om.portlet.PortletApplicationDefinition;
-import org.apache.pluto.om.portlet.PortletDefinition;
 
 
 /**
@@ -39,8 +37,58 @@
  * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
  * @version $Id$
  */
-public interface PortletApplication extends PortletApplicationDefinition
+public interface PortletApplication extends PortletApplicationDefinition, Serializable
 {
+    /*
+     * All Pluto PortletApplicationDefinition interface overrides for
+     * which there is a specialized/extended Jetspeed interface
+     * to ensure the proper type casting.
+     * 
+     * @see org.apache.pluto.om.portlet.PortletApplicationDefinition
+     */
+    PortletDefinition getPortlet(String name);
+    List<PortletDefinition> getPortlets();
+    PortletDefinition addPortlet(String name);
+
+    List<EventDefinition> getEventDefinitions();
+    EventDefinition addEventDefinition(String name);
+    EventDefinition addEventDefinition(QName qname);
+    
+    PublicRenderParameter getPublicRenderParameter(String identifier);
+    List<PublicRenderParameter> getPublicRenderParameters();
+    PublicRenderParameter addPublicRenderParameter(String name, String identifier);
+    PublicRenderParameter addPublicRenderParameter(QName qname, String identifier);
+
+    CustomPortletMode getCustomPortletMode(String name);
+    List<CustomPortletMode> getCustomPortletModes();
+    CustomPortletMode addCustomPortletMode(String name);
+    
+    CustomWindowState getCustomWindowState(String name);
+    List<CustomWindowState> getCustomWindowStates();
+    CustomWindowState addCustomWindowState(String name);
+    
+    UserAttribute getUserAttribute(String name);
+    List<UserAttribute> getUserAttributes();
+    UserAttribute addUserAttribute(String name);
+    
+    List<SecurityConstraint> getSecurityConstraints();
+    SecurityConstraint addSecurityConstraint(String transportGuarantee);
+    
+    Filter getFilter(String filterName);
+    List<Filter> getFilters();
+    Filter addFilter(String filterName);
+
+    FilterMapping getFilterMapping(String filterName);
+    List<FilterMapping> getFilterMappings();
+    FilterMapping addFilterMapping(String filterName);
+
+    List<Listener> getListeners();
+    Listener addListener(String listenerClass);
+
+    ContainerRuntimeOption getContainerRuntimeOption(String name);
+    List<ContainerRuntimeOption> getContainerRuntimeOptions();
+    ContainerRuntimeOption addContainerRuntimeOption(String name);
+    
     /**
      * The checksum on the portlet XML from the last deployment
      *  
@@ -57,6 +105,7 @@
     
     /**
      * Returns the metadata from the extended jetspeed-portlet.xml
+     * The return value cannot be NULL
      * 
      * @return Jetspeed specific metadata
      */
@@ -69,23 +118,16 @@
      * @return a web application
      */
     public WebApplicationDefinition getWebApplicationDefinition();
+
+
     
+    UserAttributeRef getUserAttributeRef(String name);
     /**
-     * Finds a portlet by portlet name, searching this portlet application's collection.
-     * 
-     * @param name The portlet name.
-     * @return A Portlet Definition
-     */
-    PortletDefinition getPortletDefinitionByName(String name);
-    
-    /**
-     * <p>Gets the collection of user attribute refs associated
+     * <p>Gets the list of user attribute refs associated
      * with this portlet application.</p>
      */
     List<UserAttributeRef> getUserAttributeRefs();
-
-    String getApplicationIdentifier();
-    void setApplicationIdentifier(String identifier);
+    UserAttributeRef addUserAttributeRef(String name);
 
     String getDescription();    
     void setDescription(String description);
@@ -116,32 +158,20 @@
     int getApplicationType();
 
     /**
-     * Sets the Portlet Application type.
-     * Valid values are:
-     * <p>
-     *      {@link PortletApplication#WEBAPP} - A standard web application, stored in the
web application
-     *               server's web application space.
-     * <p>
-     *      {@link PortletApplication#LOCAL} - A local portlet application stored within
Jetspeed's web application.
-     * <p>
-     * @param type The type of portlet application.
-     */
-    void setApplicationType(int type);
-
-    /**
      * Gets a collection of all Jetspeed Services allowed for this application.
      * 
-     * @see org.apache.jetspeed.om.common.JetspeedServiceReference
+     * @see org.apache.jetspeed.om.portlet.JetspeedServiceReference
      * @return The collection of services of type <code>JetspeedServiceReference</code>.
      */
     List<JetspeedServiceReference> getJetspeedServices();
-    
+    void addJetspeedServiceReference(String name);
+
     PortletMode getMappedPortletMode(PortletMode mode);
     WindowState getMappedWindowState(WindowState state);
     PortletMode getCustomPortletMode(PortletMode mode);
     WindowState getCustomWindowState(WindowState state);
         
-    List<PortletMode> getSupportedPortletModes();
+    List<PortletMode> getSupportedPortletModes();    
     List<WindowState> getSupportedWindowStates();
     
     /**
@@ -187,6 +217,5 @@
      * 
      * @return true when this app is a Jetspeed layout application
      */
-    boolean isLayoutApplication();
-    
+    boolean isLayoutApplication();    
 }

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletApplication.java
            ('cvs2svn:cvs-rev' removed)

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletDefinition.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletDefinition.java?rev=707224&r1=707223&r2=707224&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletDefinition.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletDefinition.java
Wed Oct 22 16:46:45 2008
@@ -17,18 +17,10 @@
 package org.apache.jetspeed.om.portlet;
 
 import java.io.Serializable;
-import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
 
-import org.apache.jetspeed.om.common.GenericMetadata;
-import org.apache.jetspeed.om.common.ParameterComposite;
-import org.apache.jetspeed.om.common.preference.PreferenceComposite;
-import org.apache.jetspeed.om.portlet.Language;
-import org.apache.pluto.om.portlet.Preference;
-import org.apache.pluto.om.portlet.DisplayName;
-import org.apache.pluto.om.portlet.PortletApplicationDefinition;
-import org.apache.pluto.om.portlet.SecurityRoleRef;
+import javax.xml.namespace.QName;
 
 /**
  * 
@@ -41,85 +33,47 @@
 public interface PortletDefinition extends org.apache.pluto.om.portlet.PortletDefinition,
Serializable
 {
     PortletApplication getApplication();
+    InitParam getInitParam(String paramName);
+    List<InitParam> getInitParams();
+    InitParam addInitParam(String paramName);
     
-    GenericMetadata getMetadata();
-    
-    void setMetadata(GenericMetadata metadata);
-    
-    void addLanguage(String title, String shortTitle, String keywords, Locale locale);
-    
-    Language getLanguage(Locale locale);
-    
-    List<Language> getLanguages();
-    
-    /**
-     * The PreferenceSet is a collection user-defineable preferences
-     * that this portlet can use to process its logic.
-     * 
-     * @param preferences
-     */
-    void setPreferenceSet(PreferenceSet preferences);
+    PortletInfo getPortletInfo();
 
-    void setInitParameterSet(ParameterSet parameters);
+    Preferences getPortletPreferences();
 
-    void setInitSecurityRoleRefSet(SecurityRoleRefSet securityRefs);
+    List<EventDefinitionReference> getSupportedProcessingEvents();
+    EventDefinitionReference addSupportedProcessingEvent(QName qname);
+    EventDefinitionReference addSupportedProcessingEvent(String name);
     
-    /**
-     * Convenience method for directly adding init parameters
-     * to this <code>PortletDefinition.</code>.  This has the
-     * same affect as 
-     * <code>((ParameterSetCtrl)PortletDefinition.getInitParamaterSet()).add()</code>
-     * @param name Name of parameter to set
-     * @param value new value of said parameter
-     * @return ParameterComposite newly created parameter
-     */
-    ParameterComposite addInitParameter(String name, String value);
-
-    /**
-     * Same as <code>setInitParameter(name, title) plus allows a
-     * description to inlcuded.
-     * @see org.apache.jetspeed.om.common.portlet.PortletApplicationComposite#addInitParameter(java.lang.String,
java.lang.String)
-     * @param name Name of parameter to set
-     * @param value new value of the parameter
-     * @param DescriptionSet containing locale-specific descriptions of the parameter
-     * @return ParameterComposite newly created parameter
-     */
-    ParameterComposite addInitParameter(String name, String value, DescriptionSet description);
-
-    /**
-     * Same as <code>setInitParameter(name, title) plus allows you 
-     * to define one initial localized desription.
-     * 
-     * @see org.apache.jetspeed.om.common.portlet.PortletApplicationComposite#addInitParameter(java.lang.String,
java.lang.String)
-     * @param name Name of parameter to set
-     * @param value new value of the parameter
-     * @param description A description for this parameter
-     * @param locale The locale the description
-     * @return ParameterComposite newly created parameter
-     */
-    ParameterComposite addInitParameter(String name, String value, String description, Locale
locale);
-
-    /**
-     * Setter for setting expiration cache time for this portlet     
-     */
-    void setExpirationCache(String cache);
-
-    void setPortletApplicationDefinition(PortletApplicationDefinition pad);
-
-    /**
-     * @obsolete use #getPreferenceSet.add(String, String[])
-     */
-    PreferenceComposite addPreference(String name, String[] values);
+    List<EventDefinitionReference> getSupportedPublishingEvents();
+    EventDefinitionReference addSupportedPublishingEvent(QName qname);
+    EventDefinitionReference addSupportedPublishingEvent(String name);
+    
+    SecurityRoleRef getSecurityRoleRef(String roleName);
+    List<SecurityRoleRef> getSecurityRoleRefs();
+    SecurityRoleRef addSecurityRoleRef(String roleName);
 
-    /**
-     * @obsolete use #getPreferenceSet.add(String, String[])
-     */
-    void addPreference(Preference preference);
+    Supports getSupports(String mimeType);
+    List<Supports> getSupports();
+    Supports addSupports(String mimeType);
 
-    void setPortletIdentifier(String portletIndentifier);
+    Description getDescription(Locale locale);
+    List<Description> getDescriptions();
+    Description addDescription(String lang);
 
-    String getPortletIdentifier();
+    DisplayName getDisplayName(Locale locale);
+    List<DisplayName> getDisplayNames();
+    DisplayName addDisplayName(String lang);
+    GenericMetadata getMetadata();
 
+    ContainerRuntimeOption getContainerRuntimeOption(String name);
+    List<ContainerRuntimeOption> getContainerRuntimeOptions();
+    ContainerRuntimeOption addContainerRuntimeOption(String name);
+    
+    Language getLanguage(Locale locale);
+    List<Language> getLanguages();
+    Language addLanguage(Locale locale);
+    
     /**
      * A portlet's unique name is a string formed by the combination of a portlet's
      * unique within it's parent application plus the parent application's
@@ -154,46 +108,10 @@
      */
     String getDescriptionText(Locale locale);
 
-    void addDescription(Locale locale, String description);
-    
-    DescriptionSet getDescriptionSet();
-
-    void addDisplayName(Locale locale, String displayName);
-
-    /**
-     * 
-     * <p>
-     * addDisplayName
-     * </p>
-     * 
-     * @param displayName
-     *
-     */
-    void addDisplayName(DisplayName displayName);
-    
-    DisplayNameSet getDisplayNameSet();
-
     String getPreferenceValidatorClassname();
-
     void setPreferenceValidatorClassname(String classname);
 
     /**
-     * 
-     * <p>
-     * addSecurityRoleRef
-     * </p>
-     * 
-     * Adds the <code>securityRef</code> to the existing
-     * set of SecurityRoleRefs of this PortletDefinition
-     * 
-     * @param securityRef SecurityRoleRef to add.
-     *
-     */
-    void addSecurityRoleRef(SecurityRoleRef securityRef);
-    
-    SecurityRoleRef addSecurityRoleRef(String roleName, String roleLink);
-
-    /**
      * <p>
      * Get the Jetspeed Security Constraint reference for this portlet.
      * This security constraint name references a Jetspeed-specific Security Constraint.

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletDefinition.java
            ('cvs2svn:cvs-rev' removed)

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletInfo.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletInfo.java?rev=707224&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletInfo.java
(added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletInfo.java
Wed Oct 22 16:46:45 2008
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2008 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.om.portlet;
+
+import java.io.Serializable;
+
+/**
+ * 
+ * @version $Id$
+ *
+ */
+public interface PortletInfo extends org.apache.pluto.om.portlet.PortletInfo, Serializable
+{
+}
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletInfo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletInfo.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletInfo.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Preference.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Preference.java?rev=707224&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Preference.java
(added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Preference.java
Wed Oct 22 16:46:45 2008
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2008 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.om.portlet;
+
+import java.io.Serializable;
+
+/**
+ * 
+ * @version $Id$
+ *
+ */
+public interface Preference extends org.apache.pluto.om.portlet.Preference, Serializable
+{
+}
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Preference.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Preference.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Preference.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Preferences.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Preferences.java?rev=707224&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Preferences.java
(added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Preferences.java
Wed Oct 22 16:46:45 2008
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2008 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.om.portlet;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 
+ * @version $Id$
+ *
+ */
+public interface Preferences extends org.apache.pluto.om.portlet.Preferences, Serializable
+{
+    Preference getPortletPreference(String name);
+	List<Preference> getPortletPreferences();
+	Preference addPreference(String name);
+}
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Preferences.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Preferences.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Preferences.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PublicRenderParameter.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PublicRenderParameter.java?rev=707224&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PublicRenderParameter.java
(added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PublicRenderParameter.java
Wed Oct 22 16:46:45 2008
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2008 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.om.portlet;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * 
+ * @version $Id$
+ *
+ */
+public interface PublicRenderParameter extends org.apache.pluto.om.portlet.PublicRenderParameter,
Serializable
+{
+    Description getDescription(Locale locale);
+    List<Description> getDescriptions();
+    Description addDescription(String lang);
+}
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PublicRenderParameter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PublicRenderParameter.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PublicRenderParameter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/SecurityConstraint.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/SecurityConstraint.java?rev=707224&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/SecurityConstraint.java
(added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/SecurityConstraint.java
Wed Oct 22 16:46:45 2008
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2008 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.om.portlet;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * 
+ * @version $Id$
+ *
+ */
+public interface SecurityConstraint extends org.apache.pluto.om.portlet.SecurityConstraint,
Serializable
+{    
+    UserDataConstraint getUserDataConstraint();
+
+    DisplayName getDisplayName(Locale locale);
+    List<DisplayName> getDisplayNames();
+    DisplayName addDisplayName(String lang);
+}
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/SecurityConstraint.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/SecurityConstraint.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/SecurityConstraint.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/SecurityRoleRef.java
(from r706896, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/SecurityRoleRefComposite.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/SecurityRoleRef.java?p2=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/SecurityRoleRef.java&p1=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/SecurityRoleRefComposite.java&r1=706896&r2=707224&rev=707224&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/SecurityRoleRefComposite.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/SecurityRoleRef.java
Wed Oct 22 16:46:45 2008
@@ -14,31 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jetspeed.om.common;
+package org.apache.jetspeed.om.portlet;
 
 import java.io.Serializable;
+import java.util.List;
 import java.util.Locale;
 
-import org.apache.pluto.om.portlet.Description;
-import org.apache.pluto.om.portlet.DescriptionSet;
-import org.apache.pluto.om.portlet.SecurityRoleRef;
-import org.apache.pluto.om.portlet.SecurityRoleRefCtrl;
-
 /**
  * 
- * SecurityRoleRefComposite
- * 
- * @author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
  * @version $Id$
  *
  */
-public interface SecurityRoleRefComposite extends SecurityRoleRef, SecurityRoleRefCtrl, Serializable
+public interface SecurityRoleRef extends org.apache.pluto.om.portlet.SecurityRoleRef, Serializable
 {
-    void addDescription(Description description);
-    
-    void addDescription(Locale locale, String description);
-    
-    void setDescriptionSet(DescriptionSet descriptions);
-
-    DescriptionSet getDescriptionSet();
+    Description getDescription(Locale locale);
+    List<Description> getDescriptions();
+    Description addDescription(String lang);
 }

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/SecurityRoleRef.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.2

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/SecurityRoleRef.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/SecurityRoleRef.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Supports.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Supports.java?rev=707224&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Supports.java
(added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Supports.java
Wed Oct 22 16:46:45 2008
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2008 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.om.portlet;
+
+import java.io.Serializable;
+
+/**
+ * 
+ * @version $Id$
+ *
+ */
+public interface Supports extends org.apache.pluto.om.portlet.Supports, Serializable
+{
+}
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Supports.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Supports.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Supports.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserAttribute.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserAttribute.java?rev=707224&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserAttribute.java
(added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserAttribute.java
Wed Oct 22 16:46:45 2008
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2008 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.om.portlet;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * 
+ * @version $Id$
+ *
+ */
+public interface UserAttribute extends org.apache.pluto.om.portlet.UserAttribute, Serializable
+{    
+    Description getDescription(Locale locale);
+    List<Description> getDescriptions();
+    Description addDescription(String lang);
+}
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserAttribute.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserAttribute.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserAttribute.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserAttributeRef.java
(from r706896, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/UserAttributeRef.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserAttributeRef.java?p2=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserAttributeRef.java&p1=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/UserAttributeRef.java&r1=706896&r2=707224&rev=707224&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/common/UserAttributeRef.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserAttributeRef.java
Wed Oct 22 16:46:45 2008
@@ -14,12 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jetspeed.om.common;
+package org.apache.jetspeed.om.portlet;
 
 import java.io.Serializable;
-
-import org.apache.pluto.om.ElementFactoryList;
-import org.apache.pluto.om.portlet.Description;
+import java.util.List;
+import java.util.Locale;
 
 /**
  * <p>Interface allowing mapping of user attributes between the portal implementation
@@ -35,14 +34,13 @@
     /** Getter for the user-attribute-ref name. */
     String getName();
     
-    /** Setter for the user-attribute-ref name. */
-    void setName(String name);
-    
     /** Getter for the user-attribute-ref name-link. */
     String getNameLink();
     
     /** Setter for the user-attribute-ref name-link. */
     void setNameLink(String nameLink);
     
-    ElementFactoryList<Description> getDescriptions();
+    Description getDescription(Locale locale);
+    List<Description> getDescriptions();
+    Description addDescription(String lang);
 }

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserAttributeRef.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.2

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserAttributeRef.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserAttributeRef.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserDataConstraint.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserDataConstraint.java?rev=707224&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserDataConstraint.java
(added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserDataConstraint.java
Wed Oct 22 16:46:45 2008
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2008 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.om.portlet;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * 
+ * @version $Id$
+ *
+ */
+public interface UserDataConstraint extends org.apache.pluto.om.portlet.UserDataConstraint,
Serializable
+{
+	Description getDescription(Locale locale);
+    List<Description> getDescriptions();
+    Description addDescription(String lang);
+}
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserDataConstraint.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserDataConstraint.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserDataConstraint.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/page/document/Node.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/page/document/Node.java?rev=707224&r1=707223&r2=707224&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/page/document/Node.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/page/document/Node.java
Wed Oct 22 16:46:45 2008
@@ -18,8 +18,8 @@
 
 import java.util.Locale;
 
-import org.apache.jetspeed.om.common.GenericMetadata;
 import org.apache.jetspeed.om.page.BaseElement;
+import org.apache.jetspeed.om.portlet.GenericMetadata;
 
 /**
  * <p>

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/MenuElement.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/MenuElement.java?rev=707224&r1=707223&r2=707224&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/MenuElement.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/MenuElement.java
Wed Oct 22 16:46:45 2008
@@ -18,7 +18,7 @@
 
 import java.util.Locale;
 
-import org.apache.jetspeed.om.common.GenericMetadata;
+import org.apache.jetspeed.om.portlet.GenericMetadata;
 
 /**
  * This interface describes common features of portal-site

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/request/RequestContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/request/RequestContext.java?rev=707224&r1=707223&r2=707224&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/request/RequestContext.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/request/RequestContext.java
Wed Oct 22 16:46:45 2008
@@ -33,7 +33,7 @@
 import org.apache.jetspeed.pipeline.Pipeline;
 import org.apache.jetspeed.profiler.Profiler;
 import org.apache.jetspeed.om.portlet.Language;
-import org.apache.pluto.om.portlet.PortletDefinition;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.container.PortletWindow;
 
 /**

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/userinfo/UserAttributeSource.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/userinfo/UserAttributeSource.java?rev=707224&r1=707223&r2=707224&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/userinfo/UserAttributeSource.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/userinfo/UserAttributeSource.java
Wed Oct 22 16:46:45 2008
@@ -22,7 +22,7 @@
 
 import javax.security.auth.Subject;
 
-import org.apache.jetspeed.om.common.UserAttributeRef;
+import org.apache.jetspeed.om.portlet.UserAttributeRef;
 import org.apache.jetspeed.request.RequestContext;
 
 /**

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java?rev=707224&r1=707223&r2=707224&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java
Wed Oct 22 16:46:45 2008
@@ -26,7 +26,7 @@
 import javax.servlet.ServletContext;
 
 import org.apache.jetspeed.dispatcher.JetspeedRequestDispatcher;
-import org.apache.jetspeed.om.common.JetspeedServiceReference;
+import org.apache.jetspeed.om.portlet.JetspeedServiceReference;
 import org.apache.jetspeed.om.portlet.PortletApplication;
 import org.apache.jetspeed.services.JetspeedPortletServices;
 import org.apache.jetspeed.services.PortletServices;



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message