Return-Path: Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org Received: (qmail 71830 invoked from network); 8 Dec 2009 11:57:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 8 Dec 2009 11:57:48 -0000 Received: (qmail 34827 invoked by uid 500); 8 Dec 2009 11:57:46 -0000 Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org Received: (qmail 34044 invoked by uid 500); 8 Dec 2009 11:57:45 -0000 Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@portals.apache.org Received: (qmail 33857 invoked by uid 99); 8 Dec 2009 11:57:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Dec 2009 11:57:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Dec 2009 11:57:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 241F12388893; Tue, 8 Dec 2009 11:57:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r888350 - in /portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services: beans/ rest/ Date: Tue, 08 Dec 2009 11:57:19 -0000 To: jetspeed-dev@portals.apache.org From: woonsan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091208115720.241F12388893@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: woonsan Date: Tue Dec 8 11:57:19 2009 New Revision: 888350 URL: http://svn.apache.org/viewvc?rev=888350&view=rev Log: JS2-1087: To keep consitency between xml and json marshalings Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java?rev=888350&r1=888349&r2=888350&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/BeanCollection.java Tue Dec 8 11:57:19 2009 @@ -17,11 +17,7 @@ package org.apache.jetspeed.services.beans; import java.io.Serializable; -import java.util.Collection; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlRootElement; /** @@ -29,13 +25,11 @@ * * @version $Id$ */ -@XmlRootElement(name="collection") -public class BeanCollection implements Serializable +@XmlRootElement(name="data") +public class BeanCollection implements Serializable { private static final long serialVersionUID = 1L; - private Collection collection; - private int totalSize = -1; private int beginIndex = -1; @@ -45,28 +39,6 @@ } - protected Collection getCollection() - { - return collection; - } - - protected void setCollection(Collection collection) - { - this.collection = collection; - } - - @XmlAttribute(name="size") - public int getSize() - { - return (collection != null ? collection.size() : 0); - } - - public void setSize() - { - - } - - @XmlAttribute(name="totalSize") public int getTotalSize() { return totalSize; @@ -77,7 +49,6 @@ this.totalSize = totalSize; } - @XmlAttribute(name="beginIndex") public int getBeginIndex() { return beginIndex; Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java?rev=888350&r1=888349&r2=888350&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletApplicationBeanCollection.java Tue Dec 8 11:57:19 2009 @@ -19,6 +19,7 @@ import java.util.Collection; import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlRootElement; @@ -27,25 +28,27 @@ * * @version $Id$ */ -@XmlRootElement(name="applications") -public class PortletApplicationBeanCollection extends BeanCollection +@XmlRootElement(name="data") +public class PortletApplicationBeanCollection extends BeanCollection { private static final long serialVersionUID = 1L; + private Collection applicationBeans; + public PortletApplicationBeanCollection() { super(); } - @Override + @XmlElementWrapper(name="applications") @XmlElements(@XmlElement(name="application")) - public Collection getCollection() + public Collection getApplications() { - return super.getCollection(); + return applicationBeans; } - public void setPortletApplicationBeans(Collection collection) + public void setApplications(Collection applicationBeans) { - super.setCollection(collection); + this.applicationBeans = applicationBeans; } } Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java?rev=888350&r1=888349&r2=888350&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/PortletDefinitionBeanCollection.java Tue Dec 8 11:57:19 2009 @@ -19,6 +19,7 @@ import java.util.Collection; import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlRootElement; @@ -27,26 +28,28 @@ * * @version $Id$ */ -@XmlRootElement(name="definitions") -public class PortletDefinitionBeanCollection extends BeanCollection +@XmlRootElement(name="data") +public class PortletDefinitionBeanCollection extends BeanCollection { private static final long serialVersionUID = 1L; + private Collection definitionBeans; + public PortletDefinitionBeanCollection() { super(); } - @Override + @XmlElementWrapper(name="definitions") @XmlElements(@XmlElement(name="definition")) - public Collection getCollection() + public Collection getDefinitions() { - return super.getCollection(); + return definitionBeans; } - public void setPortletApplicationBeans(Collection collection) + public void setDefinitions(Collection definitionBeans) { - super.setCollection(collection); + this.definitionBeans = definitionBeans; } } Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java?rev=888350&r1=888349&r2=888350&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/rest/PortletRegistryService.java Tue Dec 8 11:57:19 2009 @@ -155,7 +155,7 @@ } } - paBeans.setPortletApplicationBeans(paBeanList); + paBeans.setApplications(paBeanList); return paBeans; } @@ -270,7 +270,7 @@ } } - pdBeans.setPortletApplicationBeans(pdBeanList); + pdBeans.setDefinitions(pdBeanList); return pdBeans; } --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org For additional commands, e-mail: jetspeed-dev-help@portals.apache.org