[jboss-cvs] JBossAS SVN: r66552 - trunk/testsuite/src/main/org/jboss/test/jacc/test.

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

Author: scott.stark at jboss.org
Date: 2007-10-29 18:13:36 -0400 (Mon, 29 Oct 2007)
New Revision: 66552

Modified:
   trunk/testsuite/src/main/org/jboss/test/jacc/test/WebPermissionsValidationTestCase.java
Log:
Use merge instead of override

Modified: trunk/testsuite/src/main/org/jboss/test/jacc/test/WebPermissionsValidationTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jacc/test/WebPermissionsValidationTestCase.java	2007-10-29 21:01:44 UTC (rev 66551)
+++ trunk/testsuite/src/main/org/jboss/test/jacc/test/WebPermissionsValidationTestCase.java	2007-10-29 22:13:36 UTC (rev 66552)
@@ -36,7 +36,6 @@
 import org.jboss.util.xml.JBossEntityResolver; 
 import org.jboss.web.WebPermissionMapping;
 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.sunday.unmarshalling.SchemaBinding;
@@ -76,7 +75,7 @@
       assertNotNull("web.xml exists?", webxml);
       WebMetaData wmd = getWebMetaData(webxml.openStream());
       JBossWebMetaData jwmd = new JBossWebMetaData();
-      jwmd.setOverridenMetaData(wmd);
+      jwmd.merge(null, wmd);
       TestJBossPolicyConfiguration tpc = new TestJBossPolicyConfiguration("dummy");
       WebPermissionMapping.createPermissions(jwmd, tpc); 
       checkUncheckedPermissions(tpc.getUncheckedPolicy());