portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r705396 [2/3] - in /portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade: components/jetspeed-portal/src/main/java/org/apache/jetspeed/ components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/ components/jetspee...
Date Thu, 16 Oct 2008 23:02:01 GMT
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/PortletFactoryMock.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/PortletFactoryMock.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/PortletFactoryMock.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/PortletFactoryMock.java Thu Oct 16 16:01:57 2008
@@ -22,7 +22,7 @@
 
 import org.apache.jetspeed.factory.PortletFactory;
 import org.apache.jetspeed.factory.PortletInstance;
-import org.apache.jetspeed.om.common.portlet.PortletApplication;
+import org.apache.jetspeed.om.portlet.PortletApplication;
 import org.apache.pluto.om.portlet.PortletDefinition;
 
 public final class PortletFactoryMock implements PortletFactory

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/aggregator/TestAggregator.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/aggregator/TestAggregator.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/aggregator/TestAggregator.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/aggregator/TestAggregator.java Thu Oct 16 16:01:57 2008
@@ -37,9 +37,9 @@
 import org.apache.jetspeed.engine.Engine;
 import org.apache.jetspeed.factory.PortletFactory;
 import org.apache.jetspeed.mocks.ResourceLocatingServletContext;
-import org.apache.jetspeed.om.common.portlet.PortletApplication;
 import org.apache.jetspeed.om.page.ContentPageImpl;
 import org.apache.jetspeed.om.page.Page;
+import org.apache.jetspeed.om.portlet.PortletApplication;
 import org.apache.jetspeed.page.PageManager;
 import org.apache.jetspeed.profiler.ProfileLocator;
 import org.apache.jetspeed.profiler.Profiler;

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/container/state/TestNavigationalState.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/container/state/TestNavigationalState.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/container/state/TestNavigationalState.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/container/state/TestNavigationalState.java Thu Oct 16 16:01:57 2008
@@ -39,7 +39,7 @@
 import org.apache.jetspeed.container.window.PortletWindowAccessor;
 import org.apache.jetspeed.engine.Engine;
 import org.apache.jetspeed.factory.PortletFactory;
-import org.apache.jetspeed.om.common.portlet.PortletApplication;
+import org.apache.jetspeed.om.portlet.PortletApplication;
 import org.apache.jetspeed.om.window.impl.PortletWindowImpl;
 import org.apache.jetspeed.test.JetspeedTestCase;
 import org.apache.jetspeed.testhelpers.SpringEngineHelper;

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/deployment/TestSimpleDeployment.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/deployment/TestSimpleDeployment.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/deployment/TestSimpleDeployment.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/deployment/TestSimpleDeployment.java Thu Oct 16 16:01:57 2008
@@ -33,7 +33,7 @@
 import org.apache.jetspeed.container.window.PortletWindowAccessor;
 import org.apache.jetspeed.deployment.impl.StandardDeploymentManager;
 import org.apache.jetspeed.factory.PortletFactory;
-import org.apache.jetspeed.om.common.portlet.PortletApplication;
+import org.apache.jetspeed.om.portlet.PortletApplication;
 import org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager;
 import org.apache.jetspeed.util.DirectoryHelper;
 import org.apache.jetspeed.util.JarHelper;

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/layout/MockPortletRegistryFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/layout/MockPortletRegistryFactory.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/layout/MockPortletRegistryFactory.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/layout/MockPortletRegistryFactory.java Thu Oct 16 16:01:57 2008
@@ -17,7 +17,7 @@
 package org.apache.jetspeed.layout;
 
 import org.apache.jetspeed.components.portletregistry.PortletRegistry;
-import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.pluto.om.portlet.Parameter;
 import org.apache.pluto.om.portlet.ParameterSet;
 import org.jmock.Mock;
@@ -38,7 +38,7 @@
         Mock portletRegistryMock;
         PortletRegistry portletRegistry;
         Mock portletDefMock;
-        PortletDefinitionComposite portletDef;
+        PortletDefinition portletDef;
         Mock portletDefInitParamsMock;
         ParameterSet portletDefInitParams;
 
@@ -48,8 +48,8 @@
         portletRegistryMock = new Mock(PortletRegistry.class);
         portletRegistry = (PortletRegistry) portletRegistryMock.proxy();
         
-        portletDefMock = new Mock(PortletDefinitionComposite.class);
-        portletDef = (PortletDefinitionComposite) portletDefMock.proxy();
+        portletDefMock = new Mock(PortletDefinition.class);
+        portletDef = (PortletDefinition) portletDefMock.proxy();
 
         portletDefInitParamsMock = new Mock(ParameterSet.class);
         portletDefInitParams = (ParameterSet) portletDefInitParamsMock.proxy();

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java Thu Oct 16 16:01:57 2008
@@ -26,8 +26,8 @@
 import org.apache.jetspeed.AbstractRequestContextTestCase;
 import org.apache.jetspeed.components.util.TransactionCacheEnabledSpringTestCase;
 import org.apache.jetspeed.om.common.JetspeedServiceReference;
-import org.apache.jetspeed.om.common.portlet.PortletApplication;
-import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
+import org.apache.jetspeed.om.portlet.PortletApplication;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.util.descriptor.ExtendedPortletMetadata;
 import org.apache.jetspeed.util.descriptor.PortletApplicationDescriptor;
 
@@ -86,10 +86,10 @@
         ExtendedPortletMetadata md = new ExtendedPortletMetadata(new FileReader(getBaseDir()+"src/test/testdata/deploy/jetspeed-portlet.xml"), app); 
         md.load();
        
-        PortletDefinitionComposite def1 = (PortletDefinitionComposite)app.getPortletDefinitionByName(PORTLET_01);
-        PortletDefinitionComposite def2 = (PortletDefinitionComposite)app.getPortletDefinitionByName(PORTLET_02);
-        PortletDefinitionComposite def3 = (PortletDefinitionComposite)app.getPortletDefinitionByName(PORTLET_03);
-        PortletDefinitionComposite def4 = (PortletDefinitionComposite)app.getPortletDefinitionByName(PORTLET_04);
+        PortletDefinition def1 = (PortletDefinition)app.getPortletDefinitionByName(PORTLET_01);
+        PortletDefinition def2 = (PortletDefinition)app.getPortletDefinitionByName(PORTLET_02);
+        PortletDefinition def3 = (PortletDefinition)app.getPortletDefinitionByName(PORTLET_03);
+        PortletDefinition def4 = (PortletDefinition)app.getPortletDefinitionByName(PORTLET_04);
         
         Collection titles = app.getMetadata().getFields("title");
         Collection def1Titles = def1.getMetadata().getFields("title");

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java Thu Oct 16 16:01:57 2008
@@ -31,9 +31,9 @@
 import org.apache.jetspeed.om.common.ParameterComposite;
 import org.apache.jetspeed.om.common.UserAttribute;
 import org.apache.jetspeed.om.common.portlet.ContentTypeComposite;
-import org.apache.jetspeed.om.common.portlet.PortletApplication;
-import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
 import org.apache.jetspeed.om.common.preference.PreferenceComposite;
+import org.apache.jetspeed.om.portlet.PortletApplication;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.util.DirectoryHelper;
 import org.apache.jetspeed.util.descriptor.PortletApplicationDescriptor;
 import org.apache.jetspeed.util.descriptor.PortletApplicationWar;
@@ -112,7 +112,7 @@
         int count = 0;
         while (it.hasNext())
         {
-            PortletDefinitionComposite portlet = (PortletDefinitionComposite) it.next();
+            PortletDefinition portlet = (PortletDefinition) it.next();
             String identifier = portlet.getPortletIdentifier();
             assertNotNull("Portlet.Identifier is null", identifier);
             if (identifier.equals("HelloPortlet"))
@@ -155,7 +155,7 @@
         }
     }
 
-    private void validateHelloPortlet(PortletDefinitionComposite portlet)
+    private void validateHelloPortlet(PortletDefinition portlet)
     {
         // Portlet Name
         assertNotNull("Portlet.Name is null", portlet.getPortletName());

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestPortletDescriptorSecurityRoles.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestPortletDescriptorSecurityRoles.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestPortletDescriptorSecurityRoles.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/tools/pamanager/TestPortletDescriptorSecurityRoles.java Thu Oct 16 16:01:57 2008
@@ -23,8 +23,8 @@
 import junit.textui.TestRunner;
 
 import org.apache.jetspeed.AbstractRequestContextTestCase;
-import org.apache.jetspeed.om.common.portlet.PortletApplication;
 import org.apache.jetspeed.om.common.servlet.MutableWebApplication;
+import org.apache.jetspeed.om.portlet.PortletApplication;
 import org.apache.jetspeed.om.servlet.impl.SecurityRoleImpl;
 import org.apache.jetspeed.util.DirectoryHelper;
 import org.apache.jetspeed.util.descriptor.PortletApplicationWar;

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java Thu Oct 16 16:01:57 2008
@@ -29,7 +29,7 @@
 
 import org.apache.jetspeed.AbstractRequestContextTestCase;
 import org.apache.jetspeed.mockobjects.request.MockRequestContext;
-import org.apache.jetspeed.om.common.portlet.PortletApplication;
+import org.apache.jetspeed.om.portlet.PortletApplication;
 import org.apache.jetspeed.request.RequestContext;
 import org.apache.jetspeed.security.JetspeedSubjectFactory;
 import org.apache.jetspeed.security.SecurityException;

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java Thu Oct 16 16:01:57 2008
@@ -33,8 +33,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.jetspeed.container.JetspeedPortletConfig;
 import org.apache.jetspeed.container.PortalAccessor;
-import org.apache.jetspeed.om.common.portlet.PortletApplication;
-import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
+import org.apache.jetspeed.om.portlet.PortletApplication;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.portlet.PortletObjectProxy;
 import org.apache.pluto.om.portlet.PortletDefinition;
 
@@ -169,7 +169,7 @@
                 validator = (PreferencesValidator)validatorCache.get(pdId);
                 if ( validator == null )
                 {
-                    String className = ((PortletDefinitionComposite)pd).getPreferenceValidatorClassname();
+                    String className = ((PortletDefinition)pd).getPreferenceValidatorClassname();
                     if ( className != null )
                     {
                         PortletApplication pa = (PortletApplication)pd.getPortletApplicationDefinition();

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.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/components/portletentity/PersistenceBrokerPortletEntityAccess.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java Thu Oct 16 16:01:57 2008
@@ -22,9 +22,9 @@
 
 import org.apache.jetspeed.components.portletregistry.PortletRegistry;
 import org.apache.jetspeed.container.window.PortletWindowAccessor;
-import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
 import org.apache.jetspeed.om.page.ContentFragment;
 import org.apache.jetspeed.om.page.Fragment;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.util.JetspeedObjectID;
 import org.apache.ojb.broker.query.Criteria;
 import org.apache.ojb.broker.query.Query;
@@ -195,7 +195,7 @@
         else
         {
             String portletUniqueName = portletEntity.getPortletUniqueName();
-            PortletDefinitionComposite parentPortletDef = registry.getPortletDefinitionByUniqueName(portletUniqueName);
+            PortletDefinition parentPortletDef = registry.getPortletDefinitionByUniqueName(portletUniqueName);
             if(parentPortletDef != null)
             {
                 //Indication that the fragment has changed the portlet it references.

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/PortletEntityImpl.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/components/portletentity/PortletEntityImpl.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/PortletEntityImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletentity/PortletEntityImpl.java Thu Oct 16 16:01:57 2008
@@ -31,12 +31,12 @@
 import org.apache.jetspeed.aggregator.RenderTrackable;
 import org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider;
 import org.apache.jetspeed.components.portletregistry.PortletRegistry;
-import org.apache.jetspeed.om.common.portlet.PortletApplication;
-import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
 import org.apache.jetspeed.om.common.portlet.PrincipalAware;
 import org.apache.jetspeed.om.common.preference.PreferenceComposite;
 import org.apache.jetspeed.om.common.preference.PreferenceSetComposite;
 import org.apache.jetspeed.om.page.Fragment;
+import org.apache.jetspeed.om.portlet.PortletApplication;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.om.portlet.impl.FragmentPortletDefinition;
 import org.apache.jetspeed.om.preference.FragmentPreference;
 import org.apache.jetspeed.om.preference.impl.PreferenceSetImpl;
@@ -72,7 +72,7 @@
     protected Map perPrincipalPrefs = new HashMap();
     // TODO: temporary replacement for old api PortletWindowList - this should be removed too shortly
     private PortletWindow portletWindow = null;
-    private PortletDefinitionComposite portletDefinition = null;  
+    private PortletDefinition portletDefinition = null;  
     protected String portletName;
     protected String appName;
     private boolean dirty = false;
@@ -399,7 +399,7 @@
     {
         if(composite != null)
         {
-            portletDefinition = (PortletDefinitionComposite) composite;
+            portletDefinition = (PortletDefinition) composite;
             // if the portletDefinition is modified, clear threadlocal fragmentPortletDefinition cache
             RequestContext rc = requestContextComponent.getRequestContext();
             if (rc != null)

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/PersistenceBrokerPortletPreferencesProvider.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/components/portletpreferences/PersistenceBrokerPortletPreferencesProvider.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/PersistenceBrokerPortletPreferencesProvider.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/PersistenceBrokerPortletPreferencesProvider.java Thu Oct 16 16:01:57 2008
@@ -24,9 +24,9 @@
 import org.apache.jetspeed.cache.CacheElement;
 import org.apache.jetspeed.cache.JetspeedCache;
 import org.apache.jetspeed.container.PortletEntity;
-import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
 import org.apache.jetspeed.om.common.preference.PreferenceComposite;
 import org.apache.jetspeed.om.common.preference.PreferenceSetComposite;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.om.preference.impl.PreferenceImpl;
 import org.apache.jetspeed.om.preference.impl.PreferenceSetImpl;
 import org.apache.jetspeed.om.preference.impl.PreferenceValueImpl;
@@ -85,7 +85,7 @@
         return applicationName + ":" + portletName + ":" + entityOid.toString() + ":" + userName;        
     }
 
-    public PreferenceSetComposite getPreferenceSet(PortletDefinitionComposite pd)
+    public PreferenceSetComposite getPreferenceSet(PortletDefinition pd)
     {
         return getPreferenceSet(pd.getApplication().getName(), pd.getPortletName(), null, null, false);
     }
@@ -97,7 +97,7 @@
 
     public PreferenceSetComposite getPreferenceSet(PortletEntity pe, String userName)
     {
-        PortletDefinitionComposite pd = (PortletDefinitionComposite)pe.getPortletDefinition();
+        PortletDefinition pd = (PortletDefinition)pe.getPortletDefinition();
         return getPreferenceSet(pd.getApplication().getName(), pd.getPortletName(), pe.getOid(), userName, false);
     }
 
@@ -211,7 +211,7 @@
         };
     }
     
-    public void savePreferenceSet(PortletDefinitionComposite pd, PreferenceSetComposite preferenceSet)
+    public void savePreferenceSet(PortletDefinition pd, PreferenceSetComposite preferenceSet)
     {
         savePreferenceSet(pd.getApplication().getName(), pd.getPortletName(), null, null, null, preferenceSet);
     }
@@ -223,7 +223,7 @@
     
     public void savePreferenceSet(PortletEntity pe, String userName, PreferenceSetComposite preferenceSet)
     {
-        PortletDefinitionComposite pd = (PortletDefinitionComposite)pe.getPortletDefinition();
+        PortletDefinition pd = (PortletDefinition)pe.getPortletDefinition();
         savePreferenceSet(pd.getApplication().getName(), pd.getPortletName(), pe.getOid(), pe.getId().toString(), userName, preferenceSet);
     }
     

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/PersistenceBrokerPortletRegistry.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/components/portletregistry/PersistenceBrokerPortletRegistry.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/PersistenceBrokerPortletRegistry.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/PersistenceBrokerPortletRegistry.java Thu Oct 16 16:01:57 2008
@@ -27,8 +27,8 @@
 import org.apache.jetspeed.cache.JetspeedCacheEventListener;
 import org.apache.jetspeed.components.dao.InitablePersistenceBrokerDaoSupport;
 import org.apache.jetspeed.om.common.Support;
-import org.apache.jetspeed.om.common.portlet.PortletApplication;
-import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
+import org.apache.jetspeed.om.portlet.PortletApplication;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.om.portlet.impl.PortletApplicationDefinitionImpl;
 import org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl;
 import org.apache.ojb.broker.query.Criteria;
@@ -119,7 +119,7 @@
         return list;
     }
 
-    public PortletDefinitionComposite getPortletDefinitionByUniqueName( String name )
+    public PortletDefinition getPortletDefinitionByUniqueName( String name )
     {
         String appName = PortletRegistryHelper.parseAppName(name);
         String portletName = PortletRegistryHelper.parsePortletName(name);
@@ -128,7 +128,7 @@
         c.addEqualTo("app.name", appName);
         c.addEqualTo("name", portletName);
 
-        PortletDefinitionComposite def = (PortletDefinitionComposite) getPersistenceBrokerTemplate().getObjectByQuery(
+        PortletDefinition def = (PortletDefinition) getPersistenceBrokerTemplate().getObjectByQuery(
                 QueryFactory.newQuery(PortletDefinitionImpl.class, c));
         if (def != null && def.getApplication() == null)
         {
@@ -227,7 +227,7 @@
         try
         {
             getPersistenceBrokerTemplate().store(portlet);
-            ((PortletDefinitionComposite)portlet).storeChildren();
+            ((PortletDefinition)portlet).storeChildren();
         }
         catch (DataAccessException e)
         {
@@ -261,7 +261,7 @@
         {
             //System.out.println("%%% portlet remote removed " + key);            
             RegistryPortletCache.cacheRemoveQuiet((String)key, (RegistryCacheObjectWrapper)element);
-            PortletDefinitionComposite pd = this.getPortletDefinitionByUniqueName((String)key);
+            PortletDefinition pd = this.getPortletDefinitionByUniqueName((String)key);
             if (listeners != null)
             {
                 for (int ix=0; ix < listeners.size(); ix++)

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/PortletApplicationProxy.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/components/portletregistry/PortletApplicationProxy.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/PortletApplicationProxy.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/PortletApplicationProxy.java Thu Oct 16 16:01:57 2008
@@ -16,7 +16,7 @@
  */
 package org.apache.jetspeed.components.portletregistry;
 
-import org.apache.jetspeed.om.common.portlet.PortletApplication;
+import org.apache.jetspeed.om.portlet.PortletApplication;
 
 public interface PortletApplicationProxy
 {

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/PortletApplicationProxyImpl.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/components/portletregistry/PortletApplicationProxyImpl.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/PortletApplicationProxyImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/PortletApplicationProxyImpl.java Thu Oct 16 16:01:57 2008
@@ -21,7 +21,7 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
-import org.apache.jetspeed.om.common.portlet.PortletApplication;
+import org.apache.jetspeed.om.portlet.PortletApplication;
 
 public class PortletApplicationProxyImpl implements InvocationHandler, PortletApplicationProxy
 {

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/PortletDefinitionCompositeProxy.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/components/portletregistry/PortletDefinitionCompositeProxy.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/PortletDefinitionCompositeProxy.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/PortletDefinitionCompositeProxy.java Thu Oct 16 16:01:57 2008
@@ -21,15 +21,15 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
-import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
 
 public class PortletDefinitionCompositeProxy implements InvocationHandler
 {
-    private PortletDefinitionComposite def = null;
+    private PortletDefinition def = null;
     private static PortletRegistry registry;
     private String name;
     
-    public PortletDefinitionCompositeProxy(PortletDefinitionComposite def)
+    public PortletDefinitionCompositeProxy(PortletDefinition def)
     {
         this.def = def;
         this.name = def.getUniqueName();
@@ -40,13 +40,13 @@
         registry = r;
     }
     
-    public static PortletDefinitionComposite createProxy(
-            PortletDefinitionComposite def)
+    public static PortletDefinition createProxy(
+            PortletDefinition def)
     {
         Class[] proxyInterfaces = new Class[]
-        { PortletDefinitionComposite.class};
-        PortletDefinitionComposite proxy = (PortletDefinitionComposite) Proxy
-                .newProxyInstance(PortletDefinitionComposite.class
+        { PortletDefinition.class};
+        PortletDefinition proxy = (PortletDefinition) Proxy
+                .newProxyInstance(PortletDefinition.class
                         .getClassLoader(), proxyInterfaces,
                         new PortletDefinitionCompositeProxy(def));
         return proxy;
@@ -57,12 +57,12 @@
         this.def = null;
     }
     
-    protected void setRealDefinition(PortletDefinitionComposite d)
+    protected void setRealDefinition(PortletDefinition d)
     {
         this.def = d;
     }
     
-    protected PortletDefinitionComposite getRealApplication()
+    protected PortletDefinition getRealApplication()
     {
         return def;
     }

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/RegistryApplicationCache.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/components/portletregistry/RegistryApplicationCache.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/RegistryApplicationCache.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/RegistryApplicationCache.java Thu Oct 16 16:01:57 2008
@@ -23,7 +23,7 @@
 import org.apache.jetspeed.cache.DistributedCacheObject;
 import org.apache.jetspeed.cache.JetspeedCache;
 import org.apache.jetspeed.cache.impl.EhCacheElementImpl;
-import org.apache.jetspeed.om.common.portlet.PortletApplication;
+import org.apache.jetspeed.om.portlet.PortletApplication;
 import org.apache.ojb.broker.Identity;
 import org.apache.ojb.broker.PersistenceBroker;
 import org.apache.ojb.broker.cache.ObjectCache;

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/RegistryPortletCache.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/components/portletregistry/RegistryPortletCache.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/RegistryPortletCache.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletregistry/RegistryPortletCache.java Thu Oct 16 16:01:57 2008
@@ -23,7 +23,7 @@
 import org.apache.jetspeed.cache.DistributedCacheObject;
 import org.apache.jetspeed.cache.JetspeedCache;
 import org.apache.jetspeed.cache.impl.EhCacheElementImpl;
-import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.ojb.broker.Identity;
 import org.apache.ojb.broker.PersistenceBroker;
 import org.apache.ojb.broker.cache.ObjectCache;
@@ -80,7 +80,7 @@
         CacheElement entry = new EhCacheElementImpl(oid, obj);
         oidCache.put(entry);
         
-        PortletDefinitionComposite pd = (PortletDefinitionComposite)obj;
+        PortletDefinition pd = (PortletDefinition)obj;
         DistributedCacheObject wrapper = new RegistryCacheObjectWrapper(oid, pd.getUniqueName());
         nameCache.remove(pd.getUniqueName());
         CacheElement nameEntry = nameCache.createElement(pd.getUniqueName(), wrapper);
@@ -91,7 +91,7 @@
             for (int ix=0; ix < listeners.size(); ix++)
             {
                 RegistryEventListener listener = (RegistryEventListener)listeners.get(ix);
-                listener.portletUpdated((PortletDefinitionComposite)obj);
+                listener.portletUpdated((PortletDefinition)obj);
             }
         }
     }
@@ -126,7 +126,7 @@
      */
     public synchronized static void cacheRemove(Identity oid)
     {
-        PortletDefinitionComposite pd = (PortletDefinitionComposite)cacheLookup(oid);
+        PortletDefinition pd = (PortletDefinition)cacheLookup(oid);
         if (pd == null)
             return;
         
@@ -154,7 +154,7 @@
         }
         Identity oid = wrapper.getId();
 
-        PortletDefinitionComposite pd = (PortletDefinitionComposite)cacheLookup(oid);
+        PortletDefinition pd = (PortletDefinition)cacheLookup(oid);
         if (pd == null)
             return;
      

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/LanguageImpl.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/impl/LanguageImpl.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/LanguageImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/LanguageImpl.java Thu Oct 16 16:01:57 2008
@@ -18,11 +18,11 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
@@ -30,10 +30,9 @@
 import java.util.StringTokenizer;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.jetspeed.om.common.MutableLanguage;
+import org.apache.jetspeed.om.portlet.Language;
 import org.apache.jetspeed.util.HashCodeBuilder;
 import org.apache.jetspeed.util.JetspeedLocale;
-import org.apache.pluto.om.portlet.Language;
 
 /**
  * 
@@ -51,18 +50,20 @@
  * @version $Id$
  *  
  */
-public class LanguageImpl extends ResourceBundle implements MutableLanguage, Serializable
+public class LanguageImpl extends ResourceBundle implements Language, Serializable
 {
+    private static final long serialVersionUID = 3817645806723304558L;
+    
     public static final String JAVAX_PORTLET_KEYWORDS = "javax.portlet.keywords";
     public static final String JAVAX_PORTLET_SHORT_TITLE = "javax.portlet.short-title";
     public static final String JAVAX_PORTLET_TITLE = "javax.portlet.title";
 
-    private Set keys;
+    private Set<String> keys;
     private String title;
     private String shortTitle;
     private Locale locale;
     private String keywordStr;
-    private Collection keywords;
+    private List<String> keywords;
 
     /**
      * This field can be used by persistence tools for storing PK info Otherwise
@@ -74,14 +75,14 @@
 
     public LanguageImpl()
     {
-        keys = Collections.synchronizedSet(new HashSet(3));
+        keys = Collections.synchronizedSet(new HashSet<String>(3));
         keys.add(JAVAX_PORTLET_TITLE);
         keys.add(JAVAX_PORTLET_SHORT_TITLE);
         keys.add(JAVAX_PORTLET_KEYWORDS);
         this.locale = JetspeedLocale.getDefaultLocale();
     }
     
-    public Enumeration getKeys()
+    public Enumeration<String> getKeys()
     {
         return Collections.enumeration(keys);
     }
@@ -98,7 +99,7 @@
         }
         else if (key.equals(JAVAX_PORTLET_KEYWORDS))
         {
-            return getKeywordStr();
+            return getKeywords();
         }
         return null;
     }
@@ -123,7 +124,7 @@
     {
         if ( parent == null && bundle != null )
         {
-            Enumeration parentKeys = bundle.getKeys();
+            Enumeration<String> parentKeys = bundle.getKeys();
             while ( parentKeys.hasMoreElements() )
             {
                 keys.add(parentKeys.nextElement());
@@ -139,7 +140,7 @@
         {
             setTitle(getStringValue(bundle, JAVAX_PORTLET_TITLE, getTitle()));
             setShortTitle(getStringValue(bundle, JAVAX_PORTLET_SHORT_TITLE, getShortTitle()));
-            setKeywords(getStringValue(bundle, JAVAX_PORTLET_KEYWORDS, getKeywordStr()));
+            setKeywords(getStringValue(bundle, JAVAX_PORTLET_KEYWORDS, getKeywords()));
         }
     }
     
@@ -170,7 +171,8 @@
     /**
      * @see org.apache.pluto.om.common.Language#getKeywords()
      */
-    public Iterator getKeywords()
+    @SuppressWarnings("unchecked")
+    public Iterator<String> getKeywordsIterator()
     {
         if ( keywords == null )
         {
@@ -220,16 +222,16 @@
     /**
      * @see org.apache.jetspeed.om.common.LanguageComposite#setKeywords(java.util.Collection)
      */
-    public void setKeywords( Collection keywords )
+    public void setKeywords( List<String> keywords )
     {
-        this.keywords = keywords;
+        this.keywords = new ArrayList<String>(keywords);
     }
     
     public void setKeywords(String keywordStr)
     {
         if (keywords == null)
         {
-            keywords = new ArrayList();
+            keywords = new ArrayList<String>();
         }
         else
         {
@@ -247,11 +249,11 @@
         this.keywordStr = keywordStr;
     }
     
-    public String getKeywordStr()
+    public String getKeywords()
     {
         if ( keywordStr == null )
         {
-            keywordStr = StringUtils.join(getKeywords(),",");
+            keywordStr = StringUtils.join(getKeywordsIterator(),",");
         }
         return keywordStr;
     }

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/FragmentPortletDefinition.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/FragmentPortletDefinition.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/FragmentPortletDefinition.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/FragmentPortletDefinition.java Thu Oct 16 16:01:57 2008
@@ -22,10 +22,10 @@
 
 import org.apache.jetspeed.om.common.GenericMetadata;
 import org.apache.jetspeed.om.common.ParameterComposite;
-import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
 import org.apache.jetspeed.om.common.preference.PreferenceComposite;
 import org.apache.jetspeed.om.common.preference.PreferenceSetComposite;
 import org.apache.jetspeed.om.page.Fragment;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.om.preference.impl.FragmentPortletPreferenceSet;
 import org.apache.pluto.om.portlet.Language;
 import org.apache.pluto.om.portlet.LanguageSet;
@@ -54,12 +54,12 @@
  * @author <href a="mailto:weaver@apache.org">Scott T. Weaver</a>
  *
  */
-public class FragmentPortletDefinition implements PortletDefinitionComposite
+public class FragmentPortletDefinition implements PortletDefinition
 {
-    private final PortletDefinitionComposite portletDefinition;
+    private final PortletDefinition portletDefinition;
     private final Fragment fragment;
     
-    public FragmentPortletDefinition(PortletDefinitionComposite portletDefinition, Fragment fragment)
+    public FragmentPortletDefinition(PortletDefinition portletDefinition, Fragment fragment)
     {
         this.portletDefinition = portletDefinition;
         this.fragment = fragment;

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.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/PortletApplicationDefinitionImpl.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.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/PortletApplicationDefinitionImpl.java Thu Oct 16 16:01:57 2008
@@ -37,9 +37,9 @@
 import org.apache.jetspeed.om.common.UserAttributeRef;
 import org.apache.jetspeed.om.common.portlet.CustomPortletMode;
 import org.apache.jetspeed.om.common.portlet.CustomWindowState;
-import org.apache.jetspeed.om.common.portlet.PortletApplication;
-import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
 import org.apache.jetspeed.om.impl.UserAttributeImpl;
+import org.apache.jetspeed.om.portlet.PortletApplication;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.pluto.om.portlet.PortletDefinition;
 import org.apache.pluto.om.servlet.WebApplicationDefinition;
 
@@ -206,16 +206,16 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletApplication#addPortletDefinition(org.apache.pluto.om.portlet.PortletDefinition)
+     * @see org.apache.jetspeed.om.portlet.PortletApplication#addPortletDefinition(org.apache.pluto.om.portlet.PortletDefinition)
      */
     public void addPortletDefinition(PortletDefinition pd)
     {
-       ((PortletDefinitionComposite) pd).setPortletApplicationDefinition(this);
+       ((PortletDefinition) pd).setPortletApplicationDefinition(this);
         portlets.add(pd);
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletApplication#getPortletDefinitions()
+     * @see org.apache.jetspeed.om.portlet.PortletApplication#getPortletDefinitions()
      */
     public Collection getPortletDefinitions()
     {
@@ -223,7 +223,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletApplication#getPortletDefinitionByName(java.lang.String)
+     * @see org.apache.jetspeed.om.portlet.PortletApplication#getPortletDefinitionByName(java.lang.String)
      */
     public PortletDefinition getPortletDefinitionByName(String name)
     {
@@ -240,7 +240,7 @@
     }
 
     /** 
-     * @see org.apache.jetspeed.om.common.portlet.PortletApplication#setUserAttributeRefs(java.util.Collection)
+     * @see org.apache.jetspeed.om.portlet.PortletApplication#setUserAttributeRefs(java.util.Collection)
      */
     public void setUserAttributeRefs(Collection userAttributeRefs)
     {
@@ -248,7 +248,7 @@
     }
 
     /** 
-     * @see org.apache.jetspeed.om.common.portlet.PortletApplication#getUserAttributeRefs()
+     * @see org.apache.jetspeed.om.portlet.PortletApplication#getUserAttributeRefs()
      */
     public Collection getUserAttributeRefs()
     {
@@ -256,7 +256,7 @@
     }
 
     /** 
-     * @see org.apache.jetspeed.om.common.portlet.PortletApplication#addUserAttributeRef(org.apache.jetspeed.om.common.UserAttributeRef)
+     * @see org.apache.jetspeed.om.portlet.PortletApplication#addUserAttributeRef(org.apache.jetspeed.om.common.UserAttributeRef)
      */
     public void addUserAttributeRef(UserAttributeRef userAttributeRef)
     {
@@ -272,7 +272,7 @@
     }
     
     /** 
-     * @see org.apache.jetspeed.om.common.portlet.PortletApplication#addUserAttribute(java.lang.String, java.lang.String)
+     * @see org.apache.jetspeed.om.portlet.PortletApplication#addUserAttribute(java.lang.String, java.lang.String)
      */
     public void addUserAttribute(String userName, String description)
     {
@@ -283,7 +283,7 @@
     }
     
     /** 
-     * @see org.apache.jetspeed.om.common.portlet.PortletApplication#setUserAttributes(java.util.Collection)
+     * @see org.apache.jetspeed.om.portlet.PortletApplication#setUserAttributes(java.util.Collection)
      */
     public void setUserAttributes(Collection userAttributes)
     {
@@ -291,7 +291,7 @@
     }
 
     /** 
-     * @see org.apache.jetspeed.om.common.portlet.PortletApplication#getUserAttributes()
+     * @see org.apache.jetspeed.om.portlet.PortletApplication#getUserAttributes()
      */
     public Collection getUserAttributes()
     {
@@ -299,7 +299,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletApplication#setApplicationIdentifier(java.lang.String)
+     * @see org.apache.jetspeed.om.portlet.PortletApplication#setApplicationIdentifier(java.lang.String)
      */
     public void setApplicationIdentifier(String applicationIdentifier)
     {
@@ -307,7 +307,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletApplication#getApplicationIdentifier()
+     * @see org.apache.jetspeed.om.portlet.PortletApplication#getApplicationIdentifier()
      */
     public String getApplicationIdentifier()
     {
@@ -315,7 +315,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletApplication#setApplicationType(int)
+     * @see org.apache.jetspeed.om.portlet.PortletApplication#setApplicationType(int)
      */
     public void setApplicationType(int type)
     {
@@ -323,7 +323,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletApplication#getApplicationType()
+     * @see org.apache.jetspeed.om.portlet.PortletApplication#getApplicationType()
      */
     public int getApplicationType()
     {
@@ -331,7 +331,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletApplication#getMetadata()
+     * @see org.apache.jetspeed.om.portlet.PortletApplication#getMetadata()
      */
     public GenericMetadata getMetadata()
     {
@@ -347,7 +347,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletApplication#setMetadata(org.apache.jetspeed.om.common.GenericMetadata)
+     * @see org.apache.jetspeed.om.portlet.PortletApplication#setMetadata(org.apache.jetspeed.om.common.GenericMetadata)
      */
     public void setMetadata(GenericMetadata metadata)
     {

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.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/PortletDefinitionImpl.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.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/PortletDefinitionImpl.java Thu Oct 16 16:01:57 2008
@@ -21,9 +21,12 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
 import java.util.StringTokenizer;
 
 import javax.portlet.PreferencesValidator;
@@ -37,8 +40,6 @@
 import org.apache.jetspeed.om.common.MutableDisplayName;
 import org.apache.jetspeed.om.common.ParameterComposite;
 import org.apache.jetspeed.om.common.Support;
-import org.apache.jetspeed.om.common.portlet.PortletApplication;
-import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
 import org.apache.jetspeed.om.common.preference.PreferenceComposite;
 import org.apache.jetspeed.om.common.preference.PreferenceSetComposite;
 import org.apache.jetspeed.om.common.preference.PreferencesValidatorFactory;
@@ -46,21 +47,21 @@
 import org.apache.jetspeed.om.impl.DescriptionSetImpl;
 import org.apache.jetspeed.om.impl.DisplayNameSetImpl;
 import org.apache.jetspeed.om.impl.LanguageImpl;
-import org.apache.jetspeed.om.impl.LanguageSetImpl;
 import org.apache.jetspeed.om.impl.ParameterSetImpl;
 import org.apache.jetspeed.om.impl.PortletDescriptionImpl;
 import org.apache.jetspeed.om.impl.PortletDisplayNameImpl;
 import org.apache.jetspeed.om.impl.PortletParameterSetImpl;
 import org.apache.jetspeed.om.impl.SecurityRoleRefImpl;
 import org.apache.jetspeed.om.impl.SecurityRoleRefSetImpl;
+import org.apache.jetspeed.om.portlet.PortletApplication;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.util.HashCodeBuilder;
+import org.apache.jetspeed.util.JetspeedLocale;
 import org.apache.jetspeed.util.JetspeedLongObjectID;
 import org.apache.ojb.broker.PersistenceBroker;
 import org.apache.ojb.broker.PersistenceBrokerAware;
 import org.apache.ojb.broker.PersistenceBrokerException;
-import org.apache.pluto.om.portlet.Language;
-import org.apache.pluto.om.portlet.LanguageSet;
-import org.apache.pluto.om.portlet.ObjectID;
+import org.apache.jetspeed.om.portlet.Language;
 import org.apache.pluto.om.portlet.Parameter;
 import org.apache.pluto.om.portlet.ParameterSet;
 import org.apache.pluto.om.portlet.Preference;
@@ -84,7 +85,7 @@
  * @version $Id$
  *  
  */
-public class PortletDefinitionImpl implements PortletDefinitionComposite, PreferencesValidatorFactory, Serializable, Support, PersistenceBrokerAware
+public class PortletDefinitionImpl implements PortletDefinition, PreferencesValidatorFactory, Serializable, Support, PersistenceBrokerAware
 {
     private static PortletRegistry registry;
     private static PortletFactory  portletFactory;
@@ -95,8 +96,7 @@
     private String className;
     private String name;
     private String portletIdentifier;
-    private Collection languageSet = null;
-    private LanguageSetImpl langListWrapper = new LanguageSetImpl();
+    private List<Language> languages = null;
     private Collection parameterSet;
     private ParameterSetImpl paramListWrapper = new PortletParameterSetImpl();
     private Collection securityRoleRefSet;
@@ -148,18 +148,31 @@
         }
     }
 
-    /**
-     * @see org.apache.pluto.om.portlet.PortletDefinition#getId()
-     */
-    public ObjectID getId()
+    protected ResourceBundle loadResourceBundle( Locale locale )
     {
-        if ( oid == null && id != null )
+        ResourceBundle resourceBundle = null;
+        try
+        {
+            if (getResourceBundle() != null)
+            {
+                if (getPortletClassLoader() != null)
+                {
+                    resourceBundle = ResourceBundle.getBundle(getResourceBundle(), locale, getPortletClassLoader());
+                }
+                else
+                {
+                    resourceBundle = ResourceBundle.getBundle(getResourceBundle(), locale, Thread.currentThread()
+                            .getContextClassLoader());
+                }
+            }
+        }
+        catch (MissingResourceException x)
         {
-            oid = new JetspeedLongObjectID(id);
+            return null;
         }
-        return oid;
+        return resourceBundle;
     }
-
+    
     /**
      * @see org.apache.pluto.om.portlet.PortletDefinition#getPortletClass()
      */
@@ -175,19 +188,109 @@
     {
         return name;
     }
+    
+    public Language getLanguage(Locale locale)
+    {
+        LanguageImpl fallback = null;
+        // ensure languages list is available;
+        getLanguages();
+        synchronized (languages)
+        {
+            for (Language l : languages)
+            {
+                LanguageImpl lang = (LanguageImpl)l;
+                if (lang.getLocale().equals(locale))
+                {
+                    if (getResourceBundle() != null && lang.getParentResourceBundle() == null)
+                    {
+                        lang.setResourceBundle(loadResourceBundle(lang.getLocale()));
+                    }
+                    return lang;
+                }
+                else if (lang.getLocale().getLanguage().equals(locale.getLanguage()))
+                {
+                    fallback = lang;
+                }
+            }
+            if ( fallback == null )
+            {
+                if ( JetspeedLocale.getDefaultLocale().equals(locale) )
+                {
+                    // no default language stored yet
+                    LanguageImpl defaultLanguage = new LanguageImpl();
+                    defaultLanguage.setLocale(locale);
+                    
+                    if ( getResourceBundle() != null )
+                    {
+                        defaultLanguage.setResourceBundle(loadResourceBundle(locale));
+                        defaultLanguage.loadDefaults();
+                        languages.add(defaultLanguage);
+                        return defaultLanguage;
+                    }
+                }
+                else
+                {
+                    return getLanguage(JetspeedLocale.getDefaultLocale());
+                }
+            }
+            
+            LanguageImpl language = new LanguageImpl();
+            language.setLocale(locale);
+            language.setTitle(fallback.getTitle());
+            language.setShortTitle(fallback.getShortTitle());
+            language.setKeywords(fallback.getKeywords());
+            if ( getResourceBundle() != null )
+            {
+              language.setResourceBundle(loadResourceBundle(locale));
+            }
+            language.loadDefaults();
+            languages.add(language);
+            return language;
+        }
+    }
+    
+    public List<Language> getLanguages()
+    {
+        if ( languages == null )
+        {
+            languages = new ArrayList<Language>();
+        }
+        return Collections.unmodifiableList(languages);
+    }
 
     /**
-     * @see org.apache.pluto.om.portlet.PortletDefinition#getLanguageSet()
+     * @see org.apache.jetspeed.om.portlet.PortletDefinition#addLanguage(java.lang.String, java.lang.String, java.lang.String, java.util.Locale)
      */
-    public LanguageSet getLanguageSet()
+    public void addLanguage(String title, String shortTitle, String keywords, Locale locale)
     {
-        if ( languageSet != null )
+        // ensure list is available        
+        getLanguages();
+        synchronized(languages)
         {
-            langListWrapper.setInnerCollection(languageSet);
+            if (locale == null)
+            {
+                locale = JetspeedLocale.getDefaultLocale();
+            }
+            LanguageImpl lang = (LanguageImpl)getLanguage(locale);
+            boolean newLang = lang == null;
+            if (newLang)
+            {
+                lang = new LanguageImpl();
+                lang.setLocale(locale);
+            }
+            lang.setTitle(title);
+            lang.setShortTitle(shortTitle);
+            lang.setKeywords(keywords);
+            if (newLang)
+            {
+                if ( getResourceBundle() != null )
+                {
+                    lang.setResourceBundle(loadResourceBundle(locale));
+                    lang.loadDefaults();
+                    languages.add(lang);
+                }
+            }
         }
-        langListWrapper.setClassLoader(getPortletClassLoader());
-        
-        return langListWrapper;
     }
 
     /**
@@ -226,7 +329,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#setPreferenceSet(org.apache.pluto.om.common.PreferenceSet)
+     * @see org.apache.jetspeed.om.common.portlet.PortletDefinition#setPreferenceSet(org.apache.pluto.om.common.PreferenceSet)
      */
     public void setPreferenceSet( PreferenceSet preferences )
     {
@@ -309,34 +412,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#addLanguage(org.apache.pluto.om.common.Language)
-     */
-    public void addLanguage( Language lang )
-    {
-        if (languageSet == null)
-        {
-            languageSet = new ArrayList();
-        }
-        langListWrapper.setInnerCollection(languageSet);
-        langListWrapper.add(lang);
-    }
-    
-    /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#addLanguage(java.lang.String, java.lang.String, java.lang.String, java.util.Locale)
-     */
-    public void addLanguage(String title, String shortTitle, String keywords, Locale locale)
-    {
-        LanguageImpl lang = new LanguageImpl();
-        lang.setTitle(title);
-        lang.setShortTitle(shortTitle);
-        lang.setKeywords(keywords);
-        lang.setLocale(locale);
-        
-        addLanguage(lang);
-    }
-
-    /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#setContentTypeSet(org.apache.pluto.om.portlet.ContentTypeSet)
+     * @see org.apache.jetspeed.om.common.portlet.PortletDefinition#setContentTypeSet(org.apache.pluto.om.portlet.ContentTypeSet)
      */
     public void setContentTypeSet( ContentTypeSet contentTypes )
     {
@@ -344,7 +420,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#setInitParameterSet(org.apache.pluto.om.common.ParameterSet)
+     * @see org.apache.jetspeed.om.common.portlet.PortletDefinition#setInitParameterSet(org.apache.pluto.om.common.ParameterSet)
      */
     public void setInitParameterSet( ParameterSet parameters )
     {
@@ -352,7 +428,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#setInitSecurityRoleRefSet(org.apache.pluto.om.common.SecurityRoleRefSet)
+     * @see org.apache.jetspeed.om.common.portlet.PortletDefinition#setInitSecurityRoleRefSet(org.apache.pluto.om.common.SecurityRoleRefSet)
      */
     public void setInitSecurityRoleRefSet( SecurityRoleRefSet securityRefs )
     {
@@ -360,14 +436,6 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#setLanguageSet(org.apache.pluto.om.common.LanguageSet)
-     */
-    public void setLanguageSet( LanguageSet languages )
-    {
-        this.languageSet = ((LanguageSetImpl) languages).getInnerCollection();
-    }
-
-    /**
      * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#addUserAttribute(org.apache.jetspeed.om.common.UserAttribute)
      */
     /*
@@ -410,7 +478,7 @@
      * this.userAttributeRefSet; }
      */
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#setInitParameter(java.lang.String,
+     * @see org.apache.jetspeed.om.common.portlet.PortletDefinition#setInitParameter(java.lang.String,
      *      java.lang.String, java.lang.String)
      */
     public ParameterComposite addInitParameter( String name, String value, DescriptionSet description )
@@ -421,7 +489,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#addInitParameter(java.lang.String,
+     * @see org.apache.jetspeed.om.portlet.PortletDefinition#addInitParameter(java.lang.String,
      *      java.lang.String, java.lang.String, java.util.Locale)
      */
     public ParameterComposite addInitParameter( String name, String value, String description, Locale locale )
@@ -437,7 +505,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#setInitParameter(java.lang.String,
+     * @see org.apache.jetspeed.om.portlet.PortletDefinition#setInitParameter(java.lang.String,
      *      java.lang.String)
      */
     public ParameterComposite addInitParameter( String name, String value )
@@ -447,7 +515,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#setExpirationCache(java.lang.String)
+     * @see org.apache.jetspeed.om.portlet.PortletDefinition#setExpirationCache(java.lang.String)
      */
     public void setExpirationCache( String cache )
     {
@@ -455,7 +523,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#addContentType(org.apache.pluto.om.portlet.ContentType)
+     * @see org.apache.jetspeed.om.common.portlet.PortletDefinition#addContentType(org.apache.pluto.om.portlet.ContentType)
      */
     public void addContentType( ContentType cType )
     {
@@ -464,7 +532,7 @@
     }
     
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#addContentType(java.lang.String, java.lang.String[])
+     * @see org.apache.jetspeed.om.portlet.PortletDefinition#addContentType(java.lang.String, java.lang.String[])
      */
     public void addContentType(String contentType, Collection modes)
     {
@@ -476,7 +544,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#addPreference(java.lang.String,
+     * @see org.apache.jetspeed.om.portlet.PortletDefinition#addPreference(java.lang.String,
      *      java.util.Collection)
      */
     public PreferenceComposite addPreference( String name, String[] values )
@@ -495,7 +563,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#setPortletApplicationDefinition(org.apache.pluto.om.portlet.PortletApplicationDefinition)
+     * @see org.apache.jetspeed.om.portlet.PortletDefinition#setPortletApplicationDefinition(org.apache.pluto.om.portlet.PortletApplicationDefinition)
      */
     public void setPortletApplicationDefinition( PortletApplicationDefinition pad )
     {
@@ -541,7 +609,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#getUniqueName()
+     * @see org.apache.jetspeed.om.portlet.PortletDefinition#getUniqueName()
      */
     public String getUniqueName()
     {
@@ -640,7 +708,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#addDescription(java.util.Locale,
+     * @see org.apache.jetspeed.om.portlet.PortletDefinition#addDescription(java.util.Locale,
      *      java.lang.String)
      */
     public void addDescription( Locale locale, String description )
@@ -667,7 +735,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#addDisplayName(java.util.Locale,
+     * @see org.apache.jetspeed.om.portlet.PortletDefinition#addDisplayName(java.util.Locale,
      *      java.lang.String)
      */
     public void addDisplayName( Locale locale, String displayName )
@@ -758,7 +826,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#addPreference(org.apache.pluto.om.common.Preference)
+     * @see org.apache.jetspeed.om.portlet.PortletDefinition#addPreference(org.apache.pluto.om.common.Preference)
      * @param preference
      */
     public void addPreference( Preference preference )
@@ -785,7 +853,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#addSecurityRoleRef(org.apache.pluto.om.portlet.SecurityRoleRef)
+     * @see org.apache.jetspeed.om.portlet.PortletDefinition#addSecurityRoleRef(org.apache.pluto.om.portlet.SecurityRoleRef)
      */
     public void addSecurityRoleRef( SecurityRoleRef securityRef )
     {
@@ -794,7 +862,7 @@
     }
     
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#addSecurityRoleRef(java.lang.String, java.lang.String)
+     * @see org.apache.jetspeed.om.portlet.PortletDefinition#addSecurityRoleRef(java.lang.String, java.lang.String)
      */
     public SecurityRoleRef addSecurityRoleRef(String roleName, String roleLink)
     {
@@ -808,7 +876,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletApplication#getMetadata()
+     * @see org.apache.jetspeed.om.portlet.PortletApplication#getMetadata()
      */
     public GenericMetadata getMetadata()
     {
@@ -824,7 +892,7 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.common.portlet.PortletApplication#setMetadata(org.apache.jetspeed.om.common.GenericMetadata)
+     * @see org.apache.jetspeed.om.portlet.PortletApplication#setMetadata(org.apache.jetspeed.om.common.GenericMetadata)
      */
     public void setMetadata( GenericMetadata metadata )
     {
@@ -892,24 +960,6 @@
      */
     public void postLoad(Object parameter) throws Exception
     {
-        if (resourceBundle != null)
-        {
-            langListWrapper.setResources(resourceBundle);
-        }
-        
-        if (parameter instanceof ClassLoader)
-        {
-            // newly created PD from portlet.xml
-            langListWrapper.setClassLoader((ClassLoader) parameter);
-            // create supported locale languages and
-            // retrieve title, shortTitle and keywords from resourceBundle if defined
-            langListWrapper.postLoad(this.supportedLocales);
-        }
-        else
-        {
-            // loaded from persistent store
-            langListWrapper.setClassLoader(getPortletClassLoader());
-        }
     }
     
     public PreferencesValidator getPreferencesValidator()

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.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/serializer/JetspeedRegistrySerializer.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java Thu Oct 16 16:01:57 2008
@@ -26,8 +26,8 @@
 import org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider;
 import org.apache.jetspeed.components.portletregistry.PortletRegistry;
 import org.apache.jetspeed.container.PortletEntity;
-import org.apache.jetspeed.om.common.portlet.PortletApplication;
 import org.apache.jetspeed.om.common.preference.PreferenceSetComposite;
+import org.apache.jetspeed.om.portlet.PortletApplication;
 import org.apache.jetspeed.search.SearchEngine;
 import org.apache.jetspeed.serializer.objects.JSApplication;
 import org.apache.jetspeed.serializer.objects.JSApplications;

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.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/portletentity/TestPortletEntityDAO.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java Thu Oct 16 16:01:57 2008
@@ -27,11 +27,11 @@
 import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
 import org.apache.jetspeed.container.PortletEntity;
 import org.apache.jetspeed.engine.MockJetspeedEngine;
-import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
 import org.apache.jetspeed.om.common.preference.PreferenceComposite;
 import org.apache.jetspeed.om.common.preference.PreferenceSetComposite;
 import org.apache.jetspeed.om.page.ContentFragment;
 import org.apache.jetspeed.om.page.Fragment;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.om.portlet.impl.PortletApplicationDefinitionImpl;
 import org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl;
 import org.apache.jetspeed.om.servlet.impl.WebApplicationDefinitionImpl;
@@ -96,10 +96,10 @@
         System.out.println("pa = " + pa.getId());
         PortletDefinitionList portlets = pa.getPortletDefinitionList(); // .get(JetspeedObjectID.createFromString(TEST_PORTLET));
         Iterator pi = portlets.iterator();
-        PortletDefinitionComposite pd = null;
+        PortletDefinition pd = null;
         while (pi.hasNext())
         {
-            pd = (PortletDefinitionComposite) pi.next();
+            pd = (PortletDefinition) pi.next();
             assertTrue("Portlet Def not found", pd.getPortletName().equals("EntityTestPortlet"));
         }
         assertNotNull("Portlet Def is null", pd);
@@ -264,7 +264,7 @@
         webApp.addDescription(Locale.FRENCH, "Description: Le fromage est dans mon pantalon!");
         webApp.addDisplayName(Locale.FRENCH, "Display Name: Le fromage est dans mon pantalon!");
 
-        PortletDefinitionComposite portlet = new PortletDefinitionImpl();
+        PortletDefinition portlet = new PortletDefinitionImpl();
         portlet.setPortletClass("org.apache.Portlet");
         portlet.setPortletName(TEST_PORTLET);
         portlet.addDescription(Locale.getDefault(), "Portlet description.");

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=705396&r1=705395&r2=705396&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 Thu Oct 16 16:01:57 2008
@@ -25,9 +25,9 @@
 import org.apache.jetspeed.engine.MockJetspeedEngine;
 import org.apache.jetspeed.om.common.DublinCore;
 import org.apache.jetspeed.om.common.GenericMetadata;
-import org.apache.jetspeed.om.common.portlet.PortletApplication;
-import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
 import org.apache.jetspeed.om.impl.DublinCoreImpl;
+import org.apache.jetspeed.om.portlet.PortletApplication;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl;
 import org.apache.jetspeed.om.servlet.impl.WebApplicationDefinitionImpl;
 
@@ -120,7 +120,7 @@
     {
         PortletApplication app;
         WebApplicationDefinitionImpl webApp;
-        PortletDefinitionComposite portlet;
+        PortletDefinition portlet;
 
         app = null;
 

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=705396&r1=705395&r2=705396&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 Thu Oct 16 16:01:57 2008
@@ -33,13 +33,13 @@
 import org.apache.jetspeed.om.common.UserAttribute;
 import org.apache.jetspeed.om.common.UserAttributeRef;
 import org.apache.jetspeed.om.common.portlet.ContentTypeComposite;
-import org.apache.jetspeed.om.common.portlet.PortletApplication;
-import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
 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.PortletApplication;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.om.portlet.impl.ContentTypeImpl;
 import org.apache.jetspeed.om.portlet.impl.PortletApplicationDefinitionImpl;
 import org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl;
@@ -183,7 +183,7 @@
         webApp.addDescription(Locale.FRENCH, "Description: Le fromage est dans mon pantalon!");
         webApp.addDisplayName(Locale.FRENCH, "Display Name: Le fromage est dans mon pantalon!");
 
-        PortletDefinitionComposite portlet = new PortletDefinitionImpl();
+        PortletDefinition portlet = new PortletDefinitionImpl();
         portlet.setPortletClass("org.apache.Portlet");
         portlet.setPortletName("Portlet 1");
         portlet.addDescription(Locale.getDefault(), "POrtlet description.");
@@ -223,7 +223,7 @@
     {
         PortletApplication app;
         WebApplicationDefinitionImpl webApp;
-        PortletDefinitionComposite portlet;
+        PortletDefinition portlet;
 
         // Now makes sure everthing got persisted
 

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=705396&r1=705395&r2=705396&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 Thu Oct 16 16:01:57 2008
@@ -30,12 +30,12 @@
 import org.apache.jetspeed.om.common.UserAttribute;
 import org.apache.jetspeed.om.common.UserAttributeRef;
 import org.apache.jetspeed.om.common.portlet.ContentTypeComposite;
-import org.apache.jetspeed.om.common.portlet.PortletApplication;
-import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
 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.PortletApplication;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.om.portlet.impl.ContentTypeImpl;
 import org.apache.jetspeed.om.portlet.impl.PortletApplicationDefinitionImpl;
 import org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl;
@@ -94,7 +94,7 @@
         PortletApplication one = portletRegistry.getPortletApplication("PA-001");
         PortletApplication two = portletRegistry.getPortletApplication("PA-001");
         assertEquals(one, two);
-        PortletDefinitionComposite def = portletRegistry.getPortletDefinitionByUniqueName("PA-001::Portlet-1");
+        PortletDefinition def = portletRegistry.getPortletDefinitionByUniqueName("PA-001::Portlet-1");
         assertNotNull(def);
         assertEquals(def.getPortletApplicationDefinition(), one);
         assertEquals(def, two.getPortletDefinitions().iterator().next());
@@ -132,7 +132,7 @@
         webApp.addDescription(Locale.FRENCH, "Description: Le fromage est dans mon pantalon!");
         webApp.addDisplayName(Locale.FRENCH, "Display Name: Le fromage est dans mon pantalon!");
 
-        PortletDefinitionComposite portlet = new PortletDefinitionImpl();
+        PortletDefinition portlet = new PortletDefinitionImpl();
         portlet.setPortletClass("org.apache.Portlet");
         portlet.setPortletName("Portlet-1");
         portlet.addDescription(Locale.getDefault(), "POrtlet description.");

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=705396&r1=705395&r2=705396&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 Thu Oct 16 16:01:57 2008
@@ -30,12 +30,12 @@
 import org.apache.jetspeed.om.common.UserAttribute;
 import org.apache.jetspeed.om.common.UserAttributeRef;
 import org.apache.jetspeed.om.common.portlet.ContentTypeComposite;
-import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
 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.PortletDefinition;
 import org.apache.jetspeed.om.portlet.impl.ContentTypeImpl;
 import org.apache.jetspeed.om.portlet.impl.PortletApplicationDefinitionImpl;
 import org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl;
@@ -103,7 +103,7 @@
         webApp.addDescription(Locale.FRENCH, "Description: Le fromage est dans mon pantalon!");
         webApp.addDisplayName(Locale.FRENCH, "Display Name: Le fromage est dans mon pantalon!");
 
-        PortletDefinitionComposite portlet = new PortletDefinitionImpl();
+        PortletDefinition portlet = new PortletDefinitionImpl();
         portlet.setPortletClass("org.apache.Portlet");
         portlet.setPortletName("Portlet 1");
         portlet.addDescription(Locale.getDefault(), "Portlet description.");

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=705396&r1=705395&r2=705396&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 Thu Oct 16 16:01:57 2008
@@ -30,12 +30,12 @@
 import org.apache.jetspeed.om.common.UserAttribute;
 import org.apache.jetspeed.om.common.UserAttributeRef;
 import org.apache.jetspeed.om.common.portlet.ContentTypeComposite;
-import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
 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.PortletDefinition;
 import org.apache.jetspeed.om.portlet.impl.ContentTypeImpl;
 import org.apache.jetspeed.om.portlet.impl.PortletApplicationDefinitionImpl;
 import org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl;
@@ -100,7 +100,7 @@
         webApp.addDescription(Locale.FRENCH, "Description: Le fromage est dans mon pantalon!");
         webApp.addDisplayName(Locale.FRENCH, "Display Name: Le fromage est dans mon pantalon!");
 
-        PortletDefinitionComposite portlet = new PortletDefinitionImpl();
+        PortletDefinition portlet = new PortletDefinitionImpl();
         portlet.setPortletClass("org.apache.Portlet");
         portlet.setPortletName("Portlet 1");
         portlet.addDescription(Locale.getDefault(), "Portlet description.");

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/handlers/pam/PortletApplicationHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/handlers/pam/PortletApplicationHandler.java?rev=705396&r1=705395&r2=705396&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/handlers/pam/PortletApplicationHandler.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/handlers/pam/PortletApplicationHandler.java Thu Oct 16 16:01:57 2008
@@ -21,7 +21,7 @@
 
 import org.apache.commons.collections.MultiHashMap;
 import org.apache.jetspeed.om.common.LocalizedField;
-import org.apache.jetspeed.om.common.portlet.PortletApplication;
+import org.apache.jetspeed.om.portlet.PortletApplication;
 import org.apache.jetspeed.search.AbstractObjectHandler;
 import org.apache.jetspeed.search.BaseParsedObject;
 import org.apache.jetspeed.search.ParsedObject;



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