Author: mwringe Date: 2009-03-16 18:17:49 -0400 (Mon, 16 Mar 2009) New Revision: 13038 Added: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/DestinationsMetaData.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/SourcesMetaData.java 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/portal/object/EventWiringMetaData.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/WindowCoordinationMetaData.java Log: Fix minor issues with the metadata classes. 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-16 14:23:44 UTC (rev 13037) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/jboss/portlet/JBossPortletMetaData.java 2009-03-16 22:17:49 UTC (rev 13038) @@ -76,6 +76,12 @@ this.portletInfo = portletInfo; } + @XmlElement (name = "session-config") + public void setSessionConfig (SessionConfigMetaData sessionConfig) + { + this.sessionConfig = sessionConfig; + } + public TransactionMetaData getTransaction() { return transaction; Added: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/DestinationsMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/DestinationsMetaData.java (rev 0) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/DestinationsMetaData.java 2009-03-16 22:17:49 UTC (rev 13038) @@ -0,0 +1,45 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, 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.portal.object; + +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; + +public class DestinationsMetaData +{ + + protected List<WindowCoordinationMetaData> windowCoordinations; + + @XmlElement(name = "window-coordination") + public void setWindowCoordination(List<WindowCoordinationMetaData> windowCoordinations) + { + this.windowCoordinations = windowCoordinations; + } + + public List<WindowCoordinationMetaData> getWindowCoordination() + { + return windowCoordinations; + } + +} 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-16 14:23:44 UTC (rev 13037) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/EventWiringMetaData.java 2009-03-16 22:17:49 UTC (rev 13038) @@ -37,9 +37,9 @@ protected String name; - protected List<WindowCoordinationMetaData> sources; + protected SourcesMetaData sources; - protected List<WindowCoordinationMetaData> destinations; + protected DestinationsMetaData destinations; @XmlElement(name = "name") public void setName(String name) @@ -48,13 +48,13 @@ } @XmlElement(name = "sources") - public void setSources(List<WindowCoordinationMetaData> sources) + public void setSources(SourcesMetaData sources) { this.sources = sources; } @XmlElement(name = "destinations") - public void setDestinations(List<WindowCoordinationMetaData> destination) + public void setDestinations(DestinationsMetaData destination) { this.destinations = destination; } @@ -64,12 +64,12 @@ return name; } - public List<WindowCoordinationMetaData> getSources() + public SourcesMetaData getSources() { return sources; } - public List<WindowCoordinationMetaData> getDestinations() + public DestinationsMetaData getDestinations() { return destinations; } 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-16 14:23:44 UTC (rev 13037) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PageMetaData.java 2009-03-16 22:17:49 UTC (rev 13038) @@ -70,7 +70,7 @@ this.windows = windows; } - @XmlElement(name = "coodination") + @XmlElement(name = "coordination") public void setCoordination(CoordinationMetaData coordination) { this.coordination = coordination; Added: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/SourcesMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/SourcesMetaData.java (rev 0) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/SourcesMetaData.java 2009-03-16 22:17:49 UTC (rev 13038) @@ -0,0 +1,45 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, 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.portal.object; + +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; + +public class SourcesMetaData +{ + + protected List<WindowCoordinationMetaData> windowCoordinations; + + @XmlElement(name = "window-coordination") + public void setWindowCoordination(List<WindowCoordinationMetaData> windowCoordinations) + { + this.windowCoordinations = windowCoordinations; + } + + public List<WindowCoordinationMetaData> getWindowCoordination() + { + return windowCoordinations; + } + +} 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-16 14:23:44 UTC (rev 13037) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/WindowCoordinationMetaData.java 2009-03-16 22:17:49 UTC (rev 13038) @@ -60,7 +60,7 @@ public String getQName() { - if (qNames != null && qNames.size()>1) + if (qNames != null && qNames.size()>=1) { return qNames.get(0); }