[jboss-cvs] JBossAS SVN: r66513 - projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec.

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2007-10-27 03:54:13 -0400 (Sat, 27 Oct 2007)
New Revision: 66513

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/SecurityRoleMetaData.java
Log:
Correct the principal-name unbounded element mapping

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/SecurityRoleMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/SecurityRoleMetaData.java	2007-10-27 06:54:11 UTC (rev 66512)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/SecurityRoleMetaData.java	2007-10-27 07:54:13 UTC (rev 66513)
@@ -28,23 +28,24 @@
 
 import org.jboss.metadata.javaee.support.MergeableMappedMetaData;
 import org.jboss.metadata.javaee.support.NamedMetaDataWithDescriptions;
-import org.jboss.metadata.javaee.support.NonNullLinkedHashSet;
 
 /**
  * SecurityRoleMetaData.
  * 
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author Scott.Stark at jboss.org
  * @version $Revision: 1.1 $
  */
 @XmlType(name="security-roleType")
-public class SecurityRoleMetaData extends NamedMetaDataWithDescriptions implements MergeableMappedMetaData<SecurityRoleMetaData>
+public class SecurityRoleMetaData
+   extends NamedMetaDataWithDescriptions
+   implements MergeableMappedMetaData<SecurityRoleMetaData>
 {
    /** The serialVersionUID */
    private static final long serialVersionUID = -4349954695900237831L;
    
    /** The prinicpals */
    private Set<String> principals;
-   private String principalName;
 
    /**
     * Create a new SecurityRoleMetaData.
@@ -76,16 +77,6 @@
    }
 
 
-   public String getPrincipalName()
-   {
-      return principalName;
-   }
-
-   public void setPrincipalName(String principalName)
-   {
-      this.principalName = principalName;
-   }
-
    /**
     * Get the principals.
     * 
@@ -102,8 +93,7 @@
     * @param principals the principals.
     * @throws IllegalArgumentException for a null principals
     */
-   //@SchemaProperty(name="principal", mandatory=false, impl=NonNullLinkedHashSet.class)
-   @XmlElement(name="principal", required=false/*, type=NonNullLinkedHashSet.class*/)
+   @XmlElement(name="principal-name", required=false)
    public void setPrincipals(Set<String> principals)
    {
       if (principals == null)