portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r708079 [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/page/ components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/ components/j...
Date Mon, 27 Oct 2008 03:15:52 GMT
Copied: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/UserAttributeImpl.java
(from r708032, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/UserAttributeImpl.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/UserAttributeImpl.java?p2=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/UserAttributeImpl.java&p1=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/UserAttributeImpl.java&r1=708032&r2=708079&rev=708079&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/UserAttributeImpl.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/UserAttributeImpl.java
Sun Oct 26 20:15:51 2008
@@ -14,9 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jetspeed.om.impl;
+package org.apache.jetspeed.om.portlet.impl;
 
-import org.apache.jetspeed.om.common.UserAttribute;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.jetspeed.om.portlet.Description;
+import org.apache.jetspeed.om.portlet.UserAttribute;
 
 /**
  * <p>User attribute implementation.</p>
@@ -25,80 +30,54 @@
  */
 public class UserAttributeImpl implements UserAttribute
 {
+    private String name;
+    protected List<Description> descriptions;
 
-    /** The application id. */
-    protected long appId;
-    protected long id;
-    
-    /**
-     * <p>Default constructor.</p>
-     */
     public UserAttributeImpl()
     {
     }
 
-    /**
-     * <p>User attribute constructor given a name and description.</p>
-     * @param The user attribute name.
-     * @param The user attribute description.
-     */
-     public UserAttributeImpl(String name, String description)
-     {
-         this.name = name;
-         this.description = description;
-     }
-
-    private String name;
-
-    /**
-     * @see org.apache.jetspeed.om.common.UserAttribute#getPortletName()
-     */
     public String getName()
     {
         return name;
     }
 
-    /**
-     * @see org.apache.jetspeed.om.common.UserAttribute#setPortletName(java.lang.String)
-     */
     public void setName(String name)
     {
         this.name = name;
     }
 
-    private String description;
-
-    /**
-     * @see org.apache.jetspeed.om.common.UserAttribute#getDescription()
-     */
-    public String getDescription()
-    {
-        return description;
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.common.UserAttribute#setDescription(java.lang.String)
-     */
-    public void setDescription(String description)
+    public Description getDescription(Locale locale)
     {
-        this.description = description;
+        for (Description d : getDescriptions())
+        {
+            if (d.getLocale().equals(locale))
+            {
+                return d;
+            }
+        }
+        return null;
     }
-
-    /**
-     * <p>Convert {@link UserAttribute} to String.</p>
-     * @return String value of UserAttribute.
-     */
-    public String toString()
+    
+    public List<Description> getDescriptions()
     {
-        String userAttribute = "[[name, " + this.name + "], [description, " + this.description
+ "]]";
-        return userAttribute;
+        if (descriptions == null)
+        {
+            descriptions = new ArrayList<Description>();
+        }
+        return descriptions;
     }
-
-    /**
-     * @return Returns the id.
-     */
-    public long getId()
+    
+    public Description addDescription(String lang)
     {
-        return id;
+        DescriptionImpl d = new DescriptionImpl();
+        d.setLang(lang);
+        if (getDescription(d.getLocale()) != null)
+        {
+            throw new IllegalArgumentException("Description for language: "+d.getLocale()+"
already defined");
+        }
+        getDescriptions();
+        descriptions.add(d);
+        return d;
     }
 }

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/UserAttributeImpl.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.3

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

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

Copied: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/UserAttributeRefImpl.java
(from r708032, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/UserAttributeRefImpl.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/UserAttributeRefImpl.java?p2=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/UserAttributeRefImpl.java&p1=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/UserAttributeRefImpl.java&r1=708032&r2=708079&rev=708079&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/UserAttributeRefImpl.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/UserAttributeRefImpl.java
Sun Oct 26 20:15:51 2008
@@ -14,9 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jetspeed.om.impl;
+package org.apache.jetspeed.om.portlet.impl;
 
-import org.apache.jetspeed.om.common.UserAttribute;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.jetspeed.om.portlet.Description;
+import org.apache.jetspeed.om.portlet.UserAttribute;
 import org.apache.jetspeed.om.portlet.UserAttributeRef;
 
 /**
@@ -26,104 +31,79 @@
  */
 public class UserAttributeRefImpl implements UserAttributeRef
 {
-    /**
-     * <p>Default constructor.</p>
-     */
+    private String name;
+    private String nameLink;
+    private List<Description> descriptions;
+
     public UserAttributeRefImpl()
     {
     }
 
     /**
-     * <p>User attribute ref constructor given a name and name link.</p>
+     * <p>User attribute ref constructor given a {@link UserAttribute}.</p>
      * @param The user attribute ref name.
      * @param The user attribute ref name link.
      */
-     public UserAttributeRefImpl(String name, String nameLink)
+     public UserAttributeRefImpl(UserAttribute userAttribute)
      {
-         this.name = name;
-         this.nameLink = nameLink;
+         this.name = userAttribute.getName();
+         for (Description d : userAttribute.getDescriptions())
+         {
+             addDescription(d.getLang()).setDescription(d.getDescription());
+         }
      }
-
-     /**
-      * <p>User attribute ref constructor given a {@link UserAttribute}.</p>
-      * @param The user attribute ref name.
-      * @param The user attribute ref name link.
-      */
-      public UserAttributeRefImpl(UserAttribute userAttribute)
-      {
-          this.name = userAttribute.getName();
-          this.description = userAttribute.getDescription();
-      }
-
-    private String name;
-
-    /**
-     * @see org.apache.jetspeed.om.portlet.UserAttributeRef#getName()
-     */
+     
     public String getName()
     {
         return name;
     }
 
-    /**
-     * @see org.apache.jetspeed.om.portlet.UserAttributeRef#setName(java.lang.String)
-     */
     public void setName(String name)
     {
         this.name = name;
     }
 
-    private String nameLink;
-
-    /**
-     * @see org.apache.jetspeed.om.portlet.UserAttributeRef#getNameLink()
-     */
     public String getNameLink()
     {
         return nameLink;
     }
 
-    /**
-     * @see org.apache.jetspeed.om.portlet.UserAttributeRef#setNameLink(java.lang.String)
-     */
     public void setNameLink(String nameLink)
     {
         this.nameLink = nameLink;
     }
 
-    private String description;
-
-    /**
-     * @see org.apache.jetspeed.om.portlet.UserAttributeRef#getDescription()
-     */
-    public String getDescription()
-    {
-        return description;
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.portlet.UserAttributeRef#setDescription(java.lang.String)
-     */
-    public void setDescription(String description)
-    {
-        this.description = description;
-    }
-
-    /**
-     * <p>Convert {@link UserAttributeRef} to String.</p>
-     * @return String value of UserAttributeRef.
-     */
-    public String toString()
-    {
-        String userAttributeRef = "[[name, " + this.name + "], [name-link, " + this.nameLink
+ "]]";
-        return userAttributeRef;
-    }
-
-    /**
-     * @return Returns the id.
-     */
-    public long getId()
+    public Description getDescription(Locale locale)
     {
-        return id;
+        for (Description d : getDescriptions())
+        {
+            if (d.getLocale().equals(locale))
+            {
+                return d;
+            }
+        }
+        return null;
+    }
+    
+    public List<Description> getDescriptions()
+    {
+        if (descriptions == null)
+        {
+            descriptions = new ArrayList<Description>();
+        }
+        return descriptions;
+    }
+    
+    public Description addDescription(String lang)
+    {
+        DescriptionImpl d = new DescriptionImpl();
+        d.setLang(lang);
+        if (getDescription(d.getLocale()) != null)
+        {
+            throw new IllegalArgumentException("Description for language: "+d.getLocale()+"
already defined");
+        }
+        getDescriptions();
+        descriptions.add(d);
+        return d;
     }
 }

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/UserAttributeRefImpl.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.3

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

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

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/UserDataConstraintImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/UserDataConstraintImpl.java?rev=708079&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/UserDataConstraintImpl.java
(added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/UserDataConstraintImpl.java
Sun Oct 26 20:15:51 2008
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.impl;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.jetspeed.om.portlet.Description;
+import org.apache.jetspeed.om.portlet.UserDataConstraint;
+
+/**
+ * @version $Id$
+ *
+ */
+public class UserDataConstraintImpl implements UserDataConstraint, Serializable
+{
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.portlet.UserDataConstraint#addDescription(java.lang.String)
+     */
+    public Description addDescription(String lang)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.portlet.UserDataConstraint#getDescription(java.util.Locale)
+     */
+    public Description getDescription(Locale locale)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.portlet.UserDataConstraint#getDescriptions()
+     */
+    public List<Description> getDescriptions()
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.pluto.om.portlet.UserDataConstraint#getTransportGuarantee()
+     */
+    public String getTransportGuarantee()
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+}

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

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

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

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/servlet/impl/WebApplicationDefinitionImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/servlet/impl/WebApplicationDefinitionImpl.java?rev=708079&r1=708078&r2=708079&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/servlet/impl/WebApplicationDefinitionImpl.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/servlet/impl/WebApplicationDefinitionImpl.java
Sun Oct 26 20:15:51 2008
@@ -87,4 +87,13 @@
     {
         return roles;
     }
+    
+    public void addRole(String role)
+    {
+        if (roles.contains(role))
+        {
+            throw new IllegalArgumentException("Role "+role+" already defined");
+        }
+        roles.add(role);
+    }
 }

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java?rev=708079&r1=708078&r2=708079&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java
Sun Oct 26 20:15:51 2008
@@ -23,7 +23,7 @@
 
 import org.apache.jetspeed.container.PortletEntity;
 import org.apache.jetspeed.container.PortletWindow;
-import org.apache.pluto.PortletWindowID;
+import org.apache.jetspeed.container.PortletWindowID;
 
 /**
  * <P>
@@ -54,7 +54,7 @@
     public PortletWindowImpl()
     {
         super();
-    }
+    }    
 
     /**
     * Returns the identifier of this portlet instance window as object id

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java?rev=708079&r1=708078&r2=708079&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java
Sun Oct 26 20:15:51 2008
@@ -23,11 +23,11 @@
 import org.apache.jetspeed.Jetspeed;
 import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
 import org.apache.jetspeed.engine.MockJetspeedEngine;
-import org.apache.jetspeed.om.impl.DublinCoreImpl;
 import org.apache.jetspeed.om.portlet.DublinCore;
 import org.apache.jetspeed.om.portlet.GenericMetadata;
 import org.apache.jetspeed.om.portlet.PortletApplication;
 import org.apache.jetspeed.om.portlet.PortletDefinition;
+import org.apache.jetspeed.om.portlet.impl.DublinCoreImpl;
 import org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl;
 import org.apache.jetspeed.om.servlet.impl.WebApplicationDefinitionImpl;
 

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java?rev=708079&r1=708078&r2=708079&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java
Sun Oct 26 20:15:51 2008
@@ -29,19 +29,19 @@
 import org.apache.jetspeed.engine.MockJetspeedEngine;
 import org.apache.jetspeed.om.common.UserAttribute;
 import org.apache.jetspeed.om.common.preference.PreferenceComposite;
-import org.apache.jetspeed.om.impl.DublinCoreImpl;
-import org.apache.jetspeed.om.impl.JetspeedServiceReferenceImpl;
-import org.apache.jetspeed.om.impl.UserAttributeImpl;
-import org.apache.jetspeed.om.impl.UserAttributeRefImpl;
 import org.apache.jetspeed.om.portlet.DublinCore;
 import org.apache.jetspeed.om.portlet.GenericMetadata;
 import org.apache.jetspeed.om.portlet.JetspeedServiceReference;
 import org.apache.jetspeed.om.portlet.PortletApplication;
 import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.om.portlet.UserAttributeRef;
+import org.apache.jetspeed.om.portlet.impl.DublinCoreImpl;
+import org.apache.jetspeed.om.portlet.impl.JetspeedServiceReferenceImpl;
 import org.apache.jetspeed.om.portlet.impl.SupportsImpl;
 import org.apache.jetspeed.om.portlet.impl.PortletApplicationDefinitionImpl;
 import org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl;
+import org.apache.jetspeed.om.portlet.impl.UserAttributeImpl;
+import org.apache.jetspeed.om.portlet.impl.UserAttributeRefImpl;
 import org.apache.jetspeed.om.servlet.impl.WebApplicationDefinitionImpl;
 import org.apache.jetspeed.util.JetspeedLocale;
 import org.apache.pluto.om.portlet.PreferenceSetCtrl;

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java?rev=708079&r1=708078&r2=708079&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java
Sun Oct 26 20:15:51 2008
@@ -28,16 +28,16 @@
 import org.apache.jetspeed.engine.MockJetspeedEngine;
 import org.apache.jetspeed.om.common.UserAttribute;
 import org.apache.jetspeed.om.common.preference.PreferenceComposite;
-import org.apache.jetspeed.om.impl.JetspeedServiceReferenceImpl;
-import org.apache.jetspeed.om.impl.UserAttributeImpl;
-import org.apache.jetspeed.om.impl.UserAttributeRefImpl;
 import org.apache.jetspeed.om.portlet.JetspeedServiceReference;
 import org.apache.jetspeed.om.portlet.PortletApplication;
 import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.om.portlet.UserAttributeRef;
+import org.apache.jetspeed.om.portlet.impl.JetspeedServiceReferenceImpl;
 import org.apache.jetspeed.om.portlet.impl.SupportsImpl;
 import org.apache.jetspeed.om.portlet.impl.PortletApplicationDefinitionImpl;
 import org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl;
+import org.apache.jetspeed.om.portlet.impl.UserAttributeImpl;
+import org.apache.jetspeed.om.portlet.impl.UserAttributeRefImpl;
 import org.apache.jetspeed.om.servlet.impl.WebApplicationDefinitionImpl;
 import org.apache.jetspeed.util.JetspeedLocale;
 import org.apache.pluto.om.portlet.PreferenceSetCtrl;

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectAll.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectAll.java?rev=708079&r1=708078&r2=708079&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectAll.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectAll.java
Sun Oct 26 20:15:51 2008
@@ -26,18 +26,18 @@
 import org.apache.jetspeed.components.portletregistry.RegistryException;
 import org.apache.jetspeed.om.common.UserAttribute;
 import org.apache.jetspeed.om.common.preference.PreferenceComposite;
-import org.apache.jetspeed.om.impl.DublinCoreImpl;
-import org.apache.jetspeed.om.impl.JetspeedServiceReferenceImpl;
-import org.apache.jetspeed.om.impl.UserAttributeImpl;
-import org.apache.jetspeed.om.impl.UserAttributeRefImpl;
 import org.apache.jetspeed.om.portlet.DublinCore;
 import org.apache.jetspeed.om.portlet.GenericMetadata;
 import org.apache.jetspeed.om.portlet.JetspeedServiceReference;
 import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.om.portlet.UserAttributeRef;
+import org.apache.jetspeed.om.portlet.impl.DublinCoreImpl;
+import org.apache.jetspeed.om.portlet.impl.JetspeedServiceReferenceImpl;
 import org.apache.jetspeed.om.portlet.impl.SupportsImpl;
 import org.apache.jetspeed.om.portlet.impl.PortletApplicationDefinitionImpl;
 import org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl;
+import org.apache.jetspeed.om.portlet.impl.UserAttributeImpl;
+import org.apache.jetspeed.om.portlet.impl.UserAttributeRefImpl;
 import org.apache.jetspeed.om.servlet.impl.WebApplicationDefinitionImpl;
 import org.apache.jetspeed.util.JetspeedLocale;
 import org.apache.pluto.om.portlet.PreferenceSetCtrl;

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectPart1a.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectPart1a.java?rev=708079&r1=708078&r2=708079&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectPart1a.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectPart1a.java
Sun Oct 26 20:15:51 2008
@@ -26,18 +26,18 @@
 import org.apache.jetspeed.components.portletregistry.RegistryException;
 import org.apache.jetspeed.om.common.UserAttribute;
 import org.apache.jetspeed.om.common.preference.PreferenceComposite;
-import org.apache.jetspeed.om.impl.DublinCoreImpl;
-import org.apache.jetspeed.om.impl.JetspeedServiceReferenceImpl;
-import org.apache.jetspeed.om.impl.UserAttributeImpl;
-import org.apache.jetspeed.om.impl.UserAttributeRefImpl;
 import org.apache.jetspeed.om.portlet.DublinCore;
 import org.apache.jetspeed.om.portlet.GenericMetadata;
 import org.apache.jetspeed.om.portlet.JetspeedServiceReference;
 import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.om.portlet.UserAttributeRef;
+import org.apache.jetspeed.om.portlet.impl.DublinCoreImpl;
+import org.apache.jetspeed.om.portlet.impl.JetspeedServiceReferenceImpl;
 import org.apache.jetspeed.om.portlet.impl.SupportsImpl;
 import org.apache.jetspeed.om.portlet.impl.PortletApplicationDefinitionImpl;
 import org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl;
+import org.apache.jetspeed.om.portlet.impl.UserAttributeImpl;
+import org.apache.jetspeed.om.portlet.impl.UserAttributeRefImpl;
 import org.apache.jetspeed.om.servlet.impl.WebApplicationDefinitionImpl;
 import org.apache.jetspeed.util.JetspeedLocale;
 import org.apache.pluto.om.portlet.PreferenceSetCtrl;

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Language.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/Language.java?rev=708079&r1=708078&r2=708079&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Language.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Language.java
Sun Oct 26 20:15:51 2008
@@ -20,7 +20,6 @@
 import java.io.Serializable;
 import java.util.List;
 import java.util.Locale;
-import java.util.ResourceBundle;
 
 /**
  * @version $Id$
@@ -30,6 +29,5 @@
 {
     Locale getLocale();
     List<String> getKeywordList();
-    void addKeyword(String keyword);
-    ResourceBundle getResourceBundle();
+    void setKeywords(String keywords);
 }

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=708079&r1=708078&r2=708079&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
Sun Oct 26 20:15:51 2008
@@ -19,6 +19,7 @@
 import java.io.Serializable;
 import java.util.List;
 import java.util.Locale;
+import java.util.ResourceBundle;
 
 import javax.xml.namespace.QName;
 
@@ -74,6 +75,8 @@
     List<Language> getLanguages();
     Language addLanguage(Locale locale);
     
+    ResourceBundle getResourceBundle(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



---------------------------------------------------------------------
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