[portal-commits] JBoss Portal SVN: r12960 - in modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata: portal/object and 2 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Fri Mar 6 11:37:07 EST 2009
Author: mwringe
Date: 2009-03-06 11:37:06 -0500 (Fri, 06 Mar 2009)
New Revision: 12960
Removed:
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/DisplayNameMetaData.java
Modified:
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/AjaxMetaData.java
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/HeaderContentMetaData.java
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/JBossPortletAppMetaData.java
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/JBossPortletMetaData.java
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/SessionConfigMetaData.java
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/AliasBindingMetaData.java
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/BindingsMetaData.java
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/CommonPortalObject.java
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ContentMetaData.java
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ContextMetaData.java
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/EventWiringMetaData.java
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ModeMetaData.java
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PageMetaData.java
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ParameterBindingMetaData.java
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PortalMetaData.java
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PortalObjectDeploymentMetaData.java
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/WindowCoordinationMetaData.java
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/WindowMetaData.java
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/filter/FilterMetaData.java
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/InstanceMetaData.java
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PolicyPermissionMetaData.java
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PortletDeploymentInstanceMetaData.java
modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PortletPreferencesMetaData.java
Log:
Fixes to some method names to function correctly with the microcontainer.
Remove broken DisplayNameMetaData class and use LocalizedDescriptionMetaData instead.
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/AjaxMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/AjaxMetaData.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/AjaxMetaData.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -35,7 +35,7 @@
protected Boolean partialRefresh;
@XmlElement(name = "partial-refresh")
- public void setPartialRefresh (Boolean partialRefresh)
+ public void setPartialRefresh (boolean partialRefresh)
{
this.partialRefresh = partialRefresh;
}
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/HeaderContentMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/HeaderContentMetaData.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/HeaderContentMetaData.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -39,19 +39,19 @@
protected List<MetaMetaData> metas;
@XmlElement (name = "link")
- public void setLink (List<LinkMetaData> links)
+ public void setLinks (List<LinkMetaData> links)
{
this.links = links;
}
@XmlElement (name="script")
- public void setScript (List<ScriptMetaData> scripts)
+ public void setScripts (List<ScriptMetaData> scripts)
{
this.scripts = scripts;
}
@XmlElement (name="meta")
- public void setMeta (List<MetaMetaData> metas)
+ public void setMetas (List<MetaMetaData> metas)
{
this.metas = metas;
}
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/JBossPortletAppMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/JBossPortletAppMetaData.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/JBossPortletAppMetaData.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -55,9 +55,9 @@
}
@XmlElement(name = "remotable")
- public void setRemotable(String remotable)
+ public void setRemotable(boolean remotable)
{
- this.remotable = Boolean.valueOf(remotable);
+ this.remotable = remotable;
}
@XmlElement(name = "portlet")
@@ -67,7 +67,7 @@
}
@XmlElement(name = "service")
- public void setService(List<ServiceMetaData> services)
+ public void setServices(List<ServiceMetaData> services)
{
this.services = services;
}
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/JBossPortletMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/JBossPortletMetaData.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/JBossPortletMetaData.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -47,9 +47,9 @@
}
@XmlElement (name = "remotable")
- public void setRemotable (String remotable)
+ public void setRemotable (boolean remotable)
{
- this.remotable = Boolean.valueOf(remotable);
+ this.remotable = remotable;
}
@XmlElement (name = "ajax")
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/SessionConfigMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/SessionConfigMetaData.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/SessionConfigMetaData.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -35,7 +35,7 @@
protected Boolean distributed;
@XmlElement (name = "distributed")
- public void setDistributed(Boolean distributed)
+ public void setDistributed(boolean distributed)
{
this.distributed = distributed;
}
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/AliasBindingMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/AliasBindingMetaData.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/AliasBindingMetaData.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -32,7 +32,7 @@
* @author <a href="mailto:mwringe at redhat.com">Matt Wringe</a>
* @version $Revision$
*/
-public class AliasBindingMetaData extends IdMetaDataImplWithDescriptionGroup
+public class AliasBindingMetaData
{
protected String id;
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/BindingsMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/BindingsMetaData.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/BindingsMetaData.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -48,13 +48,13 @@
}
@XmlElement(name = "parameter-binding")
- public void setParameterBinding(List<ParameterBindingMetaData> parameterBindings)
+ public void setParameterBindings(List<ParameterBindingMetaData> parameterBindings)
{
this.parameterBindings = parameterBindings;
}
@XmlElement(name = "alias-binding")
- public void setAliasBinding(List<AliasBindingMetaData> aliasBinding)
+ public void setAliasBindings(List<AliasBindingMetaData> aliasBinding)
{
this.aliasBindings = aliasBinding;
}
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/CommonPortalObject.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/CommonPortalObject.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/CommonPortalObject.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -28,7 +28,7 @@
import javax.xml.bind.annotation.XmlElement;
import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
-import org.jboss.portal.metadata.portlet.instances.DisplayNameMetaData;
+import org.jboss.portal.metadata.portlet.common.LocalizedDescriptionMetaData;
import org.jboss.portal.metadata.portlet.instances.SecurityConstraintMetaData;
/**
@@ -44,7 +44,7 @@
protected String resourceBundle;
protected List<Locale> supportedLocales;
protected SecurityConstraintMetaData securityConstraint;
- protected List<DisplayNameMetaData> displayNames;
+ protected List<LocalizedDescriptionMetaData> displayNames;
abstract public void setName(String name);
@@ -54,12 +54,12 @@
}
@XmlElement(name = "display-name")
- public void SetDisplayNames(List<DisplayNameMetaData> displayNames)
+ public void setDisplayNames(List<LocalizedDescriptionMetaData> displayNames)
{
this.displayNames = displayNames;
}
- public List<DisplayNameMetaData> getDisplayNames()
+ public List<LocalizedDescriptionMetaData> getDisplayNames()
{
return displayNames;
}
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ContentMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ContentMetaData.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ContentMetaData.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -49,12 +49,12 @@
this.uri = uri;
}
- public String getContextType()
+ public String getContentType()
{
return type;
}
- public String getContextUri()
+ public String getContentURI()
{
return uri;
}
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ContextMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ContextMetaData.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ContextMetaData.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -28,7 +28,6 @@
import javax.xml.bind.annotation.XmlElement;
import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
-import org.jboss.portal.metadata.portlet.instances.DisplayNameMetaData;
import org.jboss.portal.metadata.portlet.instances.SecurityConstraintMetaData;
/**
@@ -46,7 +45,7 @@
}
@XmlElement(name = "portal")
- public void setPortal(List<PortalMetaData> portals)
+ public void setPortals(List<PortalMetaData> portals)
{
this.portals = portals;
}
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/EventWiringMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/EventWiringMetaData.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/EventWiringMetaData.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -54,7 +54,7 @@
}
@XmlElement(name = "destinations")
- public void setDestination(List<WindowCoordinationMetaData> destination)
+ public void setDestinations(List<WindowCoordinationMetaData> destination)
{
this.destinations = destination;
}
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ModeMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ModeMetaData.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ModeMetaData.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -38,7 +38,7 @@
protected List<String> modes;
@XmlElement(name = "mode")
- public void setMode(List<String> mode)
+ public void setModes(List<String> mode)
{
this.modes = modes;
}
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PageMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PageMetaData.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PageMetaData.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -28,7 +28,6 @@
import javax.xml.bind.annotation.XmlElement;
import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
-import org.jboss.portal.metadata.portlet.instances.DisplayNameMetaData;
import org.jboss.portal.metadata.portlet.instances.SecurityConstraintMetaData;
/**
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ParameterBindingMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ParameterBindingMetaData.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/ParameterBindingMetaData.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -45,7 +45,7 @@
}
@XmlElement(name = "window-coordination")
- public void setWindowCoordintation(List<WindowCoordinationMetaData> windowCoordinations)
+ public void setWindowCoordination(List<WindowCoordinationMetaData> windowCoordinations)
{
this.windowCoordinations = windowCoordinations;
}
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PortalMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PortalMetaData.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PortalMetaData.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -28,7 +28,6 @@
import javax.xml.bind.annotation.XmlElement;
import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
-import org.jboss.portal.metadata.portlet.instances.DisplayNameMetaData;
import org.jboss.portal.metadata.portlet.instances.SecurityConstraintMetaData;
/**
@@ -53,7 +52,7 @@
}
@XmlElement(name = "supported-modes")
- public void setPortalModes(ModeMetaData modes)
+ public void setModes(ModeMetaData modes)
{
this.modes = modes;
}
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PortalObjectDeploymentMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PortalObjectDeploymentMetaData.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PortalObjectDeploymentMetaData.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -68,6 +68,11 @@
}
}
+ public String getIfExists()
+ {
+ return Boolean.toString(overwrite);
+ }
+
@XmlElement(name = "context")
public void setContext(ContextMetaData context)
{
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/WindowCoordinationMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/WindowCoordinationMetaData.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/WindowCoordinationMetaData.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -47,12 +47,6 @@
this.windowName = windowName;
}
- @XmlElement(name = "qname")
- public void setQName(String qName)
- {
- this.qName = qName;
- }
-
@XmlElement(name="qname")
public void setQNames(List<String> qNames)
{
@@ -63,15 +57,20 @@
{
return windowName;
}
-
+
public String getQName()
{
- return qName;
+ if (qNames != null && qNames.size()>1)
+ {
+ return qNames.get(0);
+ }
+ return null;
}
public List<String> getQNames()
{
return qNames;
}
+
}
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/WindowMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/WindowMetaData.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/WindowMetaData.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -28,7 +28,6 @@
import javax.xml.bind.annotation.XmlElement;
import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
-import org.jboss.portal.metadata.portlet.instances.DisplayNameMetaData;
/**
* @author <a href="mailto:mwringe at redhat.com">Matt Wringe</a>
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/filter/FilterMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/filter/FilterMetaData.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/filter/FilterMetaData.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -31,6 +31,7 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.jboss.portal.metadata.portlet.PortletMetaDataConstants;
+import org.jboss.portal.metadata.portlet.adapter.LifeCycleStringAdapter;
import org.jboss.portal.metadata.portlet.common.DescribableMetaData;
import org.jboss.portal.metadata.portlet.common.InitParamMetaData;
import org.jboss.portal.metadata.portlet.common.LocalizedDescriptionMetaData;
@@ -84,6 +85,7 @@
}
@XmlElement(name = "lifecycle", required = true)
+ @XmlJavaTypeAdapter(LifeCycleStringAdapter.class)
public List<String> getLifecycle()
{
return lifecycle;
Deleted: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/DisplayNameMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/DisplayNameMetaData.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/DisplayNameMetaData.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -1,63 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.metadata.portlet.instances;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-
-import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
-
-/**
- * @author <a href="mailto:mwringe at redhat.com">Matt Wringe</a>
- * @version $Revision$
- */
-public class DisplayNameMetaData extends IdMetaDataImplWithDescriptionGroup
-{
-
- protected String lang;
-
- protected String displayName;
-
- @XmlAttribute(name = "xml:lang")
- public void setLang(String lang)
- {
- this.lang = lang;
- }
-
- @XmlElement(name = "display-name")
- public void setDisplayName(String displayName)
- {
- this.displayName = displayName;
- }
-
- public String getLang()
- {
- return lang;
- }
-
- public String getDisplayName()
- {
- return displayName;
- }
-
-}
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/InstanceMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/InstanceMetaData.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/InstanceMetaData.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -27,6 +27,7 @@
import javax.xml.bind.annotation.XmlElement;
import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
+import org.jboss.portal.metadata.portlet.common.LocalizedDescriptionMetaData;
/**
* @author <a href="mailto:mwringe at redhat.com">Matt Wringe</a>
@@ -39,7 +40,7 @@
protected String portletRef;
- protected List<DisplayNameMetaData> displayNames;
+ protected List<LocalizedDescriptionMetaData> displayNames;
protected PortletPreferencesMetaData portletPreferences;
@@ -58,13 +59,13 @@
}
@XmlElement(name = "display-name")
- public void setDisplayName(List<DisplayNameMetaData> displayNames)
+ public void setDisplayNames(List<LocalizedDescriptionMetaData> displayNames)
{
this.displayNames = displayNames;
}
@XmlElement(name = "perferences")
- public void setPreferences(PortletPreferencesMetaData preferences)
+ public void setPortletPreferences(PortletPreferencesMetaData preferences)
{
this.portletPreferences = preferences;
}
@@ -85,7 +86,7 @@
return portletRef;
}
- public List<DisplayNameMetaData> getDisplayNames()
+ public List<LocalizedDescriptionMetaData> getDisplayNames()
{
return displayNames;
}
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PolicyPermissionMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PolicyPermissionMetaData.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PolicyPermissionMetaData.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -75,16 +75,4 @@
return unchecked;
}
-// public boolean isUnchecked()
-// {
-// if (unchecked == null)
-// {
-// return false;
-// }
-// else
-// {
-// return true;
-// }
-// }
-
}
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PortletDeploymentInstanceMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PortletDeploymentInstanceMetaData.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PortletDeploymentInstanceMetaData.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -61,6 +61,11 @@
}
}
+ public String getIfExists()
+ {
+ return Boolean.toString(overwrite);
+ }
+
public boolean getOverwrite()
{
return this.overwrite;
Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PortletPreferencesMetaData.java
===================================================================
--- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PortletPreferencesMetaData.java 2009-03-06 16:32:40 UTC (rev 12959)
+++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portlet/instances/PortletPreferencesMetaData.java 2009-03-06 16:37:06 UTC (rev 12960)
@@ -38,7 +38,7 @@
protected List<PortletPreferenceMetaData> preferences;
@XmlElement(name = "preference")
- public void setPreference(List<PortletPreferenceMetaData> preferences)
+ public void setPreferences(List<PortletPreferenceMetaData> preferences)
{
this.preferences = preferences;
}
More information about the portal-commits
mailing list