[jboss-cvs] JBossAS SVN: r67578 - in projects/metadata/trunk/src/main/java/org/jboss/metadata: web/jboss and 1 other directory.

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

Author: anil.saldhana at jboss.com
Date: 2007-11-28 18:11:32 -0500 (Wed, 28 Nov 2007)
New Revision: 67578

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
Log:
trim the security domain read from JBoss DD as legacy descriptors had newline characters surrounding the sec domain value

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java	2007-11-28 22:31:58 UTC (rev 67577)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java	2007-11-28 23:11:32 UTC (rev 67578)
@@ -41,9 +41,6 @@
 import org.jboss.metadata.javaee.jboss.RunAsIdentityMetaData;
 import org.jboss.metadata.javaee.spec.RunAsMetaData;
 import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
-import org.jboss.metadata.web.jboss.JBossServletMetaData;
-import org.jboss.metadata.web.jboss.JBossServletsMetaData;
-import org.jboss.metadata.web.spec.ServletMetaData;
 
 /**
  * JBossMetaData.
@@ -324,7 +321,7 @@
    {
       if (securityDomain == null)
          throw new IllegalArgumentException("Null securityDomain");
-      this.securityDomain = securityDomain;
+      this.securityDomain = securityDomain.trim();
    }
 
    /**

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java	2007-11-28 22:31:58 UTC (rev 67577)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java	2007-11-28 23:11:32 UTC (rev 67578)
@@ -628,7 +628,9 @@
    }
    public void setSecurityDomain(String securityDomain)
    {
-      this.securityDomain = securityDomain;
+      if(securityDomain == null)
+         throw new IllegalArgumentException("securityDomain is null");
+      this.securityDomain = securityDomain.trim();
    }
 
    public HashMap getArbitraryMetadata()