You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2008/10/27 04:15:52 UTC
svn commit: r708079 [1/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...
Author: ate
Date: Sun Oct 26 20:15:51 2008
New Revision: 708079
URL: http://svn.apache.org/viewvc?rev=708079&view=rev
Log:
JS2-871 - Upgrade Pluto container to version 2.0
See: http://issues.apache.org/jira/browse/JS2-871
- first initial draft of new Jetspeed-2 portlet OM implementation:
many/most of the implementation is still generated and needs fleshing out, but at least this now more or less provides the *api* implementation methods
while all the outdated/no longer working "collection wrappers" are now removed
- UserAttribute now will support localized descriptions (see also: JS2-118)
- I also dropped all the extended Description/DisplayName objects as none of those provided any additional features
This cleans up the OJB mapping too big time, and there really isn't need for a ojbConcreteClass type discriminator field either
Added:
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/ContainerRuntimeOptionImpl.java (with props)
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/DescriptionImpl.java (contents, props changed)
- copied, changed from r708032, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/DescriptionImpl.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/DisplayNameImpl.java (contents, props changed)
- copied, changed from r708032, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/DisplayNameImpl.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/DublinCoreImpl.java (contents, props changed)
- copied, changed from r708032, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/DublinCoreImpl.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/EventDefinitionImpl.java (with props)
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/EventDefinitionReferenceImpl.java (with props)
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/FilterImpl.java (with props)
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/FilterMappingImpl.java (with props)
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/GenericMetadataImpl.java (contents, props changed)
- copied, changed from r708032, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/GenericMetadataImpl.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/InitParamImpl.java (contents, props changed)
- copied, changed from r708032, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/ParameterImpl.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/JetspeedServiceReferenceImpl.java (contents, props changed)
- copied, changed from r708032, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/JetspeedServiceReferenceImpl.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/LanguageImpl.java (contents, props changed)
- copied, changed from r708032, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/LanguageImpl.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/ListenerImpl.java (with props)
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/LocalizedFieldImpl.java (contents, props changed)
- copied, changed from r708032, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/LocalizedFieldImpl.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PreferenceImpl.java (with props)
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PreferencesImpl.java (with props)
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PublicRenderParameterImpl.java (with props)
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/SecurityConstraintImpl.java (with props)
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/SecurityRoleRefImpl.java (contents, props changed)
- copied, changed from r708032, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/SecurityRoleRefImpl.java
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 (contents, props changed)
- copied, changed 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
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 (contents, props changed)
- copied, changed 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
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 (with props)
Removed:
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionListImpl.java
Modified:
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/PageLocalizedFieldImpl.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/PageMetadataImpl.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/JetspeedServicesRuleSet.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/UserAttributeRefRuleSet.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/ (props changed)
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/CustomPortletModeImpl.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/CustomWindowStateImpl.java
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
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationLocalizedFieldImpl.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationMetadataImpl.java
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
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionLocalizedFieldImpl.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionMetadataImpl.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/SupportsImpl.java
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
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
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java
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
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
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Language.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletDefinition.java
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/PageLocalizedFieldImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/PageLocalizedFieldImpl.java?rev=708079&r1=708078&r2=708079&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/PageLocalizedFieldImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/PageLocalizedFieldImpl.java Sun Oct 26 20:15:51 2008
@@ -16,7 +16,7 @@
*/
package org.apache.jetspeed.om.page;
-import org.apache.jetspeed.om.impl.LocalizedFieldImpl;
+import org.apache.jetspeed.om.portlet.impl.LocalizedFieldImpl;
/**
* @author <a href="mailto:jford@apache.org">Jeremy Ford</a>
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/PageMetadataImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/PageMetadataImpl.java?rev=708079&r1=708078&r2=708079&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/PageMetadataImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/PageMetadataImpl.java Sun Oct 26 20:15:51 2008
@@ -23,8 +23,8 @@
import java.util.Map;
import java.util.Collections;
-import org.apache.jetspeed.om.impl.GenericMetadataImpl;
import org.apache.jetspeed.om.portlet.LocalizedField;
+import org.apache.jetspeed.om.portlet.impl.GenericMetadataImpl;
import org.apache.jetspeed.util.ArgUtil;
/**
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java?rev=708079&r1=708078&r2=708079&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java Sun Oct 26 20:15:51 2008
@@ -38,7 +38,6 @@
import org.apache.jetspeed.container.url.PortalURL;
import org.apache.jetspeed.engine.servlet.ServletRequestFactory;
import org.apache.jetspeed.engine.servlet.ServletResponseFactory;
-import org.apache.jetspeed.om.impl.LanguageImpl;
import org.apache.jetspeed.om.page.ContentPage;
import org.apache.jetspeed.om.page.ContentPageImpl;
import org.apache.jetspeed.om.portlet.Language;
@@ -52,6 +51,7 @@
import org.apache.jetspeed.security.User;
import org.apache.jetspeed.util.JetspeedLocale;
import org.apache.jetspeed.om.portlet.PortletDefinition;
+import org.apache.jetspeed.om.portlet.impl.LanguageImpl;
/**
* Jetspeed Request Context is associated with each portal request. The request
@@ -525,34 +525,21 @@
// }
Language language = portlet.getLanguage(locale);
-
- Enumeration locales = request.getLocales();
- while (locales.hasMoreElements() && language == null)
- {
- Locale aLocale = (Locale) locales.nextElement();
- language = portlet.getLanguage(aLocale);
- }
-
- if (!portlet.getLanguages().isEmpty())
- {
- language = portlet.getLanguages().get(0);
- }
if (language == null)
{
- language = portlet.getLanguage(JetspeedLocale.getDefaultLocale());
- }
-
+ Enumeration locales = request.getLocales();
+ while (language == null && locales.hasMoreElements())
+ {
+ Locale aLocale = (Locale) locales.nextElement();
+ language = portlet.getLanguage(aLocale);
+ }
+ }
if (language == null)
{
- LanguageImpl lang = new LanguageImpl();
- lang.setLocale(locale);
- lang.setShortTitle(portlet.getPortletName());
- lang.setTitle(portlet.getPortletName());
- language = lang;
+ // defaultLocale will always be present, even if not persistent
+ language = portlet.getLanguage(JetspeedLocale.getDefaultLocale());
}
-
- // languageMap.put(portlet, language);
return language;
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/JetspeedServicesRuleSet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/JetspeedServicesRuleSet.java?rev=708079&r1=708078&r2=708079&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/JetspeedServicesRuleSet.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/JetspeedServicesRuleSet.java Sun Oct 26 20:15:51 2008
@@ -18,8 +18,8 @@
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.RuleSetBase;
-import org.apache.jetspeed.om.impl.JetspeedServiceReferenceImpl;
import org.apache.jetspeed.om.portlet.PortletApplication;
+import org.apache.jetspeed.om.portlet.impl.JetspeedServiceReferenceImpl;
/**
* This class helps load the jetspeed portlet extension service declarations.
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/UserAttributeRefRuleSet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/UserAttributeRefRuleSet.java?rev=708079&r1=708078&r2=708079&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/UserAttributeRefRuleSet.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/rules/UserAttributeRefRuleSet.java Sun Oct 26 20:15:51 2008
@@ -22,8 +22,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.om.impl.UserAttributeRefImpl;
import org.apache.jetspeed.om.portlet.PortletApplication;
+import org.apache.jetspeed.om.portlet.impl.UserAttributeRefImpl;
/**
* This class helps load the jetspeed portlet extension user attributes.
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java?rev=708079&r1=708078&r2=708079&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java Sun Oct 26 20:15:51 2008
@@ -28,8 +28,8 @@
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.om.portlet.UserAttribute;
-import org.apache.jetspeed.om.impl.UserAttributeRefImpl;
import org.apache.jetspeed.om.portlet.UserAttributeRef;
+import org.apache.jetspeed.om.portlet.impl.UserAttributeRefImpl;
import org.apache.jetspeed.request.RequestContext;
import org.apache.pluto.PortletContainerException;
import org.apache.pluto.PortletWindow;
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java?rev=708079&r1=708078&r2=708079&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java Sun Oct 26 20:15:51 2008
@@ -24,20 +24,20 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.om.common.Support;
-import org.apache.jetspeed.om.impl.LanguageImpl;
import org.apache.jetspeed.om.impl.ParameterDescriptionImpl;
import org.apache.jetspeed.om.impl.PortletDescriptionImpl;
import org.apache.jetspeed.om.impl.PortletDisplayNameImpl;
import org.apache.jetspeed.om.impl.PortletInitParameterImpl;
import org.apache.jetspeed.om.impl.SecurityRoleRefDescriptionImpl;
-import org.apache.jetspeed.om.impl.SecurityRoleRefImpl;
-import org.apache.jetspeed.om.impl.UserAttributeImpl;
import org.apache.jetspeed.om.portlet.PortletApplication;
import org.apache.jetspeed.om.portlet.PortletDefinition;
+import org.apache.jetspeed.om.portlet.impl.LanguageImpl;
+import org.apache.jetspeed.om.portlet.impl.SecurityRoleRefImpl;
import org.apache.jetspeed.om.portlet.impl.SupportsImpl;
import org.apache.jetspeed.om.portlet.impl.CustomPortletModeImpl;
import org.apache.jetspeed.om.portlet.impl.CustomWindowStateImpl;
import org.apache.jetspeed.om.portlet.impl.PortletApplicationDefinitionImpl;
+import org.apache.jetspeed.om.portlet.impl.UserAttributeImpl;
import org.apache.jetspeed.om.servlet.WebApplicationDefinition;
import org.apache.jetspeed.tools.pamanager.PortletApplicationException;
import org.apache.pluto.om.portlet.SecurityRoleRef;
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Oct 26 20:15:51 2008
@@ -1,2 +1,2 @@
-target
+target
surefire*.properties
Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/ContainerRuntimeOptionImpl.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/ContainerRuntimeOptionImpl.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/ContainerRuntimeOptionImpl.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/ContainerRuntimeOptionImpl.java Sun Oct 26 20:15:51 2008
@@ -0,0 +1,54 @@
+/*
+ * 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.ArrayList;
+import java.util.List;
+
+import org.apache.jetspeed.om.portlet.ContainerRuntimeOption;
+
+/**
+ * @version $Id$
+ *
+ */
+public class ContainerRuntimeOptionImpl implements ContainerRuntimeOption, Serializable
+{
+ protected String name;
+ protected List<String> values = new ArrayList<String>();
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public void addValue(String value)
+ {
+ values.add(value);
+ }
+
+ public List<String> getValues()
+ {
+ return values;
+ }
+}
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/ContainerRuntimeOptionImpl.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/ContainerRuntimeOptionImpl.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/ContainerRuntimeOptionImpl.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/portlet/impl/CustomPortletModeImpl.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/CustomPortletModeImpl.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/portlet/impl/CustomPortletModeImpl.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/CustomPortletModeImpl.java Sun Oct 26 20:15:51 2008
@@ -16,48 +16,33 @@
*/
package org.apache.jetspeed.om.portlet.impl;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
import javax.portlet.PortletMode;
import org.apache.jetspeed.om.portlet.CustomPortletMode;
+import org.apache.jetspeed.om.portlet.Description;
public class CustomPortletModeImpl implements CustomPortletMode
{
- /** The application id. */
- protected long appId;
-
- protected long id;
-
- protected String customName;
-
- protected String mappedName;
-
- protected String description;
-
+ protected String customName;
+ protected String mappedName;
+ protected Boolean portalManaged;
+ protected List<Description> descriptions;
protected transient PortletMode customMode;
-
protected transient PortletMode mappedMode;
public CustomPortletModeImpl()
{
}
-
- public void setCustomName(String customName)
+
+ public void setPortletMode(String customName)
{
- if (customName == null)
- {
- throw new IllegalArgumentException("CustomName is required");
- } else if (this.customName != null)
- {
- throw new IllegalStateException("CustomName already set");
- }
this.customName = customName.toLowerCase();
}
- public void setDescription(String description)
- {
- this.description = description;
- }
-
public void setMappedName(String mappedName)
{
if (this.mappedName != null || this.mappedMode != null)
@@ -93,11 +78,6 @@
return mappedMode;
}
- public String getDescription()
- {
- return description;
- }
-
public int hashCode()
{
return customName != null ? customName.hashCode() : super.hashCode();
@@ -110,4 +90,53 @@
else
return false;
}
+
+ public Description getDescription(Locale locale)
+ {
+ 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;
+ }
+
+ public String getPortletMode()
+ {
+ return customName;
+ }
+
+ public boolean isPortalManaged()
+ {
+ return portalManaged == null ? true : portalManaged.booleanValue();
+ }
+
+ public void setPortalManaged(boolean value)
+ {
+ portalManaged = value ? Boolean.TRUE : Boolean.FALSE;
+ }
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/CustomWindowStateImpl.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/CustomWindowStateImpl.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/portlet/impl/CustomWindowStateImpl.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/CustomWindowStateImpl.java Sun Oct 26 20:15:51 2008
@@ -16,49 +16,32 @@
*/
package org.apache.jetspeed.om.portlet.impl;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
import javax.portlet.WindowState;
import org.apache.jetspeed.om.portlet.CustomWindowState;
+import org.apache.jetspeed.om.portlet.Description;
public class CustomWindowStateImpl implements CustomWindowState
{
- /** The application id. */
- protected long appId;
-
- protected long id;
-
- protected String customName;
-
- protected String mappedName;
-
- protected String description;
-
+ protected String customName;
+ protected String mappedName;
+ protected List<Description> descriptions;
protected transient WindowState customState;
-
protected transient WindowState mappedState;
public CustomWindowStateImpl()
{
}
- public void setCustomName(String customName)
+ public void setWindowState(String customName)
{
- if (customName == null)
- {
- throw new IllegalArgumentException("CustomName is required");
- }
- else if ( this.customName != null )
- {
- throw new IllegalStateException("CustomName already set");
- }
this.customName = customName.toLowerCase();
}
- public void setDescription(String description)
- {
- this.description = description;
- }
-
public void setMappedName(String mappedName)
{
if ( this.mappedName != null || this.mappedState != null )
@@ -95,11 +78,6 @@
return mappedState;
}
- public String getDescription()
- {
- return description;
- }
-
public int hashCode()
{
return customName != null ? customName.hashCode() : super.hashCode();
@@ -112,4 +90,43 @@
else
return false;
}
+
+ public Description getDescription(Locale locale)
+ {
+ 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;
+ }
+
+ public String getWindowState()
+ {
+ return customName;
+ }
}
Copied: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/DescriptionImpl.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/DescriptionImpl.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/DescriptionImpl.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/DescriptionImpl.java&p1=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/DescriptionImpl.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/DescriptionImpl.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/DescriptionImpl.java Sun Oct 26 20:15:51 2008
@@ -14,7 +14,7 @@
* 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 java.util.Locale;
@@ -24,7 +24,7 @@
/**
* DescriptionImpl
* <br>
- * Basic Implementation of the <code>MutableDescription</code>
+ * Implementation of the <code>Description</code>
* interface.
*
* @see org.apache.jetspeed.om.portlet.Description
@@ -33,80 +33,44 @@
* @version $Id$
*
*/
-public abstract class DescriptionImpl implements Description
+public class DescriptionImpl implements Description
{
+ protected String value;
+ protected String lang = null;
+ protected Locale locale = null;
- private String description;
- private Locale locale;
-
- protected long parentId;
-
- protected long id;
-
- /**
- * Tells OJB which class to use to materialize.
- */
- protected String ojbConcreteClass = DescriptionImpl.class.getName();
-
-
-
-
-
-
- public DescriptionImpl()
- {
- super();
- // always init to default locale
- locale = JetspeedLocale.getDefaultLocale();
- }
-
- public DescriptionImpl(Locale locale, String description)
+ public String getDescription()
{
- this();
- this.locale = locale;
- this.description = description;
-
+ return value;
}
- /**
- * @see org.apache.jetspeed.om.registry.Description#setDescription(java.lang.String)
- */
- public void setDescription(String description)
+ public void setDescription(String value)
{
- this.description = description;
-
+ this.value = value;
}
- /**
- * @see org.apache.jetspeed.om.portlet.Description#setLocale(java.util.Locale)
- */
- public void setLocale(Locale locale)
+ public String getLang()
{
- this.locale = locale;
-
+ return lang == null ? JetspeedLocale.getDefaultLocale().toString() : lang;
}
- /**
- * @see org.apache.jetspeed.om.registry.Description#getDescriptions()
- */
- public String getDescription()
+ public void setLang(String value)
{
- return description;
+ lang = value;
+ deriveLocale();
}
-
- /**
- * @see org.apache.pluto.om.portlet.Description#getLocale()
- */
+
public Locale getLocale()
{
- return locale;
+ return locale == null ? deriveLocale() : locale;
}
-
- public void setLanguage(String lang)
+
+ protected Locale deriveLocale()
{
- String[] localeArray = lang.split("[-|_]");
+ String lang = this.getLang();
String country = "";
String variant = "";
+ String[] localeArray = lang.split("[-|_]");
for (int i = 0; i < localeArray.length; i++)
{
if (i == 0)
@@ -122,7 +86,7 @@
variant = localeArray[i];
}
}
- this.locale = new Locale(lang, country, variant);
+ locale = new Locale(lang, country, variant);
+ return locale;
}
-
}
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/DescriptionImpl.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.2
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/DescriptionImpl.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/DescriptionImpl.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/DisplayNameImpl.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/DisplayNameImpl.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/DisplayNameImpl.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/DisplayNameImpl.java&p1=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/DisplayNameImpl.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/DisplayNameImpl.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/DisplayNameImpl.java Sun Oct 26 20:15:51 2008
@@ -14,7 +14,7 @@
* 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 java.util.Locale;
@@ -28,76 +28,43 @@
* @version $Id$
*
*/
-public abstract class DisplayNameImpl implements DisplayName
+public class DisplayNameImpl implements DisplayName
{
- private String displayName;
- private Locale locale;
- /**
- * Tells OJB which class to use to materialize.
- */
- protected String ojbConcreteClass = DisplayNameImpl.class.getName();
-
- protected long parentId;
-
- protected long id;
-
-
- public DisplayNameImpl()
- {
- super();
- // always init to default locale
- locale = JetspeedLocale.getDefaultLocale();
- }
+ protected String value;
+ protected String lang = null;
+ protected Locale locale = null;
- /**
- *
- * @param locale Locale of this DisaplyName.
- * @param name The actual text of the display name.
- */
- public DisplayNameImpl(Locale locale, String name)
+ public String getDisplayName()
{
- this();
- this.locale = locale;
- this.displayName = name;
+ return value;
}
- /**
- * @see org.apache.pluto.om.portlet.DisplayName#getDisplayName()
- */
- public String getDisplayName()
+ public void setDisplayName(String value)
{
- return displayName;
+ this.value = value;
}
- /**
- * @see org.apache.pluto.om.portlet.DisplayName#getLocale()
- */
- public Locale getLocale()
+ public String getLang()
{
- return locale;
+ return lang == null ? JetspeedLocale.getDefaultLocale().toString() : lang;
}
- /**
- * @see org.apache.jetspeed.om.portlet.DisplayName#setDisplayName(java.lang.String)
- */
- public void setDisplayName(String displayName)
+ public void setLang(String value)
{
- this.displayName = displayName;
+ lang = value;
}
- /**
- * @see org.apache.jetspeed.om.portlet.DisplayName#setLocale(java.util.Locale)
- */
- public void setLocale(Locale locale)
+ public Locale getLocale()
{
- this.locale = locale;
+ return locale == null ? deriveLocale() : locale;
}
-
- public void setLanguage(String lang)
+
+ protected Locale deriveLocale()
{
- String[] localeArray = lang.split("[-|_]");
+ String lang = this.getLang();
String country = "";
String variant = "";
+ String[] localeArray = lang.split("[-|_]");
for (int i = 0; i < localeArray.length; i++)
{
if (i == 0)
@@ -113,7 +80,7 @@
variant = localeArray[i];
}
}
- this.locale = new Locale(lang, country, variant);
+ locale = new Locale(lang, country, variant);
+ return locale;
}
-
}
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/DisplayNameImpl.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.2
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/DisplayNameImpl.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/DisplayNameImpl.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/DublinCoreImpl.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/DublinCoreImpl.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/DublinCoreImpl.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/DublinCoreImpl.java&p1=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/DublinCoreImpl.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/DublinCoreImpl.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/DublinCoreImpl.java Sun Oct 26 20:15:51 2008
@@ -14,7 +14,7 @@
* 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 java.util.Collection;
import java.util.Locale;
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/DublinCoreImpl.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.1
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/DublinCoreImpl.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/DublinCoreImpl.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/EventDefinitionImpl.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/EventDefinitionImpl.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/EventDefinitionImpl.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/EventDefinitionImpl.java Sun Oct 26 20:15:51 2008
@@ -0,0 +1,122 @@
+/*
+ * 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 javax.xml.namespace.QName;
+
+import org.apache.jetspeed.om.portlet.Description;
+import org.apache.jetspeed.om.portlet.EventDefinition;
+
+/**
+ * @version $Id$
+ *
+ */
+public class EventDefinitionImpl implements EventDefinition, Serializable
+{
+ /* (non-Javadoc)
+ * @see org.apache.jetspeed.om.portlet.EventDefinition#addDescription(java.lang.String)
+ */
+ public Description addDescription(String lang)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jetspeed.om.portlet.EventDefinition#getDescription(java.util.Locale)
+ */
+ public Description getDescription(Locale locale)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jetspeed.om.portlet.EventDefinition#getDescriptions()
+ */
+ public List<Description> getDescriptions()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.pluto.om.portlet.EventDefinition#addAlias(javax.xml.namespace.QName)
+ */
+ public void addAlias(QName name)
+ {
+ // TODO Auto-generated method stub
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.pluto.om.portlet.EventDefinition#getAliases()
+ */
+ public List<QName> getAliases()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.pluto.om.portlet.EventDefinition#getName()
+ */
+ public String getName()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.pluto.om.portlet.EventDefinition#getQName()
+ */
+ public QName getQName()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.pluto.om.portlet.EventDefinition#getQualifiedName(java.lang.String)
+ */
+ public QName getQualifiedName(String defaultNamespace)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.pluto.om.portlet.EventDefinition#getValueType()
+ */
+ public String getValueType()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.pluto.om.portlet.EventDefinition#setValueType(java.lang.String)
+ */
+ public void setValueType(String valueType)
+ {
+ // TODO Auto-generated method stub
+ }
+}
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/EventDefinitionImpl.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/EventDefinitionImpl.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/EventDefinitionImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/EventDefinitionReferenceImpl.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/EventDefinitionReferenceImpl.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/EventDefinitionReferenceImpl.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/EventDefinitionReferenceImpl.java Sun Oct 26 20:15:51 2008
@@ -0,0 +1,58 @@
+/*
+ * 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 javax.xml.namespace.QName;
+
+import org.apache.jetspeed.om.portlet.EventDefinitionReference;
+
+/**
+ * @version $Id$
+ *
+ */
+public class EventDefinitionReferenceImpl implements EventDefinitionReference, Serializable
+{
+ /* (non-Javadoc)
+ * @see org.apache.pluto.om.portlet.EventDefinitionReference#getName()
+ */
+ public String getName()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.pluto.om.portlet.EventDefinitionReference#getQName()
+ */
+ public QName getQName()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.pluto.om.portlet.EventDefinitionReference#getQualifiedName(java.lang.String)
+ */
+ public QName getQualifiedName(String defaultNamespace)
+ {
+ // 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/EventDefinitionReferenceImpl.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/EventDefinitionReferenceImpl.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/EventDefinitionReferenceImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/FilterImpl.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/FilterImpl.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/FilterImpl.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/FilterImpl.java Sun Oct 26 20:15:51 2008
@@ -0,0 +1,158 @@
+/*
+ * 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.DisplayName;
+import org.apache.jetspeed.om.portlet.Filter;
+import org.apache.jetspeed.om.portlet.InitParam;
+
+/**
+ * @version $Id$
+ *
+ */
+public class FilterImpl implements Filter, Serializable
+{
+ /* (non-Javadoc)
+ * @see org.apache.jetspeed.om.portlet.Filter#addDescription(java.lang.String)
+ */
+ public Description addDescription(String lang)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jetspeed.om.portlet.Filter#addDisplayName(java.lang.String)
+ */
+ public DisplayName addDisplayName(String lang)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jetspeed.om.portlet.Filter#addInitParam(java.lang.String)
+ */
+ public InitParam addInitParam(String paramName)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jetspeed.om.portlet.Filter#getDescription(java.util.Locale)
+ */
+ public Description getDescription(Locale locale)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jetspeed.om.portlet.Filter#getDescriptions()
+ */
+ public List<Description> getDescriptions()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jetspeed.om.portlet.Filter#getDisplayName(java.util.Locale)
+ */
+ public DisplayName getDisplayName(Locale locale)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jetspeed.om.portlet.Filter#getDisplayNames()
+ */
+ public List<DisplayName> getDisplayNames()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jetspeed.om.portlet.Filter#getInitParam(java.lang.String)
+ */
+ public InitParam getInitParam(String paramName)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jetspeed.om.portlet.Filter#getInitParams()
+ */
+ public List<InitParam> getInitParams()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.pluto.om.portlet.Filter#addLifecycle(java.lang.String)
+ */
+ public void addLifecycle(String lifecycle)
+ {
+ // TODO Auto-generated method stub
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.pluto.om.portlet.Filter#getFilterClass()
+ */
+ public String getFilterClass()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.pluto.om.portlet.Filter#getFilterName()
+ */
+ public String getFilterName()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.pluto.om.portlet.Filter#getLifecycles()
+ */
+ public List<String> getLifecycles()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.pluto.om.portlet.Filter#setFilterClass(java.lang.String)
+ */
+ public void setFilterClass(String filterClass)
+ {
+ // TODO Auto-generated method stub
+ }
+}
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/FilterImpl.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/FilterImpl.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/FilterImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/FilterMappingImpl.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/FilterMappingImpl.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/FilterMappingImpl.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/FilterMappingImpl.java Sun Oct 26 20:15:51 2008
@@ -0,0 +1,56 @@
+/*
+ * 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 org.apache.jetspeed.om.portlet.FilterMapping;
+
+/**
+ * @version $Id$
+ *
+ */
+public class FilterMappingImpl implements FilterMapping, Serializable
+{
+ /* (non-Javadoc)
+ * @see org.apache.pluto.om.portlet.FilterMapping#addPortletName(java.lang.String)
+ */
+ public void addPortletName(String portletName)
+ {
+ // TODO Auto-generated method stub
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.pluto.om.portlet.FilterMapping#getFilterName()
+ */
+ public String getFilterName()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.pluto.om.portlet.FilterMapping#getPortletNames()
+ */
+ public List<String> getPortletNames()
+ {
+ // 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/FilterMappingImpl.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/FilterMappingImpl.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/FilterMappingImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/GenericMetadataImpl.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/GenericMetadataImpl.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/GenericMetadataImpl.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/GenericMetadataImpl.java&p1=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/GenericMetadataImpl.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/GenericMetadataImpl.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/GenericMetadataImpl.java Sun Oct 26 20:15:51 2008
@@ -14,7 +14,7 @@
* 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 java.util.ArrayList;
import java.util.Collection;
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/GenericMetadataImpl.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.1
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/GenericMetadataImpl.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/GenericMetadataImpl.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/InitParamImpl.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/ParameterImpl.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/InitParamImpl.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/InitParamImpl.java&p1=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/ParameterImpl.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/ParameterImpl.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/InitParamImpl.java Sun Oct 26 20:15:51 2008
@@ -15,202 +15,97 @@
* limitations under the License.
*/
-package org.apache.jetspeed.om.impl;
+package org.apache.jetspeed.om.portlet.impl;
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Collection;
+import java.util.List;
import java.util.Locale;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.om.portlet.Description;
import org.apache.jetspeed.om.portlet.InitParam;
import org.apache.jetspeed.util.HashCodeBuilder;
-import org.apache.jetspeed.util.JetspeedLocale;
-import org.apache.pluto.om.portlet.Description;
-import org.apache.pluto.om.portlet.DescriptionSet;
/**
* @author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
*/
-public class ParameterImpl implements InitParam, Serializable
+public class InitParamImpl implements InitParam, Serializable
{
private String name;
private String value;
- private String description;
+ protected List<Description> descriptions;
- protected long parameterId;
-
- protected long parentId;
-
- private Collection descriptions;
- private DescriptionSetImpl descCollWrapper = new DescriptionSetImpl(DescriptionImpl.TYPE_PARAMETER);
-
- private static final Log log = LogFactory.getLog(ParameterImpl.class);
-
- /**
- * @see org.apache.pluto.om.common.Parameter#getPortletName()
- */
- public String getName()
+ public String getParamName()
{
return name;
}
- /**
- * @see org.apache.pluto.om.common.Parameter#getValue()
- */
- public String getValue()
+ public String getParamValue()
{
return value;
}
- /**
- * @see org.apache.pluto.om.common.ParameterCtrl#setPortletName(java.lang.String)
- */
- public void setName(String name)
+ public void setParamName(String name)
{
this.name = name;
-
}
- /**
- * @see org.apache.pluto.om.common.ParameterCtrl#setValue(java.lang.String)
- */
- public void setValue(String value)
+ public void setParamValue(String value)
{
this.value = value;
-
}
- /**
- * @see java.lang.Object#equals(java.lang.Object)
- */
public boolean equals(Object obj)
{
if (obj != null && obj.getClass().equals(getClass()))
{
- ParameterImpl p = (ParameterImpl) obj;
- boolean sameParent = (p.parentId == parentId);
- boolean sameName = (name != null && p.getName() != null && name.equals(p.getName()));
- return sameParent && sameName;
+ InitParamImpl p = (InitParamImpl) obj;
+ return (name != null && p.getParamName() != null && name.equals(p.getParamName()));
}
return false;
}
- /**
- * @see java.lang.Object#hashCode()
- */
public int hashCode()
{
HashCodeBuilder hash = new HashCodeBuilder(17, 77);
return hash.append(name).toHashCode();
}
- /**
- * @see org.apache.pluto.om.common.Parameter#getDescription(java.util.Locale)
- */
- public Description getDescription(Locale arg0)
+ public Description getDescription(Locale locale)
{
- if (descriptions != null)
+ for (Description d : getDescriptions())
{
- return new DescriptionSetImpl(descriptions).get(arg0);
+ if (d.getLocale().equals(locale))
+ {
+ return d;
+ }
}
return null;
-
}
-
- /**
- * @see org.apache.pluto.om.common.ParameterCtrl#setDescriptionSet(org.apache.pluto.om.common.DescriptionSet)
- */
- public void setDescriptionSet(DescriptionSet arg0)
- {
- this.descriptions = ((DescriptionSetImpl) arg0).getInnerCollection();
- }
-
- /**
- * @see org.apache.jetspeed.om.portlet.InitParam#addDescription(java.util.Locale, java.lang.String)
- */
- public void addDescription(Locale locale, String desc)
- {
- if (descriptions == null)
- {
- descriptions = new ArrayList();
- }
- descCollWrapper.setInnerCollection(descriptions);
- try
- {
- Description descObj = new ParameterDescriptionImpl();
-
- descObj.setLocale(locale);
- descObj.setDescription(desc);
- descCollWrapper.addDescription(descObj);
- }
- catch (Exception e)
- {
- String msg = "Unable to instantiate Description implementor, " + e.toString();
- log.error(msg, e);
- throw new IllegalStateException(msg);
- }
-
- }
-
- public void addDescription(Description desc)
+
+ public List<Description> getDescriptions()
{
if (descriptions == null)
{
- descriptions = new ArrayList();
+ descriptions = new ArrayList<Description>();
}
-
- descCollWrapper.setInnerCollection(descriptions);
- descCollWrapper.addDescription(desc);
+ return descriptions;
}
-
- /**
- * Remove when Castor is mapped correctly
- *
- * @deprecated
- * @param desc
- */
- public void setDescription(String desc)
- {
-// System.out.println("Setting description..." + desc);
- addDescription(JetspeedLocale.getDefaultLocale(), desc);
-// System.out.println("Description Set " + desc);
- }
-
- /**
- * Remove when Castor is mapped correctly
- * @deprecated
- * @return
- */
- public String getDescription()
+
+ public Description addDescription(String lang)
{
-
- Description desc = getDescription(JetspeedLocale.getDefaultLocale());
-
- if (desc != null)
+ DescriptionImpl d = new DescriptionImpl();
+ d.setLang(lang);
+ if (getDescription(d.getLocale()) != null)
{
- return desc.getDescription();
+ throw new IllegalArgumentException("Description for language: "+d.getLocale()+" already defined");
}
-
- return null;
+ getDescriptions();
+ descriptions.add(d);
+ return d;
}
-
- /**
- * @see org.apache.jetspeed.om.common.InitParam#getDescriptionSet()
- */
- public DescriptionSet getDescriptionSet()
- {
- if (descriptions != null)
- {
- descCollWrapper.setInnerCollection(descriptions);
- }
- return descCollWrapper;
- }
-
}
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/InitParamImpl.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/InitParamImpl.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/InitParamImpl.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/JetspeedServiceReferenceImpl.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/JetspeedServiceReferenceImpl.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/JetspeedServiceReferenceImpl.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/JetspeedServiceReferenceImpl.java&p1=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/JetspeedServiceReferenceImpl.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/JetspeedServiceReferenceImpl.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/JetspeedServiceReferenceImpl.java Sun Oct 26 20:15:51 2008
@@ -14,7 +14,7 @@
* 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.portlet.JetspeedServiceReference;
@@ -26,8 +26,6 @@
public class JetspeedServiceReferenceImpl implements JetspeedServiceReference
{
private String name;
- private long appId;
- private long id;
public JetspeedServiceReferenceImpl()
{
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/JetspeedServiceReferenceImpl.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.1
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/JetspeedServiceReferenceImpl.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/JetspeedServiceReferenceImpl.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/LanguageImpl.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/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/portlet/impl/LanguageImpl.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/LanguageImpl.java&p1=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/impl/LanguageImpl.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/LanguageImpl.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/LanguageImpl.java Sun Oct 26 20:15:51 2008
@@ -14,248 +14,107 @@
* 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 java.io.Serializable;
import java.util.ArrayList;
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;
-import java.util.Set;
import java.util.StringTokenizer;
-import org.apache.commons.lang.StringUtils;
import org.apache.jetspeed.om.portlet.Language;
import org.apache.jetspeed.util.HashCodeBuilder;
-import org.apache.jetspeed.util.JetspeedLocale;
/**
*
* LanguageImpl <br>
* Okay, base Language really has nothing to really do at all with language per
* se. It actually represents the locallized <code>title</code> and
- * <code>short-title</code> attributes of a portlet's definition. It also
- * contains a resource bundle for the specifc locale. <br>
- * TODO: org.apache.pluto.om.common.Language should be seperated into TODO a
- * Language class that just contains the resource bundle and TODO a Title class
- * that contains a localized title and short title.
+ * <code>short-title</code> attributes of a portlet's definition.
*
* @author <a href="mailto:weaver@apache.org">Scott T. Weaver </a>
* @author <a href="mailto:ate@douma.nu">Ate Douma</a>
* @version $Id$
*
*/
-public class LanguageImpl extends ResourceBundle implements Language, Serializable
+public class LanguageImpl 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<String> keys;
private String title;
private String shortTitle;
private Locale locale;
- private String keywordStr;
- private List<String> keywords;
-
- /**
- * This field can be used by persistence tools for storing PK info Otherwise
- * it has no effect on the functioning of the portal.
- */
- protected long id;
-
- protected long portletId;
+ private String keywords;
+ private transient List<String> keywordList;
public LanguageImpl()
{
- 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<String> getKeys()
- {
- return Collections.enumeration(keys);
- }
-
- protected Object handleGetObject(String key)
- {
- if (key.equals(JAVAX_PORTLET_TITLE))
- {
- return getTitle();
- }
- else if (key.equals(JAVAX_PORTLET_SHORT_TITLE))
- {
- return getShortTitle();
- }
- else if (key.equals(JAVAX_PORTLET_KEYWORDS))
- {
- return getKeywords();
- }
- return null;
- }
-
- private String getStringValue(ResourceBundle bundle, String key, String defaultValue)
- {
- String value = defaultValue;
- try
- {
- value = (String)bundle.getObject(key);
- }
- catch (MissingResourceException mre)
- {
- }
- catch (ClassCastException cce)
- {
- }
- return value;
- }
-
- public void setResourceBundle(ResourceBundle bundle)
- {
- if ( parent == null && bundle != null )
- {
- Enumeration<String> parentKeys = bundle.getKeys();
- while ( parentKeys.hasMoreElements() )
- {
- keys.add(parentKeys.nextElement());
- }
- setParent(bundle);
- }
- }
-
- public void loadDefaults()
- {
- ResourceBundle bundle = getParentResourceBundle();
- if ( bundle != null )
- {
- setTitle(getStringValue(bundle, JAVAX_PORTLET_TITLE, getTitle()));
- setShortTitle(getStringValue(bundle, JAVAX_PORTLET_SHORT_TITLE, getShortTitle()));
- setKeywords(getStringValue(bundle, JAVAX_PORTLET_KEYWORDS, getKeywords()));
- }
}
-
- /**
- * @see org.apache.pluto.om.common.Language#getLocale()
- */
+
public Locale getLocale()
{
return locale;
}
- /**
- * @see org.apache.pluto.om.common.Language#getTitle()
- */
public String getTitle()
{
return title;
}
- /**
- * @see org.apache.pluto.om.common.Language#getShortTitle()
- */
public String getShortTitle()
{
return shortTitle;
}
- /**
- * @see org.apache.pluto.om.common.Language#getKeywords()
- */
@SuppressWarnings("unchecked")
- public Iterator<String> getKeywordsIterator()
+ public List<String> getKeywordList()
{
- if ( keywords == null )
+ if ( keywordList == null )
{
- return Collections.EMPTY_LIST.iterator();
+ if (keywords != null)
+ {
+ keywordList = new ArrayList<String>();
+ StringTokenizer tok = new StringTokenizer(keywords, ", \t");
+ while (tok.hasMoreTokens())
+ {
+ keywordList.add(tok.nextToken());
+ }
+ keywordList = Collections.unmodifiableList(keywordList);
+
+ }
+ else
+ {
+ keywordList = Collections.emptyList();
+ }
}
- return keywords.iterator();
+ return keywordList;
}
- /**
- * @see org.apache.pluto.om.common.Language#getResourceBundle()
- */
- public ResourceBundle getResourceBundle()
- {
-
- return this;
- }
-
- public ResourceBundle getParentResourceBundle()
- {
- return parent;
- }
-
- /**
- * @see org.apache.pluto.om.common.LanguageCtrl#setLocale(java.util.Locale)
- */
public void setLocale( Locale locale )
{
this.locale = locale;
}
- /**
- * @see org.apache.pluto.om.common.LanguageCtrl#setTitle(java.lang.String)
- */
public void setTitle( String title )
{
this.title = title;
}
- /**
- * @see org.apache.pluto.om.common.LanguageCtrl#setShortTitle(java.lang.String)
- */
public void setShortTitle( String shortTitle )
{
this.shortTitle = shortTitle;
}
- /**
- * @see org.apache.jetspeed.om.common.LanguageComposite#setKeywords(java.util.Collection)
- */
- public void setKeywords( List<String> keywords )
- {
- this.keywords = new ArrayList<String>(keywords);
- }
-
- public void setKeywords(String keywordStr)
+ public void setKeywords( String keywords )
{
- if (keywords == null)
- {
- keywords = new ArrayList<String>();
- }
- else
- {
- keywords.clear();
- }
- if ( keywordStr == null )
- {
- keywordStr = "";
- }
- StringTokenizer tok = new StringTokenizer(keywordStr, ",");
- while (tok.hasMoreTokens())
- {
- keywords.add(tok.nextToken());
- }
- this.keywordStr = keywordStr;
+ this.keywords = keywords;
+ this.keywordList = null;
}
public String getKeywords()
{
- if ( keywordStr == null )
- {
- keywordStr = StringUtils.join(getKeywordsIterator(),",");
- }
- return keywordStr;
+ return keywords;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org