portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cdore...@apache.org
Subject svn commit: r568061 - in /portals/pluto/branches/1.1-286-trunk-merge: pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/ pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/
Date Tue, 21 Aug 2007 11:09:38 GMT
Author: cdoremus
Date: Tue Aug 21 04:09:29 2007
New Revision: 568061

URL: http://svn.apache.org/viewvc?rev=568061&view=rev
Log:
Applied  jaxb_public_render_add_qname_name_and_alias.190807.patch from PLUTO-271.

Modified:
    portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/EventDefinitionDD.java
    portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PublicRenderParamDD.java
    portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/EventDefinitionDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/EventDefinitionDD.java?rev=568061&r1=568060&r2=568061&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/EventDefinitionDD.java
(original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/EventDefinitionDD.java
Tue Aug 21 04:09:29 2007
@@ -82,8 +82,8 @@
 	 * 		<element name="name" type="string"/>
 	 * </choice>
 	 */
-	private QName qname;	
 	private String name;
+	private QName qname;	
 	
 	/**
 	 * Java-Type of the Event

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PublicRenderParamDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PublicRenderParamDD.java?rev=568061&r1=568060&r2=568061&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PublicRenderParamDD.java
(original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PublicRenderParamDD.java
Tue Aug 21 04:09:29 2007
@@ -17,8 +17,11 @@
  */
 package org.apache.pluto.descriptors.portlet;
 
+import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
 
@@ -52,7 +55,10 @@
  * 		<sequence>
  *			<element name="description" type="portlet:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
  *			<element name="identifier" type="string"/>
- *			<element name="name" type="xs:QName" maxOccurs="unbounded"/>
+ *			<choice>
+ *				<element name="qname" type="xs:QName"/>
+ *				<element name="name" type="string"/>
+ *			</choice>
  *		</sequence>
  *		<attribute name="id" type="string" use="optional"/>
  *	</complexType>
@@ -64,7 +70,8 @@
 @XmlType(name = "public-render-parameterType", propOrder = {
     "description",
     "identifier",
-    "name"
+    "name","qname",
+    "alias"
 })
 
 public class PublicRenderParamDD {
@@ -80,9 +87,16 @@
 	private String identifier;
 	
 	/**
-	 * Name of the public render Parameter
+	 * Name of the public render parameter
+	 */
+	private QName qname;		
+	private String name;
+	
+	/**
+	 * Alias names of the public render parameter
 	 */
-	private QName name;		
+	@XmlElement ( name = "alias")
+	private List<QName> alias;
 
 	/**
 	 * @return the description
@@ -116,14 +130,28 @@
 	 * @return the name
 	 */
 	public QName getName() {
-		return name;
+		return (qname==null) ? new QName(name) : qname; 
 	}
 
 	/**
 	 * @param name The name to set
 	 */
-	public void setName(QName name) {
-		this.name = name;
+	public void setName(QName qname) {
+		this.qname = qname;
+	}
+	
+	/**
+	 * @return Returns the alias.
+	 */
+	public List<QName> getAlias() {
+		return alias;
+	}
+
+	/**
+	 * @param alias The alias to set.
+	 */
+	public void setAlias(List<QName> alias) {
+		this.alias = alias;
 	}
 
 }

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java?rev=568061&r1=568060&r2=568061&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java
(original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java
Tue Aug 21 04:09:29 2007
@@ -160,7 +160,12 @@
 			  "<public-render-parameter id=\"public1\">\n" +
 			    "<description xml:lang=\"de\">description</description>\n" +
 			    "<identifier>identifier</identifier>\n" +
-			    "<name>QName</name>\n" +
+			    "<qname>QName</qname>\n" +
+			  "</public-render-parameter>\n" +
+			  "<public-render-parameter id=\"public2\">\n" +
+			    "<description xml:lang=\"de\">description2</description>\n" +
+			    "<identifier>identifier2</identifier>\n" +
+			    "<name>Name</name>\n" +
 			  "</public-render-parameter>\n" +
 			  "" );
 		xmlEnd.append("" +



Mime
View raw message