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

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

Author: scott.stark at jboss.org
Date: 2008-10-22 11:46:13 -0400 (Wed, 22 Oct 2008)
New Revision: 79927

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java
   trunk/tomcat/src/tests/org/jboss/test/web/metadata/ServerMetaDataUniTestCase.java
Log:
Remove the old parser factory references

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2008-10-22 15:42:07 UTC (rev 79926)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2008-10-22 15:46:13 UTC (rev 79927)
@@ -78,10 +78,7 @@
 import org.jboss.util.xml.JBossEntityResolver;
 import org.jboss.virtual.VirtualFile;
 import org.jboss.web.tomcat.metadata.ContextMetaData;
-import org.jboss.web.tomcat.metadata.ContextXMLObjectModelFactory;
 import org.jboss.web.tomcat.metadata.ParameterMetaData;
-import org.jboss.web.tomcat.metadata.ServerMetaData;
-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;

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java	2008-10-22 15:42:07 UTC (rev 79926)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java	2008-10-22 15:46:13 UTC (rev 79927)
@@ -60,11 +60,9 @@
 import org.jboss.web.tomcat.metadata.HostMetaData;
 import org.jboss.web.tomcat.metadata.ListenerMetaData;
 import org.jboss.web.tomcat.metadata.ServerMetaData;
-import org.jboss.web.tomcat.metadata.ServerXMLObjectModelFactory;
 import org.jboss.web.tomcat.metadata.ServiceMetaData;
 import org.jboss.web.tomcat.metadata.ValveMetaData;
 import org.jboss.web.tomcat.security.HttpServletRequestPolicyContextHandler;
-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;

Modified: trunk/tomcat/src/tests/org/jboss/test/web/metadata/ServerMetaDataUniTestCase.java
===================================================================
--- trunk/tomcat/src/tests/org/jboss/test/web/metadata/ServerMetaDataUniTestCase.java	2008-10-22 15:42:07 UTC (rev 79926)
+++ trunk/tomcat/src/tests/org/jboss/test/web/metadata/ServerMetaDataUniTestCase.java	2008-10-22 15:46:13 UTC (rev 79927)
@@ -23,16 +23,15 @@
 
 import java.io.InputStream;
 
-import javax.xml.namespace.QName;
-
 import junit.framework.TestCase;
 
+import org.jboss.util.xml.JBossEntityResolver;
 import org.jboss.web.tomcat.metadata.ListenerMetaData;
 import org.jboss.web.tomcat.metadata.ServerMetaData;
-import org.jboss.web.tomcat.metadata.ServerXMLObjectModelFactory;
-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;
+import org.jboss.xb.builder.JBossXBBuilder;
 
 /**
  * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
@@ -43,15 +42,15 @@
 
    public void test() throws Exception
    {
-
-      ObjectModelFactory factory = new ServerXMLObjectModelFactory();
+      SchemaBinding schema = JBossXBBuilder.build(ServerMetaData.class);
       Unmarshaller u = UnmarshallerFactory.newInstance().newUnmarshaller();
       u.setSchemaValidation(false);
       u.setValidation(false);
-      
+      u.setEntityResolver(new JBossEntityResolver());
+
       InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("test/metadata/server.xml");
 
-      ServerMetaData m = ServerMetaData.class.cast(u.unmarshal(is, factory, null));
+      ServerMetaData m = ServerMetaData.class.cast(u.unmarshal(is, schema));
       assertNotNull(m);
       assertNotNull(m.getListeners());
       assertNotNull(m.getServices());