[infinispan-commits] Infinispan SVN: r1120 - in trunk: query/src/main/java/org/infinispan/query/config and 1 other directories.

infinispan-commits at lists.jboss.org infinispan-commits at lists.jboss.org
Tue Nov 10 15:01:21 EST 2009


Author: vblagojevic at jboss.com
Date: 2009-11-10 15:01:21 -0500 (Tue, 10 Nov 2009)
New Revision: 1120

Removed:
   trunk/core/src/main/java/org/infinispan/config/ModuleConfigurationResolverVisitor.java
   trunk/query/src/main/java/org/infinispan/query/config/QueryConfigurationBean.java
   trunk/query/src/main/java/org/infinispan/query/config/package-info.java
Modified:
   trunk/core/src/main/java/org/infinispan/config/AbstractConfigurationBeanVisitor.java
   trunk/core/src/main/java/org/infinispan/config/Configuration.java
   trunk/core/src/main/java/org/infinispan/config/ConfigurationBeanVisitor.java
   trunk/core/src/main/java/org/infinispan/config/InfinispanConfiguration.java
   trunk/query/src/test/java/org/infinispan/query/config/QueryParsingTest.java
Log:
Reverse and abandon ISPN-193

Modified: trunk/core/src/main/java/org/infinispan/config/AbstractConfigurationBeanVisitor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/AbstractConfigurationBeanVisitor.java	2009-11-09 23:35:31 UTC (rev 1119)
+++ trunk/core/src/main/java/org/infinispan/config/AbstractConfigurationBeanVisitor.java	2009-11-10 20:01:21 UTC (rev 1120)
@@ -31,7 +31,7 @@
 import org.infinispan.config.Configuration.HashType;
 import org.infinispan.config.Configuration.L1Type;
 import org.infinispan.config.Configuration.LockingType;
-import org.infinispan.config.Configuration.ModulesExtensionType;
+import org.infinispan.config.Configuration.QueryConfigurationBean;
 import org.infinispan.config.Configuration.StateRetrievalType;
 import org.infinispan.config.Configuration.SyncType;
 import org.infinispan.config.Configuration.TransactionType;
@@ -143,10 +143,11 @@
       defaultVisit(bean);
    }
    
-   public void visitModulesExtentionsType(ModulesExtensionType bean) {
-       defaultVisit(bean);
+   public void visitQueryConfigurationBean(QueryConfigurationBean bean) {
+      defaultVisit(bean);
    }
 
+
    public void visitSerializationType(SerializationType bean) {
       defaultVisit(bean);
    }

Modified: trunk/core/src/main/java/org/infinispan/config/Configuration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/Configuration.java	2009-11-09 23:35:31 UTC (rev 1119)
+++ trunk/core/src/main/java/org/infinispan/config/Configuration.java	2009-11-10 20:01:21 UTC (rev 1120)
@@ -29,14 +29,10 @@
 import org.infinispan.factories.annotations.Start;
 import org.infinispan.transaction.lookup.GenericTransactionManagerLookup;
 import org.infinispan.transaction.lookup.TransactionManagerLookup;
-import org.infinispan.util.Util;
 import org.infinispan.util.concurrent.IsolationLevel;
 import org.infinispan.CacheException;
-import org.w3c.dom.Element;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlTransient;
@@ -71,11 +67,7 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(propOrder={})
 public class Configuration extends AbstractNamedCacheConfigurationBean {  
-    
-   public static final String ELEMENT_MODULE_NAME = "module";
 
-   public static final String MODULE_IDENTIFIER = "name";
-
    private static final long serialVersionUID = 5553791890144997466L;
 
    // reference to a global configuration
@@ -130,7 +122,7 @@
    private DeadlockDetectionType deadlockDetection = new DeadlockDetectionType();
    
    @XmlElement
-   private ModulesExtensionType modules = new ModulesExtensionType();
+   private QueryConfigurationBean indexing = new QueryConfigurationBean();
 
    @SuppressWarnings("unused")
    @Start(priority = 1)
@@ -190,14 +182,6 @@
       this.deadlockDetection.setSpinDuration(eagerDeadlockSpinDuration);
    }
    
-   public ModuleConfigurationBean getModuleConfigurationBean(String moduleName) {
-       return modules.getModuleConfigBean(moduleName);
-   }
-   
-   public List<ModuleConfigurationBean> getModuleConfigurationBeans() {
-       return modules.moduleList;
-   }
-
    public boolean isEnableDeadlockDetection() {
       return deadlockDetection.enabled;
    }
@@ -495,6 +479,10 @@
    public boolean isInvocationBatchingEnabled() {
       return invocationBatching.enabled ;
    }
+   
+   public QueryConfigurationBean getQueryConfigurationBean() {
+      return indexing;
+   }
 
    public boolean isFetchInMemoryState() {
       return clustering.stateRetrieval.fetchInMemoryState;
@@ -609,7 +597,7 @@
       locking.accept(v);
       transaction.accept(v);
       unsafe.accept(v);
-      modules.accept(v);
+      indexing.accept(v);
       v.visitConfiguration(this);
    }
 
@@ -1810,135 +1798,76 @@
    }
    
    /**
-    * 
-    * @configRef name="modules",desc="Modules configuration."
+    * @configRef name="indexing",desc="Configures query module."
     */
-   @XmlAccessorType(XmlAccessType.FIELD)
-   public static class ModulesExtensionType extends AbstractNamedCacheConfigurationBean {
+   @XmlAccessorType(XmlAccessType.PROPERTY)
+   public static class QueryConfigurationBean extends AbstractConfigurationBean {
 
        /** The serialVersionUID */
-       private static final long serialVersionUID = 7187545782011884661L;
+       private static final long serialVersionUID = 2891683014353342549L;
 
-       @XmlElement(name = ELEMENT_MODULE_NAME)
-       private List<ModuleConfigurationBean> moduleList = new ArrayList<ModuleConfigurationBean>();
+       /** @configRef desc="enabled TODO" */
+       protected Boolean enabled = false;
 
-       @Override
-       public ModulesExtensionType clone() throws CloneNotSupportedException {
-           ModulesExtensionType dolly = (ModulesExtensionType) super.clone();
-           if (moduleList != null) {
-               dolly.moduleList = new ArrayList<ModuleConfigurationBean>();
-               for (ModuleConfigurationBean config : moduleList) {
-                   ModuleConfigurationBean clone = config.clone();
-                   dolly.moduleList.add(clone);
-               }
-           }
-           return dolly;
+       /** @configRef desc="indexLocalOnly TODO" */
+       protected Boolean indexLocalOnly = false;
+
+       public Boolean isEnabled() {
+           return enabled;
        }
-       
-       public ModuleConfigurationBean getModuleConfigBean(String moduleName) {
-           if(moduleName == null) throw new IllegalArgumentException("module name cannot be null");
-           
-           for (ModuleConfigurationBean c : moduleList) {
-               if(moduleName.equalsIgnoreCase(c.name))
-                   return c;
-           }
-           
-           return null;
+
+       @XmlAttribute
+       public void setEnabled(Boolean enabled) {
+           testImmutability("enabled");
+           this.enabled = enabled;
        }
 
-       public void accept(ConfigurationBeanVisitor v) {
-           v.visitModulesExtentionsType(this);
+       public Boolean isIndexLocalOnly() {
+           return indexLocalOnly;
        }
-       
-      public void addModuleConfigurationBean(ModuleConfigurationBean bean) {
-         moduleList.add(bean);
-      }
 
-       public List<ModuleConfigurationBean> getModuleConfigs() {
-           return moduleList;
+       @XmlAttribute
+       public void setIndexLocalOnly(Boolean indexLocalOnly) {
+           testImmutability("indexLocalOnly");
+           this.indexLocalOnly = indexLocalOnly;
        }
+       
+       public void accept(ConfigurationBeanVisitor v) {
+          v.visitQueryConfigurationBean(this);
+       }
 
        @Override
        public boolean equals(Object o) {
            if (this == o)
                return true;
-           if (!(o instanceof ModulesExtensionType))
+           if (!(o instanceof QueryConfigurationBean))
                return false;
-           ModulesExtensionType that = (ModulesExtensionType) o;
-           if (moduleList != null ? !moduleList.equals(that.moduleList) : that.moduleList != null)
+
+           QueryConfigurationBean that = (QueryConfigurationBean) o;
+
+           if (enabled != null ? !enabled.equals(that.enabled) : that.enabled != null)
                return false;
+
+           if (indexLocalOnly != null ? !indexLocalOnly.equals(that.indexLocalOnly): that.indexLocalOnly != null)
+               return false;
+
            return true;
        }
 
        @Override
        public int hashCode() {
-           return moduleList != null ? moduleList.hashCode() : 0;
+           int result = enabled != null ? enabled.hashCode() : 0;
+           result = 31 * result + (indexLocalOnly != null ? indexLocalOnly.hashCode() : 0);
+           return result;
        }
-   }
 
-   /**
-    * 
-    * @configRef name="module",desc="Configures a single custom module."
-    */
-   @XmlAccessorType(XmlAccessType.FIELD)
-   @XmlType(name = ELEMENT_MODULE_NAME)
-   public static class ModuleConfigurationBean extends AbstractNamedCacheConfigurationBean {
-
-      /** The serialVersionUID */
-      private static final long serialVersionUID = -3590043692128929343L;
-
-      /** @configRef desc="Name of the module" */
-      @XmlAttribute(name = MODULE_IDENTIFIER)
-      private String name;
-
-      @XmlTransient
-      private String configClassName;
-
-      @XmlTransient
-      private AbstractConfigurationBean configBean;
-
-      @XmlAnyElement
-      private Element child;
-
-      public String getName() {
-         return name;
-      }
-
-      @Override
-      public ModuleConfigurationBean clone() throws CloneNotSupportedException {
-         ModuleConfigurationBean dolly = (ModuleConfigurationBean) super.clone();
-         return dolly;
-      }
-
-      public Class<AbstractConfigurationBean> resolveConfigurationClass()
-               throws ClassNotFoundException {
-         if (configClassName != null) {
-            return Util.loadClass(configClassName);
-         }
-         throw new ClassNotFoundException("Class for module configuration bean is not specified");
-      }
-
-      void setConfigurationBean(AbstractConfigurationBean configBean) {
-         this.configBean = configBean;
-      }
-
-      public AbstractConfigurationBean getConfigurationBean() {
-         return configBean;
-      }
-
-      public String getConfigClassName() {
-         return configClassName;
-      }
-
-      public void setConfigClassName(String configClassName) {
-         this.configClassName = configClassName;
-      }
-
-      public void setName(String name) {
-         this.name = name;
-      }
+       @Override
+       protected boolean hasComponentStarted() {
+           return false;
+       }
    }
 
+
    /**
     * Cache replication mode.
     */

Modified: trunk/core/src/main/java/org/infinispan/config/ConfigurationBeanVisitor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/ConfigurationBeanVisitor.java	2009-11-09 23:35:31 UTC (rev 1119)
+++ trunk/core/src/main/java/org/infinispan/config/ConfigurationBeanVisitor.java	2009-11-10 20:01:21 UTC (rev 1120)
@@ -31,7 +31,7 @@
 import org.infinispan.config.Configuration.HashType;
 import org.infinispan.config.Configuration.L1Type;
 import org.infinispan.config.Configuration.LockingType;
-import org.infinispan.config.Configuration.ModulesExtensionType;
+import org.infinispan.config.Configuration.QueryConfigurationBean;
 import org.infinispan.config.Configuration.StateRetrievalType;
 import org.infinispan.config.Configuration.SyncType;
 import org.infinispan.config.Configuration.TransactionType;
@@ -96,10 +96,10 @@
    
    void visitL1Type(L1Type bean);
    
+   void visitQueryConfigurationBean(QueryConfigurationBean bean);
+   
    void visitLockingType(LockingType bean);
-   
-   void visitModulesExtentionsType(ModulesExtensionType bean);
-   
+      
    void visitStateRetrievalType(StateRetrievalType bean);
    
    void visitSyncType(SyncType bean);

Modified: trunk/core/src/main/java/org/infinispan/config/InfinispanConfiguration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/InfinispanConfiguration.java	2009-11-09 23:35:31 UTC (rev 1119)
+++ trunk/core/src/main/java/org/infinispan/config/InfinispanConfiguration.java	2009-11-10 20:01:21 UTC (rev 1120)
@@ -27,8 +27,6 @@
 import org.infinispan.util.logging.Log;
 import org.infinispan.util.logging.LogFactory;
 import org.jboss.util.StringPropertyReplacer;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Unmarshaller;
@@ -38,8 +36,6 @@
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.SchemaFactory;
 
@@ -212,25 +208,20 @@
             });
          }
          
-         InputSource source = null;
+         StreamSource source = null;
          if (skipTokenReplacement()) {
-            source = new InputSource(config);
+            source = new StreamSource(config);
          } else {
             source = replaceProperties(config);
          }
-         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-         dbf.setNamespaceAware(true);
-         DocumentBuilder db = dbf.newDocumentBuilder();
-         Document document = db.parse(source);
-         InfinispanConfiguration ic = (InfinispanConfiguration) u.unmarshal(document);     
-         
+         InfinispanConfiguration ic = (InfinispanConfiguration) u.unmarshal(source);                    
+       
          // legacy, don't ask
          GlobalConfiguration gconf = ic.parseGlobalConfiguration();
          gconf.setDefaultConfiguration(ic.parseDefaultConfiguration());
          if (cbv != null) {
             ic.accept(cbv);
          }
-         ic.accept(new ModuleConfigurationResolverVisitor(document));
          return ic;
       } catch (ConfigurationException cex) {
          throw cex;
@@ -243,7 +234,7 @@
       }
    }
 
-   private static InputSource replaceProperties(InputStream config) throws Exception{
+   private static StreamSource replaceProperties(InputStream config) throws Exception{
       BufferedReader br = new BufferedReader ( new InputStreamReader(config));
       StringBuilder w = new StringBuilder();
       String line;
@@ -259,7 +250,7 @@
             w.append(line);
          }         
       }
-      return new InputSource(new StringReader(w.toString()));
+      return new StreamSource(new StringReader(w.toString()));
    }
 
    private static boolean skipSchemaValidation() {

Deleted: trunk/core/src/main/java/org/infinispan/config/ModuleConfigurationResolverVisitor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/ModuleConfigurationResolverVisitor.java	2009-11-09 23:35:31 UTC (rev 1119)
+++ trunk/core/src/main/java/org/infinispan/config/ModuleConfigurationResolverVisitor.java	2009-11-10 20:01:21 UTC (rev 1120)
@@ -1,108 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.infinispan.config;
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Unmarshaller;
-
-import org.infinispan.config.Configuration.ModuleConfigurationBean;
-import org.infinispan.config.Configuration.ModulesExtensionType;
-import org.infinispan.util.ModuleProperties;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * ModuleConfigurationResolverVisitor resolves module's configuration class and unmarshalls it from XML.
- * 
- * 
- * @author Vladimir Blagojevic
- * @since 4.0
- */
-public class ModuleConfigurationResolverVisitor extends AbstractConfigurationBeanVisitor {
-
-    Document root;
-
-    public ModuleConfigurationResolverVisitor(Document d) {
-        if (d == null)
-            throw new IllegalArgumentException("Cannot use null document");
-        this.root = d;
-    }
-
-    @Override
-    public void visitModulesExtentionsType(ModulesExtensionType bean) {
-        List<ModuleConfigurationBean> list = bean.getModuleConfigs();
-        for (ModuleConfigurationBean module : list) {
-            try {
-                ModuleProperties props = ModuleProperties.loadModuleProperties(module.getName());
-                if (props != null) {
-                    module.setConfigClassName(props.getConfigurationClassName());
-                    Class<AbstractConfigurationBean> configurationClass = module.resolveConfigurationClass();
-                    NodeList nodeList = root.getElementsByTagName(Configuration.ELEMENT_MODULE_NAME);
-                    
-                    findModuleInXML:
-                    for (int i = nodeList.getLength() - 1; i >= 0; i--) {
-                        Element node = (Element) nodeList.item(i);
-                        String name = node.getAttribute(Configuration.MODULE_IDENTIFIER);
-                        if (name.equals(module.getName())) {
-                            NodeList childNodes = node.getChildNodes();
-                            for (int j = 0; j < childNodes.getLength(); j++) {
-                                Node item = childNodes.item(j);
-                                //find first child element
-                                if (item.getNodeType() == Node.ELEMENT_NODE) {
-                                    AbstractConfigurationBean configBean = loadConfigurationBeanModule((Element) item, configurationClass);
-                                    module.setConfigurationBean(configBean);
-                                    break findModuleInXML;
-                                }
-                            }
-                        }
-                    }
-                }
-            } catch (Exception e) {
-                throw new ConfigurationException("Could not load configuration bean for module "
-                                + module.getName(), e);
-            }
-        }
-    }  
-    
-    private AbstractConfigurationBean loadConfigurationBeanModule(Element node,
-                    Class<AbstractConfigurationBean> configurationClass) throws IOException {
-        try {
-            JAXBContext jc = JAXBContext.newInstance(configurationClass);
-            Unmarshaller u = jc.createUnmarshaller();
-            u.setSchema(null);
-            return (AbstractConfigurationBean) u.unmarshal(node);
-        } catch (ConfigurationException cex) {
-            throw cex;
-        } catch (NullPointerException npe) {
-            throw npe;
-        } catch (Exception e) {
-            IOException ioe = new IOException(e.getLocalizedMessage());
-            ioe.initCause(e);
-            throw ioe;
-        }
-    }
-}

Deleted: trunk/query/src/main/java/org/infinispan/query/config/QueryConfigurationBean.java
===================================================================
--- trunk/query/src/main/java/org/infinispan/query/config/QueryConfigurationBean.java	2009-11-09 23:35:31 UTC (rev 1119)
+++ trunk/query/src/main/java/org/infinispan/query/config/QueryConfigurationBean.java	2009-11-10 20:01:21 UTC (rev 1120)
@@ -1,91 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.infinispan.query.config;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.infinispan.config.AbstractConfigurationBean;
-
- at XmlRootElement(name = "indexing")
- at XmlAccessorType(XmlAccessType.PROPERTY)
-public class QueryConfigurationBean extends AbstractConfigurationBean {
-
-    /** The serialVersionUID */
-    private static final long serialVersionUID = 2891683014353342549L;
-
-    protected Boolean enabled;
-
-    protected Boolean indexLocalOnly;
-
-    public Boolean isEnabled() {
-        return enabled;
-    }
-
-    @XmlAttribute
-    public void setEnabled(Boolean enabled) {
-        testImmutability("enabled");
-        this.enabled = enabled;
-    }
-
-    public Boolean isIndexLocalOnly() {
-        return indexLocalOnly;
-    }
-
-    @XmlAttribute
-    public void setIndexLocalOnly(Boolean indexLocalOnly) {
-        testImmutability("indexLocalOnly");
-        this.indexLocalOnly = indexLocalOnly;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof QueryConfigurationBean))
-            return false;
-
-        QueryConfigurationBean that = (QueryConfigurationBean) o;
-
-        if (enabled != null ? !enabled.equals(that.enabled) : that.enabled != null)
-            return false;
-
-        if (indexLocalOnly != null ? !indexLocalOnly.equals(that.indexLocalOnly): that.indexLocalOnly != null)
-            return false;
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = enabled != null ? enabled.hashCode() : 0;
-        result = 31 * result + (indexLocalOnly != null ? indexLocalOnly.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    protected boolean hasComponentStarted() {
-        return false;
-    }
-}

Deleted: trunk/query/src/main/java/org/infinispan/query/config/package-info.java
===================================================================
--- trunk/query/src/main/java/org/infinispan/query/config/package-info.java	2009-11-09 23:35:31 UTC (rev 1119)
+++ trunk/query/src/main/java/org/infinispan/query/config/package-info.java	2009-11-10 20:01:21 UTC (rev 1120)
@@ -1,12 +0,0 @@
-/**
- * Cache configuration beans and parsers.
- * Need @XmlSchema annotation in order to classify all JAXB created schema elements in appropriate XML namespace
- */
- at XmlSchema(namespace = "urn:infinispan:config:query:4.0", elementFormDefault = XmlNsForm.QUALIFIED, attributeFormDefault = XmlNsForm.UNQUALIFIED, 
-         xmlns = {
-         @javax.xml.bind.annotation.XmlNs(prefix = "query", namespaceURI = "urn:infinispan:config:query:4.0"),
-         @javax.xml.bind.annotation.XmlNs(prefix = "xs", namespaceURI = "http://www.w3.org/2001/XMLSchema") })
-package org.infinispan.query.config;
-
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.*;
\ No newline at end of file

Modified: trunk/query/src/test/java/org/infinispan/query/config/QueryParsingTest.java
===================================================================
--- trunk/query/src/test/java/org/infinispan/query/config/QueryParsingTest.java	2009-11-09 23:35:31 UTC (rev 1119)
+++ trunk/query/src/test/java/org/infinispan/query/config/QueryParsingTest.java	2009-11-10 20:01:21 UTC (rev 1120)
@@ -7,7 +7,7 @@
 import org.infinispan.config.Configuration;
 import org.infinispan.config.GlobalConfiguration;
 import org.infinispan.config.InfinispanConfiguration;
-import org.infinispan.config.Configuration.ModuleConfigurationBean;
+import org.infinispan.config.Configuration.QueryConfigurationBean;
 import org.infinispan.manager.CacheManager;
 import org.infinispan.remoting.transport.jgroups.JGroupsTransport;
 import org.infinispan.test.AbstractInfinispanTest;
@@ -28,11 +28,7 @@
             "   <default>\n" +
             "      <clustering mode=\"replication\">\n" +
             "      </clustering>\n" +
-            "   <modules>\n" +
-            "     <module name=\"query\">\n"+
-            "           <query:indexing enabled=\"true\" indexLocalOnly=\"true\"/>\n" +
-            "     </module>\n" +
-            "   </modules>\n" +
+            "      <indexing enabled=\"true\" indexLocalOnly=\"true\"/>\n" +
             "   </default>\n" +
             "</infinispan>";
       
@@ -47,8 +43,7 @@
         assert gc.getClusterName().equals("demoCluster");
 
         Configuration def = c.parseDefaultConfiguration();
-        ModuleConfigurationBean extensionConfig = def.getModuleConfigurationBean("query");
-        QueryConfigurationBean bean = (QueryConfigurationBean) extensionConfig.getConfigurationBean();
+        QueryConfigurationBean bean = def.getQueryConfigurationBean();
         assert bean.isEnabled();
         assert bean.isIndexLocalOnly();
         



More information about the infinispan-commits mailing list