You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by cd...@apache.org on 2007/08/15 14:40:48 UTC
svn commit: r566123 - in
/portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common:
InitParamDD.java SecurityRoleRefDD.java
Author: cdoremus
Date: Wed Aug 15 05:40:47 2007
New Revision: 566123
URL: http://svn.apache.org/viewvc?view=rev&rev=566123
Log:
Added descriptions List (including setter/getter) to conform with Castor mapping file.
Modified:
portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/InitParamDD.java
portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/SecurityRoleRefDD.java
Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/InitParamDD.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/common/InitParamDD.java?view=diff&rev=566123&r1=566122&r2=566123
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/InitParamDD.java (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/InitParamDD.java Wed Aug 15 05:40:47 2007
@@ -20,6 +20,8 @@
*/
package org.apache.pluto.descriptors.common;
+import java.util.List;
+
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
@@ -64,7 +66,8 @@
@XmlType(name = "init-paramType", propOrder = {
"description", "description1",
"paramName", "paramName1",
- "paramValue", "paramValue1"
+ "paramValue", "paramValue1",
+ "descriptions", "descriptions1"
})
public class InitParamDD {
@@ -76,7 +79,15 @@
@XmlElement(name = "description", namespace = PortletDD.QNAME_JSR168)
private String description1;
- /** The name of the parameter. */
+ /** The description list. */
+ @XmlElement(name = "descriptions")
+ private List<String> descriptions;
+
+ /** The description list. */
+ @XmlElement(name = "descriptions", namespace = PortletDD.QNAME_JSR168)
+ private List descriptions1;
+
+ /** The name of the parameter. */
@XmlElement(name = "name")
private String paramName;
@@ -158,5 +169,23 @@
this.description1 = description;
}
+ /**
+ * Retrieve the description list.
+ * @return
+ */
+ public List getDescriptions() {
+ if (descriptions != null)
+ return descriptions;
+ return descriptions1;
+ }
+
+ /**
+ * Set the description list.
+ * @param description
+ */
+ public void setDescriptions(List<String> descriptions) {
+ this.descriptions = descriptions;
+ this.descriptions1 = descriptions;
+ }
}
Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/SecurityRoleRefDD.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/common/SecurityRoleRefDD.java?view=diff&rev=566123&r1=566122&r2=566123
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/SecurityRoleRefDD.java (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/SecurityRoleRefDD.java Wed Aug 15 05:40:47 2007
@@ -16,6 +16,8 @@
*/
package org.apache.pluto.descriptors.common;
+import java.util.List;
+
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
@@ -68,7 +70,8 @@
@XmlType(name = "security-role-refType", propOrder = {
"description","description1",
"roleName","roleName1",
- "roleLink","roleLink1"
+ "roleLink","roleLink1",
+ "descriptions", "descriptions1"
})
public class SecurityRoleRefDD {
@@ -81,6 +84,14 @@
@XmlElement( name = "description", namespace = PortletDD.QNAME_JSR168)
private String description1;
+ /** The description list. */
+ @XmlElement(name = "descriptions")
+ private List<String> descriptions;
+
+ /** The description list. */
+ @XmlElement(name = "descriptions", namespace = PortletDD.QNAME_JSR168)
+ private List descriptions1;
+
/** The name of the role reference. */
@XmlElement( name = "role-name")
private String roleName;
@@ -159,6 +170,25 @@
public void setDescription(String description) {
this.description = description;
this.description1 = description;
+ }
+
+ /**
+ * Retrieve the description list.
+ * @return
+ */
+ public List getDescriptions() {
+ if (descriptions != null)
+ return descriptions;
+ return descriptions1;
+ }
+
+ /**
+ * Set the description list.
+ * @param description
+ */
+ public void setDescriptions(List<String> descriptions) {
+ this.descriptions = descriptions;
+ this.descriptions1 = descriptions;
}
}