You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by dj...@apache.org on 2010/06/17 01:01:53 UTC
svn commit: r955422 [1/3] -
/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/
Author: djencks
Date: Wed Jun 16 23:01:52 2010
New Revision: 955422
URL: http://svn.apache.org/viewvc?rev=955422&view=rev
Log:
OPENEJB-1298 always use TextMap for (multiple) descriptions and display-name
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ActivationConfig.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/AuthConstraint.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/AuthenticationMechanism.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/CmpField.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/CmrField.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ConfigProperty.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ContainerConcurrency.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbLocalRef.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRef.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbReference.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRelation.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRelationshipRole.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnvEntry.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ExcludeList.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplicationResourceBundle.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAttribute.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesBehavior.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesComponent.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConverter.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFacet.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedBean.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedProperty.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesNavigationCase.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesNavigationRule.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesProperty.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesReferencedBean.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRenderKit.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRenderer.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesValidator.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Handler.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Interceptor.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/InterceptorBinding.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Interceptors.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/License.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Listener.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDestination.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDestinationRef.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Method.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodPermission.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodSchedule.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ParamValue.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceContextRef.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceUnitRef.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/RelationshipRoleSource.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Relationships.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/RequiredConfigProperty.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceEnvRef.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceRef.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/RunAs.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SecurityIdentity.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SecurityPermission.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SecurityRole.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SecurityRoleRef.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceRef.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/UserDataConstraint.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebResourceCollection.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Webservices.java
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ActivationConfig.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ActivationConfig.java?rev=955422&r1=955421&r2=955422&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ActivationConfig.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ActivationConfig.java Wed Jun 16 23:01:52 2010
@@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlAttr
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -31,13 +32,13 @@ import java.util.Properties;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "activation-configType", propOrder = {
- "description",
+ "descriptions",
"activationConfigProperty"
})
public class ActivationConfig {
- @XmlElement(required = true)
- protected List<Text> description;
+ @XmlTransient
+ protected TextMap description = new TextMap();
@XmlElement(name = "activation-config-property", required = true)
protected List<ActivationConfigProperty> activationConfigProperty;
@XmlAttribute
@@ -46,11 +47,17 @@ public class ActivationConfig {
@XmlSchemaType(name = "ID")
protected String id;
- public List<Text> getDescription() {
- if (description == null) {
- description = new ArrayList<Text>();
- }
- return this.description;
+ @XmlElement(name = "description", required = true)
+ public Text[] getDescriptions() {
+ return description.toArray();
+ }
+
+ public void setDescriptions(Text[] text) {
+ description.set(text);
+ }
+
+ public String getDescription() {
+ return description.get();
}
public void addProperty(String name, String value) {
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/AuthConstraint.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/AuthConstraint.java?rev=955422&r1=955421&r2=955422&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/AuthConstraint.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/AuthConstraint.java Wed Jun 16 23:01:52 2010
@@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -30,12 +31,12 @@ import java.util.List;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "auth-constraintType", propOrder = {
- "description",
+ "descriptions",
"roleName"
})
public class AuthConstraint {
- //TODO use TextMap for description
- protected List<String> description;
+ @XmlTransient
+ protected TextMap description = new TextMap();
@XmlElement(name = "role-name")
protected List<String> roleName;
@XmlAttribute
@@ -43,11 +44,17 @@ public class AuthConstraint {
@XmlID
protected String id;
- public List<String> getDescription() {
- if (description == null) {
- description = new ArrayList<String>();
- }
- return this.description;
+ @XmlElement(name = "description", required = true)
+ public Text[] getDescriptions() {
+ return description.toArray();
+ }
+
+ public void setDescriptions(Text[] text) {
+ description.set(text);
+ }
+
+ public String getDescription() {
+ return description.get();
}
public List<String> getRoleName() {
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/AuthenticationMechanism.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/AuthenticationMechanism.java?rev=955422&r1=955421&r2=955422&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/AuthenticationMechanism.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/AuthenticationMechanism.java Wed Jun 16 23:01:52 2010
@@ -21,6 +21,7 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -29,14 +30,14 @@ import java.util.List;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "authentication-mechanismType", propOrder = {
- "description",
+ "descriptions",
"authenticationMechanismType",
"credentialInterface"
})
public class AuthenticationMechanism {
- //TODO use TextMap for description
- protected List<Text> description;
+ @XmlTransient
+ protected TextMap description = new TextMap();
@XmlElement(name = "authentication-mechanism-type", required = true)
protected String authenticationMechanismType;
@XmlElement(name = "credential-interface", required = true)
@@ -46,11 +47,17 @@ public class AuthenticationMechanism {
@XmlID
protected String id;
- public List<Text> getDescription() {
- if (description == null) {
- description = new ArrayList<Text>();
- }
- return this.description;
+ @XmlElement(name = "description", required = true)
+ public Text[] getDescriptions() {
+ return description.toArray();
+ }
+
+ public void setDescriptions(Text[] text) {
+ description.set(text);
+ }
+
+ public String getDescription() {
+ return description.get();
}
public String getAuthenticationMechanismType() {
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/CmpField.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/CmpField.java?rev=955422&r1=955421&r2=955422&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/CmpField.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/CmpField.java Wed Jun 16 23:01:52 2010
@@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -32,13 +33,13 @@ import java.util.List;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "cmp-fieldType", propOrder = {
- "description",
+ "descriptions",
"fieldName"
})
public class CmpField {
- @XmlElement(required = true)
- protected List<Text> description;
+ @XmlTransient
+ protected TextMap description = new TextMap();
@XmlElement(name = "field-name", required = true)
protected String fieldName;
@XmlAttribute
@@ -53,11 +54,17 @@ public class CmpField {
this.fieldName = fieldName;
}
- public List<Text> getDescription() {
- if (description == null) {
- description = new ArrayList<Text>();
- }
- return this.description;
+ @XmlElement(name = "description", required = true)
+ public Text[] getDescriptions() {
+ return description.toArray();
+ }
+
+ public void setDescriptions(Text[] text) {
+ description.set(text);
+ }
+
+ public String getDescription() {
+ return description.get();
}
public String getFieldName() {
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/CmrField.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/CmrField.java?rev=955422&r1=955421&r2=955422&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/CmrField.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/CmrField.java Wed Jun 16 23:01:52 2010
@@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -32,14 +33,14 @@ import java.util.List;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "cmr-fieldType", propOrder = {
- "description",
+ "descriptions",
"cmrFieldName",
"cmrFieldType"
})
public class CmrField {
- @XmlElement(required = true)
- protected List<Text> description;
+ @XmlTransient
+ protected TextMap description = new TextMap();
@XmlElement(name = "cmr-field-name", required = true)
protected String cmrFieldName;
@XmlElement(name = "cmr-field-type")
@@ -57,11 +58,17 @@ public class CmrField {
this.cmrFieldType = cmrFieldType;
}
- public List<Text> getDescription() {
- if (description == null) {
- description = new ArrayList<Text>();
- }
- return this.description;
+ @XmlElement(name = "description", required = true)
+ public Text[] getDescriptions() {
+ return description.toArray();
+ }
+
+ public void setDescriptions(Text[] text) {
+ description.set(text);
+ }
+
+ public String getDescription() {
+ return description.get();
}
public String getCmrFieldName() {
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ConfigProperty.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ConfigProperty.java?rev=955422&r1=955421&r2=955422&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ConfigProperty.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ConfigProperty.java Wed Jun 16 23:01:52 2010
@@ -21,6 +21,7 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -29,7 +30,7 @@ import java.util.List;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "config-propertyType", propOrder = {
- "description",
+ "descriptions",
"configPropertyName",
"configPropertyType",
"configPropertyValue",
@@ -39,8 +40,8 @@ import java.util.List;
})
public class ConfigProperty {
- //TODO use TextMap for description
- protected List<Text> description;
+ @XmlTransient
+ protected TextMap description = new TextMap();
@XmlElement(name = "config-property-name", required = true)
protected String configPropertyName;
@XmlElement(name = "config-property-type", required = true)
@@ -59,11 +60,17 @@ public class ConfigProperty {
@XmlID
protected String id;
- public List<Text> getDescription() {
- if (description == null) {
- description = new ArrayList<Text>();
- }
- return this.description;
+ @XmlElement(name = "description", required = true)
+ public Text[] getDescriptions() {
+ return description.toArray();
+ }
+
+ public void setDescriptions(Text[] text) {
+ description.set(text);
+ }
+
+ public String getDescription() {
+ return description.get();
}
public String getConfigPropertyName() {
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ContainerConcurrency.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ContainerConcurrency.java?rev=955422&r1=955421&r2=955422&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ContainerConcurrency.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ContainerConcurrency.java Wed Jun 16 23:01:52 2010
@@ -37,6 +37,8 @@ import java.util.ArrayList;
})
public class ContainerConcurrency implements AttributeBinding<ConcurrentLockType>{
+ @XmlTransient
+ protected TextMap description = new TextMap();
@XmlElement(required = true)
protected List<Method> method;
@XmlElement(name = "concurrency-attribute", required = true)
@@ -46,8 +48,6 @@ public class ContainerConcurrency implem
@XmlID
protected String id;
- @XmlTransient
- protected TextMap description = new TextMap();
@XmlElement(name = "description", required = true)
public Text[] getDescriptions() {
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbLocalRef.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbLocalRef.java?rev=955422&r1=955421&r2=955422&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbLocalRef.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbLocalRef.java Wed Jun 16 23:01:52 2010
@@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -32,7 +33,7 @@ import java.util.List;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "ejb-local-refType", propOrder = {
- "description",
+ "descriptions",
"ejbRefName",
"ejbRefType",
"localHome",
@@ -44,8 +45,8 @@ import java.util.List;
})
public class EjbLocalRef implements EjbReference {
- @XmlElement(required = true)
- protected List<Text> description;
+ @XmlTransient
+ protected TextMap description = new TextMap();
@XmlElement(name = "ejb-ref-name", required = true)
protected String ejbRefName;
@XmlElement(name = "ejb-ref-type")
@@ -79,7 +80,7 @@ public class EjbLocalRef implements EjbR
this.ejbRefType = ref.getEjbRefType();
this.ejbLink = ref.getEjbLink();
this.mappedName = ref.getMappedName();
- this.description = ref.getDescription();
+ setDescriptions(ref.getDescriptions());
this.injectionTarget = ref.getInjectionTarget();
this.local = ref.getInterface();
this.localHome = ref.getHome();
@@ -105,11 +106,17 @@ public class EjbLocalRef implements EjbR
}
- public List<Text> getDescription() {
- if (description == null) {
- description = new ArrayList<Text>();
- }
- return this.description;
+ @XmlElement(name = "description", required = true)
+ public Text[] getDescriptions() {
+ return description.toArray();
+ }
+
+ public void setDescriptions(Text[] text) {
+ description.set(text);
+ }
+
+ public String getDescription() {
+ return description.get();
}
public String getEjbRefName() {
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRef.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRef.java?rev=955422&r1=955421&r2=955422&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRef.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRef.java Wed Jun 16 23:01:52 2010
@@ -33,7 +33,7 @@ import java.util.List;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "ejb-refType", propOrder = {
- "description",
+ "descriptions",
"ejbRefName",
"ejbRefType",
"home",
@@ -45,8 +45,8 @@ import java.util.List;
})
public class EjbRef implements EjbReference {
- @XmlElement(required = true)
- protected List<Text> description;
+ @XmlTransient
+ protected TextMap description = new TextMap();
@XmlElement(name = "ejb-ref-name", required = true)
protected String ejbRefName;
@XmlElement(name = "ejb-ref-type")
@@ -77,11 +77,17 @@ public class EjbRef implements EjbRefere
this.refType = refType;
}
- public List<Text> getDescription() {
- if (description == null) {
- description = new ArrayList<Text>();
- }
- return this.description;
+ @XmlElement(name = "description", required = true)
+ public Text[] getDescriptions() {
+ return description.toArray();
+ }
+
+ public void setDescriptions(Text[] text) {
+ description.set(text);
+ }
+
+ public String getDescription() {
+ return description.get();
}
public String getEjbRefName() {
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbReference.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbReference.java?rev=955422&r1=955421&r2=955422&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbReference.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbReference.java Wed Jun 16 23:01:52 2010
@@ -35,7 +35,7 @@ public interface EjbReference extends Jn
String getEjbLink();
- List<Text> getDescription();
+ Text[] getDescriptions();
static enum Type {
UNKNOWN, LOCAL, REMOTE;
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRelation.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRelation.java?rev=955422&r1=955421&r2=955422&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRelation.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRelation.java Wed Jun 16 23:01:52 2010
@@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
@@ -32,13 +33,13 @@ import java.util.List;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "ejb-relationType", propOrder = {
- "description",
+ "descriptions",
"ejbRelationName",
"ejbRelationshipRole"
})
public class EjbRelation {
- @XmlElement(required = true)
- protected List<Text> description;
+ @XmlTransient
+ protected TextMap description = new TextMap();
@XmlElement(name = "ejb-relation-name")
protected String ejbRelationName;
@@ -50,11 +51,17 @@ public class EjbRelation {
@XmlID
protected String id;
- public List<Text> getDescription() {
- if (description == null) {
- description = new ArrayList<Text>();
- }
- return this.description;
+ @XmlElement(name = "description", required = true)
+ public Text[] getDescriptions() {
+ return description.toArray();
+ }
+
+ public void setDescriptions(Text[] text) {
+ description.set(text);
+ }
+
+ public String getDescription() {
+ return description.get();
}
public String getEjbRelationName() {
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRelationshipRole.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRelationshipRole.java?rev=955422&r1=955421&r2=955422&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRelationshipRole.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRelationshipRole.java Wed Jun 16 23:01:52 2010
@@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -32,7 +33,7 @@ import java.util.List;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "ejb-relationship-roleType", propOrder = {
- "description",
+ "descriptions",
"ejbRelationshipRoleName",
"multiplicity",
"cascadeDelete",
@@ -41,8 +42,8 @@ import java.util.List;
})
public class EjbRelationshipRole {
- @XmlElement(required = true)
- protected List<Text> description;
+ @XmlTransient
+ protected TextMap description = new TextMap();
@XmlElement(name = "ejb-relationship-role-name")
protected String ejbRelationshipRoleName;
@XmlElement(required = true)
@@ -58,11 +59,17 @@ public class EjbRelationshipRole {
@XmlID
protected String id;
- public List<Text> getDescription() {
- if (description == null) {
- description = new ArrayList<Text>();
- }
- return this.description;
+ @XmlElement(name = "description", required = true)
+ public Text[] getDescriptions() {
+ return description.toArray();
+ }
+
+ public void setDescriptions(Text[] text) {
+ description.set(text);
+ }
+
+ public String getDescription() {
+ return description.get();
}
public String getEjbRelationshipRoleName() {
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnvEntry.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnvEntry.java?rev=955422&r1=955421&r2=955422&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnvEntry.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnvEntry.java Wed Jun 16 23:01:52 2010
@@ -33,7 +33,7 @@ import java.util.List;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "env-entryType", propOrder = {
- "description",
+ "descriptions",
"envEntryName",
"envEntryType",
"envEntryValue",
@@ -43,8 +43,8 @@ import java.util.List;
})
public class EnvEntry implements JndiReference {
- @XmlElement(required = true)
- protected List<Text> description;
+ @XmlTransient
+ protected TextMap description = new TextMap();
@XmlElement(name = "env-entry-name", required = true)
protected String envEntryName;
@XmlElement(name = "env-entry-type")
@@ -100,11 +100,17 @@ public class EnvEntry implements JndiRef
setEnvEntryType(type);
}
- public List<Text> getDescription() {
- if (description == null) {
- description = new ArrayList<Text>();
- }
- return this.description;
+ @XmlElement(name = "description", required = true)
+ public Text[] getDescriptions() {
+ return description.toArray();
+ }
+
+ public void setDescriptions(Text[] text) {
+ description.set(text);
+ }
+
+ public String getDescription() {
+ return description.get();
}
public String getEnvEntryName() {
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ExcludeList.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ExcludeList.java?rev=955422&r1=955421&r2=955422&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ExcludeList.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ExcludeList.java Wed Jun 16 23:01:52 2010
@@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -32,13 +33,13 @@ import java.util.List;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "exclude-listType", propOrder = {
- "description",
+ "descriptions",
"method"
- })
+})
public class ExcludeList {
- @XmlElement(required = true)
- protected List<Text> description;
+ @XmlTransient
+ protected TextMap description = new TextMap();
@XmlElement(required = true)
protected List<Method> method;
@XmlAttribute
@@ -46,11 +47,17 @@ public class ExcludeList {
@XmlID
protected String id;
- public List<Text> getDescription() {
- if (description == null) {
- description = new ArrayList<Text>();
- }
- return this.description;
+ @XmlElement(name = "description", required = true)
+ public Text[] getDescriptions() {
+ return description.toArray();
+ }
+
+ public void setDescriptions(Text[] text) {
+ description.set(text);
+ }
+
+ public String getDescription() {
+ return description.get();
}
public List<Method> getMethod() {
@@ -60,10 +67,10 @@ public class ExcludeList {
return this.method;
}
- public void addMethod(Method method){
+ public void addMethod(Method method) {
getMethod().add(method);
}
-
+
public String getId() {
return id;
}
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplicationResourceBundle.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplicationResourceBundle.java?rev=955422&r1=955421&r2=955422&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplicationResourceBundle.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplicationResourceBundle.java Wed Jun 16 23:01:52 2010
@@ -25,13 +25,16 @@
package org.apache.openejb.jee;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
+import java.util.Map;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -73,18 +76,20 @@ import javax.xml.bind.annotation.adapter
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "faces-config-application-resource-bundleType", propOrder = {
- "description",
- "displayName",
+ "descriptions",
+ "displayNames",
"icon",
"baseName",
"var"
})
public class FacesApplicationResourceBundle {
- protected List<DescriptionType> description;
- @XmlElement(name = "display-name")
- protected List<java.lang.String> displayName;
- protected List<Icon> icon;
+ @XmlTransient
+ protected TextMap description = new TextMap();
+ @XmlTransient
+ protected TextMap displayName = new TextMap();
+ @XmlElement(name = "icon", required = true)
+ protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
@XmlElement(name = "base-name", required = true)
protected java.lang.String baseName;
@XmlElement(required = true)
@@ -95,91 +100,48 @@ public class FacesApplicationResourceBun
@XmlSchemaType(name = "ID")
protected java.lang.String id;
- /**
- * Gets the value of the description property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the description property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getDescription().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link DescriptionType }
- *
- *
- */
- public List<DescriptionType> getDescription() {
- if (description == null) {
- description = new ArrayList<DescriptionType>();
- }
- return this.description;
+ @XmlElement(name = "description", required = true)
+ public Text[] getDescriptions() {
+ return description.toArray();
}
- /**
- * Gets the value of the displayName property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the displayName property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getDisplayName().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link java.lang.String }
- *
- *
- */
- public List<java.lang.String> getDisplayName() {
- if (displayName == null) {
- displayName = new ArrayList<java.lang.String>();
+ public void setDescriptions(Text[] text) {
+ description.set(text);
+ }
+
+ public String getDescription() {
+ return description.get();
+ }
+
+ @XmlElement(name = "display-name", required = true)
+ public Text[] getDisplayNames() {
+ return displayName.toArray();
+ }
+
+ public void setDisplayNames(Text[] text) {
+ displayName.set(text);
+ }
+
+ public String getDisplayName() {
+ return displayName.get();
+ }
+
+ public Collection<Icon> getIcons() {
+ if (icon == null) {
+ icon = new LocalCollection<Icon>();
}
- return this.displayName;
+ return icon;
}
- /**
- * Gets the value of the icon property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the icon property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getIcon().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Icon }
- *
- *
- */
- public List<Icon> getIcon() {
+ public Map<String,Icon> getIconMap() {
if (icon == null) {
- icon = new ArrayList<Icon>();
+ icon = new LocalCollection<Icon>();
}
- return this.icon;
+ return icon.toMap();
+ }
+
+ public Icon getIcon() {
+ return icon.getLocal();
}
/**
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAttribute.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAttribute.java?rev=955422&r1=955421&r2=955422&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAttribute.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAttribute.java Wed Jun 16 23:01:52 2010
@@ -25,13 +25,16 @@
package org.apache.openejb.jee;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
+import java.util.Map;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -75,8 +78,8 @@ import javax.xml.bind.annotation.adapter
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "faces-config-attributeType", propOrder = {
- "description",
- "displayName",
+ "descriptions",
+ "displayNames",
"icon",
"attributeName",
"attributeClass",
@@ -86,10 +89,12 @@ import javax.xml.bind.annotation.adapter
})
public class FacesAttribute {
- protected List<DescriptionType> description;
- @XmlElement(name = "display-name")
- protected List<java.lang.String> displayName;
- protected List<Icon> icon;
+ @XmlTransient
+ protected TextMap description = new TextMap();
+ @XmlTransient
+ protected TextMap displayName = new TextMap();
+ @XmlElement(name = "icon", required = true)
+ protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
@XmlElement(name = "attribute-name", required = true)
protected java.lang.String attributeName;
@XmlElement(name = "attribute-class", required = true)
@@ -106,91 +111,48 @@ public class FacesAttribute {
@XmlSchemaType(name = "ID")
protected java.lang.String id;
- /**
- * Gets the value of the description property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the description property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getDescription().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link DescriptionType }
- *
- *
- */
- public List<DescriptionType> getDescription() {
- if (description == null) {
- description = new ArrayList<DescriptionType>();
- }
- return this.description;
+ @XmlElement(name = "description", required = true)
+ public Text[] getDescriptions() {
+ return description.toArray();
}
- /**
- * Gets the value of the displayName property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the displayName property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getDisplayName().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link java.lang.String }
- *
- *
- */
- public List<java.lang.String> getDisplayName() {
- if (displayName == null) {
- displayName = new ArrayList<java.lang.String>();
+ public void setDescriptions(Text[] text) {
+ description.set(text);
+ }
+
+ public String getDescription() {
+ return description.get();
+ }
+
+ @XmlElement(name = "display-name", required = true)
+ public Text[] getDisplayNames() {
+ return displayName.toArray();
+ }
+
+ public void setDisplayNames(Text[] text) {
+ displayName.set(text);
+ }
+
+ public String getDisplayName() {
+ return displayName.get();
+ }
+
+ public Collection<Icon> getIcons() {
+ if (icon == null) {
+ icon = new LocalCollection<Icon>();
}
- return this.displayName;
+ return icon;
}
- /**
- * Gets the value of the icon property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the icon property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getIcon().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Icon }
- *
- *
- */
- public List<Icon> getIcon() {
+ public Map<String,Icon> getIconMap() {
if (icon == null) {
- icon = new ArrayList<Icon>();
+ icon = new LocalCollection<Icon>();
}
- return this.icon;
+ return icon.toMap();
+ }
+
+ public Icon getIcon() {
+ return icon.getLocal();
}
/**
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesBehavior.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesBehavior.java?rev=955422&r1=955421&r2=955422&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesBehavior.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesBehavior.java Wed Jun 16 23:01:52 2010
@@ -17,10 +17,13 @@
package org.apache.openejb.jee;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
+import java.util.Map;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -69,8 +72,8 @@ import javax.xml.bind.annotation.XmlType
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "faces-config-behaviorType", propOrder = {
- "description",
- "displayName",
+ "descriptions",
+ "displayNames",
"icon",
"behaviorId",
"behaviorClass",
@@ -80,10 +83,12 @@ import javax.xml.bind.annotation.XmlType
})
public class FacesBehavior {
- protected List<String> description;
- @XmlElement(name = "display-name")
- protected List<String> displayName;
- protected List<Icon> icon;
+ @XmlTransient
+ protected TextMap description = new TextMap();
+ @XmlTransient
+ protected TextMap displayName = new TextMap();
+ @XmlElement(name = "icon", required = true)
+ protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
@XmlElement(name = "behavior-id", required = true)
protected String behaviorId;
@XmlElement(name = "behavior-class", required = true)
@@ -93,91 +98,48 @@ public class FacesBehavior {
@XmlElement(name = "behavior-extension")
protected List<FacesBehaviorExtension> behaviorExtension;
- /**
- * Gets the value of the description property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the description property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getDescription().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link String }
- *
- *
- */
- public List<String> getDescription() {
- if (description == null) {
- description = new ArrayList<String>();
- }
- return this.description;
+ @XmlElement(name = "description", required = true)
+ public Text[] getDescriptions() {
+ return description.toArray();
}
- /**
- * Gets the value of the displayName property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the displayName property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getDisplayName().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link String }
- *
- *
- */
- public List<String> getDisplayName() {
- if (displayName == null) {
- displayName = new ArrayList<String>();
+ public void setDescriptions(Text[] text) {
+ description.set(text);
+ }
+
+ public String getDescription() {
+ return description.get();
+ }
+
+ @XmlElement(name = "display-name", required = true)
+ public Text[] getDisplayNames() {
+ return displayName.toArray();
+ }
+
+ public void setDisplayNames(Text[] text) {
+ displayName.set(text);
+ }
+
+ public String getDisplayName() {
+ return displayName.get();
+ }
+
+ public Collection<Icon> getIcons() {
+ if (icon == null) {
+ icon = new LocalCollection<Icon>();
}
- return this.displayName;
+ return icon;
}
- /**
- * Gets the value of the icon property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the icon property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getIcon().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Icon }
- *
- *
- */
- public List<Icon> getIcon() {
+ public Map<String,Icon> getIconMap() {
if (icon == null) {
- icon = new ArrayList<Icon>();
+ icon = new LocalCollection<Icon>();
}
- return this.icon;
+ return icon.toMap();
+ }
+
+ public Icon getIcon() {
+ return icon.getLocal();
}
/**
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesComponent.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesComponent.java?rev=955422&r1=955421&r2=955422&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesComponent.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesComponent.java Wed Jun 16 23:01:52 2010
@@ -25,13 +25,16 @@
package org.apache.openejb.jee;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
+import java.util.Map;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -81,8 +84,8 @@ import javax.xml.bind.annotation.adapter
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "faces-config-componentType", propOrder = {
- "description",
- "displayName",
+ "descriptions",
+ "displayNames",
"icon",
"componentType",
"componentClass",
@@ -93,10 +96,12 @@ import javax.xml.bind.annotation.adapter
})
public class FacesComponent {
- protected List<DescriptionType> description;
- @XmlElement(name = "display-name")
- protected List<java.lang.String> displayName;
- protected List<Icon> icon;
+ @XmlTransient
+ protected TextMap description = new TextMap();
+ @XmlTransient
+ protected TextMap displayName = new TextMap();
+ @XmlElement(name = "icon", required = true)
+ protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
@XmlElement(name = "component-type", required = true)
protected java.lang.String componentType;
@XmlElement(name = "component-class", required = true)
@@ -112,91 +117,48 @@ public class FacesComponent {
@XmlSchemaType(name = "ID")
protected java.lang.String id;
- /**
- * Gets the value of the description property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the description property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getDescription().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link DescriptionType }
- *
- *
- */
- public List<DescriptionType> getDescription() {
- if (description == null) {
- description = new ArrayList<DescriptionType>();
- }
- return this.description;
+ @XmlElement(name = "description", required = true)
+ public Text[] getDescriptions() {
+ return description.toArray();
}
- /**
- * Gets the value of the displayName property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the displayName property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getDisplayName().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link java.lang.String }
- *
- *
- */
- public List<java.lang.String> getDisplayName() {
- if (displayName == null) {
- displayName = new ArrayList<java.lang.String>();
+ public void setDescriptions(Text[] text) {
+ description.set(text);
+ }
+
+ public String getDescription() {
+ return description.get();
+ }
+
+ @XmlElement(name = "display-name", required = true)
+ public Text[] getDisplayNames() {
+ return displayName.toArray();
+ }
+
+ public void setDisplayNames(Text[] text) {
+ displayName.set(text);
+ }
+
+ public String getDisplayName() {
+ return displayName.get();
+ }
+
+ public Collection<Icon> getIcons() {
+ if (icon == null) {
+ icon = new LocalCollection<Icon>();
}
- return this.displayName;
+ return icon;
}
- /**
- * Gets the value of the icon property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the icon property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getIcon().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Icon }
- *
- *
- */
- public List<Icon> getIcon() {
+ public Map<String,Icon> getIconMap() {
if (icon == null) {
- icon = new ArrayList<Icon>();
+ icon = new LocalCollection<Icon>();
}
- return this.icon;
+ return icon.toMap();
+ }
+
+ public Icon getIcon() {
+ return icon.getLocal();
}
/**
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConverter.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConverter.java?rev=955422&r1=955421&r2=955422&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConverter.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConverter.java Wed Jun 16 23:01:52 2010
@@ -25,13 +25,16 @@
package org.apache.openejb.jee;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
+import java.util.Map;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -86,8 +89,8 @@ import javax.xml.bind.annotation.adapter
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "faces-config-converterType", propOrder = {
- "description",
- "displayName",
+ "descriptions",
+ "displayNames",
"icon",
"converterId",
"converterForClass",
@@ -98,10 +101,12 @@ import javax.xml.bind.annotation.adapter
})
public class FacesConverter {
- protected List<DescriptionType> description;
- @XmlElement(name = "display-name")
- protected List<java.lang.String> displayName;
- protected List<Icon> icon;
+ @XmlTransient
+ protected TextMap description = new TextMap();
+ @XmlTransient
+ protected TextMap displayName = new TextMap();
+ @XmlElement(name = "icon", required = true)
+ protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
@XmlElement(name = "converter-id")
protected java.lang.String converterId;
@XmlElement(name = "converter-for-class")
@@ -118,91 +123,48 @@ public class FacesConverter {
@XmlSchemaType(name = "ID")
protected java.lang.String id;
- /**
- * Gets the value of the description property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the description property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getDescription().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link DescriptionType }
- *
- *
- */
- public List<DescriptionType> getDescription() {
- if (description == null) {
- description = new ArrayList<DescriptionType>();
- }
- return this.description;
+ @XmlElement(name = "description", required = true)
+ public Text[] getDescriptions() {
+ return description.toArray();
}
- /**
- * Gets the value of the displayName property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the displayName property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getDisplayName().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link java.lang.String }
- *
- *
- */
- public List<java.lang.String> getDisplayName() {
- if (displayName == null) {
- displayName = new ArrayList<java.lang.String>();
+ public void setDescriptions(Text[] text) {
+ description.set(text);
+ }
+
+ public String getDescription() {
+ return description.get();
+ }
+
+ @XmlElement(name = "display-name", required = true)
+ public Text[] getDisplayNames() {
+ return displayName.toArray();
+ }
+
+ public void setDisplayNames(Text[] text) {
+ displayName.set(text);
+ }
+
+ public String getDisplayName() {
+ return displayName.get();
+ }
+
+ public Collection<Icon> getIcons() {
+ if (icon == null) {
+ icon = new LocalCollection<Icon>();
}
- return this.displayName;
+ return icon;
}
- /**
- * Gets the value of the icon property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the icon property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getIcon().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Icon }
- *
- *
- */
- public List<Icon> getIcon() {
+ public Map<String,Icon> getIconMap() {
if (icon == null) {
- icon = new ArrayList<Icon>();
+ icon = new LocalCollection<Icon>();
}
- return this.icon;
+ return icon.toMap();
+ }
+
+ public Icon getIcon() {
+ return icon.getLocal();
}
/**
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFacet.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFacet.java?rev=955422&r1=955421&r2=955422&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFacet.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFacet.java Wed Jun 16 23:01:52 2010
@@ -25,13 +25,16 @@
package org.apache.openejb.jee;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
+import java.util.Map;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -68,18 +71,20 @@ import javax.xml.bind.annotation.adapter
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "faces-config-facetType", propOrder = {
- "description",
- "displayName",
+ "descriptions",
+ "displayNames",
"icon",
"facetName",
"facetExtension"
})
public class FacesFacet {
- protected List<DescriptionType> description;
- @XmlElement(name = "display-name")
- protected List<java.lang.String> displayName;
- protected List<Icon> icon;
+ @XmlTransient
+ protected TextMap description = new TextMap();
+ @XmlTransient
+ protected TextMap displayName = new TextMap();
+ @XmlElement(name = "icon", required = true)
+ protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
@XmlElement(name = "facet-name", required = true)
protected java.lang.String facetName;
@XmlElement(name = "facet-extension")
@@ -90,91 +95,48 @@ public class FacesFacet {
@XmlSchemaType(name = "ID")
protected java.lang.String id;
- /**
- * Gets the value of the description property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the description property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getDescription().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link DescriptionType }
- *
- *
- */
- public List<DescriptionType> getDescription() {
- if (description == null) {
- description = new ArrayList<DescriptionType>();
- }
- return this.description;
+ @XmlElement(name = "description", required = true)
+ public Text[] getDescriptions() {
+ return description.toArray();
}
- /**
- * Gets the value of the displayName property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the displayName property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getDisplayName().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link java.lang.String }
- *
- *
- */
- public List<java.lang.String> getDisplayName() {
- if (displayName == null) {
- displayName = new ArrayList<java.lang.String>();
+ public void setDescriptions(Text[] text) {
+ description.set(text);
+ }
+
+ public String getDescription() {
+ return description.get();
+ }
+
+ @XmlElement(name = "display-name", required = true)
+ public Text[] getDisplayNames() {
+ return displayName.toArray();
+ }
+
+ public void setDisplayNames(Text[] text) {
+ displayName.set(text);
+ }
+
+ public String getDisplayName() {
+ return displayName.get();
+ }
+
+ public Collection<Icon> getIcons() {
+ if (icon == null) {
+ icon = new LocalCollection<Icon>();
}
- return this.displayName;
+ return icon;
}
- /**
- * Gets the value of the icon property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the icon property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getIcon().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Icon }
- *
- *
- */
- public List<Icon> getIcon() {
+ public Map<String,Icon> getIconMap() {
if (icon == null) {
- icon = new ArrayList<Icon>();
+ icon = new LocalCollection<Icon>();
}
- return this.icon;
+ return icon.toMap();
+ }
+
+ public Icon getIcon() {
+ return icon.getLocal();
}
/**
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedBean.java?rev=955422&r1=955421&r2=955422&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedBean.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedBean.java Wed Jun 16 23:01:52 2010
@@ -25,13 +25,16 @@
package org.apache.openejb.jee;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
+import java.util.Map;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -83,8 +86,8 @@ import javax.xml.bind.annotation.adapter
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "faces-config-managed-beanType", propOrder = {
- "description",
- "displayName",
+ "descriptions",
+ "displayNames",
"icon",
"managedBeanName",
"managedBeanClass",
@@ -96,10 +99,12 @@ import javax.xml.bind.annotation.adapter
})
public class FacesManagedBean {
- protected List<DescriptionType> description;
- @XmlElement(name = "display-name")
- protected List<java.lang.String> displayName;
- protected List<Icon> icon;
+ @XmlTransient
+ protected TextMap description = new TextMap();
+ @XmlTransient
+ protected TextMap displayName = new TextMap();
+ @XmlElement(name = "icon", required = true)
+ protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
@XmlElement(name = "managed-bean-name", required = true)
protected java.lang.String managedBeanName;
@XmlElement(name = "managed-bean-class", required = true)
@@ -120,91 +125,48 @@ public class FacesManagedBean {
@XmlSchemaType(name = "ID")
protected java.lang.String id;
- /**
- * Gets the value of the description property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the description property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getDescription().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link DescriptionType }
- *
- *
- */
- public List<DescriptionType> getDescription() {
- if (description == null) {
- description = new ArrayList<DescriptionType>();
- }
- return this.description;
+ @XmlElement(name = "description", required = true)
+ public Text[] getDescriptions() {
+ return description.toArray();
}
- /**
- * Gets the value of the displayName property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the displayName property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getDisplayName().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link java.lang.String }
- *
- *
- */
- public List<java.lang.String> getDisplayName() {
- if (displayName == null) {
- displayName = new ArrayList<java.lang.String>();
+ public void setDescriptions(Text[] text) {
+ description.set(text);
+ }
+
+ public String getDescription() {
+ return description.get();
+ }
+
+ @XmlElement(name = "display-name", required = true)
+ public Text[] getDisplayNames() {
+ return displayName.toArray();
+ }
+
+ public void setDisplayNames(Text[] text) {
+ displayName.set(text);
+ }
+
+ public String getDisplayName() {
+ return displayName.get();
+ }
+
+ public Collection<Icon> getIcons() {
+ if (icon == null) {
+ icon = new LocalCollection<Icon>();
}
- return this.displayName;
+ return icon;
}
- /**
- * Gets the value of the icon property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the icon property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getIcon().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Icon }
- *
- *
- */
- public List<Icon> getIcon() {
+ public Map<String,Icon> getIconMap() {
if (icon == null) {
- icon = new ArrayList<Icon>();
+ icon = new LocalCollection<Icon>();
}
- return this.icon;
+ return icon.toMap();
+ }
+
+ public Icon getIcon() {
+ return icon.getLocal();
}
/**
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedProperty.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedProperty.java?rev=955422&r1=955421&r2=955422&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedProperty.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedProperty.java Wed Jun 16 23:01:52 2010
@@ -25,13 +25,16 @@
package org.apache.openejb.jee;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
+import java.util.Map;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -76,8 +79,8 @@ import javax.xml.bind.annotation.adapter
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "faces-config-managed-propertyType", propOrder = {
- "description",
- "displayName",
+ "descriptions",
+ "displayNames",
"icon",
"propertyName",
"propertyClass",
@@ -88,10 +91,12 @@ import javax.xml.bind.annotation.adapter
})
public class FacesManagedProperty {
- protected List<DescriptionType> description;
- @XmlElement(name = "display-name")
- protected List<java.lang.String> displayName;
- protected List<Icon> icon;
+ @XmlTransient
+ protected TextMap description = new TextMap();
+ @XmlTransient
+ protected TextMap displayName = new TextMap();
+ @XmlElement(name = "icon", required = true)
+ protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
@XmlElement(name = "property-name", required = true)
protected java.lang.String propertyName;
@XmlElement(name = "property-class")
@@ -109,91 +114,48 @@ public class FacesManagedProperty {
@XmlSchemaType(name = "ID")
protected java.lang.String id;
- /**
- * Gets the value of the description property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the description property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getDescription().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link DescriptionType }
- *
- *
- */
- public List<DescriptionType> getDescription() {
- if (description == null) {
- description = new ArrayList<DescriptionType>();
- }
- return this.description;
+ @XmlElement(name = "description", required = true)
+ public Text[] getDescriptions() {
+ return description.toArray();
}
- /**
- * Gets the value of the displayName property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the displayName property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getDisplayName().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link java.lang.String }
- *
- *
- */
- public List<java.lang.String> getDisplayName() {
- if (displayName == null) {
- displayName = new ArrayList<java.lang.String>();
+ public void setDescriptions(Text[] text) {
+ description.set(text);
+ }
+
+ public String getDescription() {
+ return description.get();
+ }
+
+ @XmlElement(name = "display-name", required = true)
+ public Text[] getDisplayNames() {
+ return displayName.toArray();
+ }
+
+ public void setDisplayNames(Text[] text) {
+ displayName.set(text);
+ }
+
+ public String getDisplayName() {
+ return displayName.get();
+ }
+
+ public Collection<Icon> getIcons() {
+ if (icon == null) {
+ icon = new LocalCollection<Icon>();
}
- return this.displayName;
+ return icon;
}
- /**
- * Gets the value of the icon property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the icon property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getIcon().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Icon }
- *
- *
- */
- public List<Icon> getIcon() {
+ public Map<String,Icon> getIconMap() {
if (icon == null) {
- icon = new ArrayList<Icon>();
+ icon = new LocalCollection<Icon>();
}
- return this.icon;
+ return icon.toMap();
+ }
+
+ public Icon getIcon() {
+ return icon.getLocal();
}
/**
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesNavigationCase.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesNavigationCase.java?rev=955422&r1=955421&r2=955422&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesNavigationCase.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesNavigationCase.java Wed Jun 16 23:01:52 2010
@@ -25,13 +25,16 @@
package org.apache.openejb.jee;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
+import java.util.Map;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -73,8 +76,8 @@ import javax.xml.bind.annotation.adapter
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "faces-config-navigation-caseType", propOrder = {
- "description",
- "displayName",
+ "descriptions",
+ "displayNames",
"icon",
"fromAction",
"fromOutcome",
@@ -84,10 +87,12 @@ import javax.xml.bind.annotation.adapter
})
public class FacesNavigationCase {
- protected List<DescriptionType> description;
- @XmlElement(name = "display-name")
- protected List<java.lang.String> displayName;
- protected List<Icon> icon;
+ @XmlTransient
+ protected TextMap description = new TextMap();
+ @XmlTransient
+ protected TextMap displayName = new TextMap();
+ @XmlElement(name = "icon", required = true)
+ protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
@XmlElement(name = "from-action")
protected FacesFromAction fromAction;
@XmlElement(name = "from-outcome")
@@ -104,91 +109,48 @@ public class FacesNavigationCase {
@XmlSchemaType(name = "ID")
protected java.lang.String id;
- /**
- * Gets the value of the description property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the description property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getDescription().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link DescriptionType }
- *
- *
- */
- public List<DescriptionType> getDescription() {
- if (description == null) {
- description = new ArrayList<DescriptionType>();
- }
- return this.description;
+ @XmlElement(name = "description", required = true)
+ public Text[] getDescriptions() {
+ return description.toArray();
}
- /**
- * Gets the value of the displayName property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the displayName property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getDisplayName().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link java.lang.String }
- *
- *
- */
- public List<java.lang.String> getDisplayName() {
- if (displayName == null) {
- displayName = new ArrayList<java.lang.String>();
+ public void setDescriptions(Text[] text) {
+ description.set(text);
+ }
+
+ public String getDescription() {
+ return description.get();
+ }
+
+ @XmlElement(name = "display-name", required = true)
+ public Text[] getDisplayNames() {
+ return displayName.toArray();
+ }
+
+ public void setDisplayNames(Text[] text) {
+ displayName.set(text);
+ }
+
+ public String getDisplayName() {
+ return displayName.get();
+ }
+
+ public Collection<Icon> getIcons() {
+ if (icon == null) {
+ icon = new LocalCollection<Icon>();
}
- return this.displayName;
+ return icon;
}
- /**
- * Gets the value of the icon property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the icon property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getIcon().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Icon }
- *
- *
- */
- public List<Icon> getIcon() {
+ public Map<String,Icon> getIconMap() {
if (icon == null) {
- icon = new ArrayList<Icon>();
+ icon = new LocalCollection<Icon>();
}
- return this.icon;
+ return icon.toMap();
+ }
+
+ public Icon getIcon() {
+ return icon.getLocal();
}
/**