[jboss-cvs] JBossAS SVN: r108323 - projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/xml.

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

Author: pferraro
Date: 2010-09-24 12:25:42 -0400 (Fri, 24 Sep 2010)
New Revision: 108323

Modified:
   projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/xml/XMLCacheContainerRegistryConfigurationSource.java
Log:
Revert workaround for missing infinispan schema - we'll just package it ourselves for now.

Modified: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/xml/XMLCacheContainerRegistryConfigurationSource.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/xml/XMLCacheContainerRegistryConfigurationSource.java	2010-09-24 16:17:46 UTC (rev 108322)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/xml/XMLCacheContainerRegistryConfigurationSource.java	2010-09-24 16:25:42 UTC (rev 108323)
@@ -34,12 +34,10 @@
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.validation.SchemaFactory;
 
-import org.infinispan.Version;
 import org.infinispan.config.InfinispanConfiguration;
 import org.infinispan.config.parsing.NamespaceFilter;
 import org.jboss.ha.ispn.config.CacheContainerRegistryConfiguration;
 import org.jboss.ha.ispn.config.CacheContainerRegistryConfigurationSource;
-import org.jboss.logging.Logger;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
@@ -57,8 +55,6 @@
    private static final String INFINISPAN_NAMESPACE = NamespaceFilter.ISPN_NS;
    private static final String INFINISPAN_SCHEMA = InfinispanConfiguration.resolveSchemaPath();
 
-   private static final Logger log = Logger.getLogger(XMLCacheContainerRegistryConfigurationSource.class);
-   
    private final URL infinispanSchemaURL;
    private final URL schemaURL;
    private final URL xmlURL;
@@ -81,32 +77,8 @@
    {
       this.xmlURL = url;
       this.schemaURL = findResource(SCHEMA);
-      this.infinispanSchemaURL = findResource(INFINISPAN_SCHEMA, String.format("http://infinispan.org/schemas/infinispan-config-%s.xsd", Version.getMajorVersion()));
+      this.infinispanSchemaURL = findResource(INFINISPAN_SCHEMA);
    }
-
-   private URL findResource(String... resources)
-   {
-      RuntimeException exception = null;
-      
-      for (String resource: resources)
-      {
-         try
-         {
-            return findResource(resource);
-         }
-         catch (RuntimeException e)
-         {
-            if (exception != null)
-            {
-               log.warn(exception.getMessage());
-            }
-            
-            exception = e;
-         }
-      }
-      
-      throw exception;
-   }
    
    /**
     * Creates a new XMLCacheContainerRegistryConfigurationSource using the specified classpath resource containing