[jboss-cvs] JBossAS SVN: r64739 - in trunk/tomcat/src: tests/org/jboss/test/web/metamodel/unit and 1 other directory.

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

Author: anil.saldhana at jboss.com
Date: 2007-08-21 11:51:15 -0400 (Tue, 21 Aug 2007)
New Revision: 64739

Modified:
   trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/Servlet.java
   trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/WebDDObjectFactory.java
   trunk/tomcat/src/tests/org/jboss/test/web/metamodel/unit/WebXmlTestCase.java
Log:
JBAS-4423: use SecurityRoleRef from the security project

Modified: trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/Servlet.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/Servlet.java	2007-08-21 15:51:02 UTC (rev 64738)
+++ trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/Servlet.java	2007-08-21 15:51:15 UTC (rev 64739)
@@ -27,7 +27,7 @@
 
 import org.jboss.metamodel.descriptor.NameValuePair;
 import org.jboss.metamodel.descriptor.RunAs;
-import org.jboss.metamodel.descriptor.SecurityRoleRef;
+import org.jboss.security.SecurityRoleRef;
 
 import org.jboss.logging.Logger;
 
@@ -118,7 +118,7 @@
    
    public void addSecurityRoleRef(SecurityRoleRef ref)
    {
-      securityRoleRefs.put(ref.getRoleName(), ref);
+      securityRoleRefs.put(ref.getName(), ref);
    }
    
    public Collection getRunAsPrincipals()

Modified: trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/WebDDObjectFactory.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/WebDDObjectFactory.java	2007-08-21 15:51:02 UTC (rev 64738)
+++ trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/WebDDObjectFactory.java	2007-08-21 15:51:15 UTC (rev 64739)
@@ -32,15 +32,14 @@
 import org.jboss.metamodel.descriptor.NameValuePair;
 import org.jboss.metamodel.descriptor.ResourceEnvRef;
 import org.jboss.metamodel.descriptor.ResourceRef;
-import org.jboss.metamodel.descriptor.RunAs;
-import org.jboss.metamodel.descriptor.SecurityRoleRef;
+import org.jboss.metamodel.descriptor.RunAs; 
+import org.jboss.security.SecurityRoleRef;
 import org.jboss.util.xml.JBossEntityResolver;
 import org.jboss.xb.binding.JBossXBException;
 import org.jboss.xb.binding.ObjectModelFactory;
 import org.jboss.xb.binding.Unmarshaller;
 import org.jboss.xb.binding.UnmarshallerFactory;
 import org.jboss.xb.binding.UnmarshallingContext;
-import org.jboss.metadata.WebMetaData;
 import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
 import org.xml.sax.Attributes;
 

Modified: trunk/tomcat/src/tests/org/jboss/test/web/metamodel/unit/WebXmlTestCase.java
===================================================================
--- trunk/tomcat/src/tests/org/jboss/test/web/metamodel/unit/WebXmlTestCase.java	2007-08-21 15:51:02 UTC (rev 64738)
+++ trunk/tomcat/src/tests/org/jboss/test/web/metamodel/unit/WebXmlTestCase.java	2007-08-21 15:51:15 UTC (rev 64739)
@@ -40,9 +40,9 @@
 import org.jboss.metamodel.descriptor.NameValuePair;
 import org.jboss.metamodel.descriptor.ResourceEnvRef;
 import org.jboss.metamodel.descriptor.ResourceRef;
-import org.jboss.metamodel.descriptor.RunAs;
-import org.jboss.metamodel.descriptor.SecurityRoleRef;
+import org.jboss.metamodel.descriptor.RunAs; 
 
+import org.jboss.security.SecurityRoleRef;
 import org.jboss.web.metamodel.descriptor.*;
 
 /**
@@ -132,8 +132,8 @@
       Collection roleRefs = servlet.getSecurityRoleRefs();
       assertEquals(1, roleRefs.size());
       SecurityRoleRef roleRef = (SecurityRoleRef)roleRefs.iterator().next();
-      assertEquals("ServletUser", roleRef.getRoleName());
-      assertEquals("ServletUserRole", roleRef.getRoleLink());
+      assertEquals("ServletUser", roleRef.getName());
+      assertEquals("ServletUserRole", roleRef.getLink());
       initParams = servlet.getInitParams();
       assertEquals(1, initParams.size());
       param = (NameValuePair)initParams.iterator().next();