Added DAOs. Attribute query objects seem to be able to generate hibernate predicates.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5467 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/attributes/AttrQueryHelperImpl.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing
+ */
+
+package org.alfresco.repo.attributes;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.service.cmr.attributes.AttrQueryHelper;
+
+/**
+ * Implementation of query helper for building predicates.
+ * @author britt
+ */
+public class AttrQueryHelperImpl implements AttrQueryHelper
+{
+    private int fSuffix;
+    
+    private Map<String, String> fParameters;
+    
+    public AttrQueryHelperImpl()
+    {
+        fSuffix = 0;
+        fParameters = new HashMap<String, String>();
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.attributes.AttrQueryHelper#getNextSuffix()
+     */
+    public int getNextSuffix()
+    {
+        return fSuffix++;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.attributes.AttrQueryHelper#getParameters()
+     */
+    public Map<String, String> getParameters()
+    {
+        return fParameters;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.attributes.AttrQueryHelper#setParameter(java.lang.String, java.lang.String)
+     */
+    public void setParameter(String name, String value)
+    {
+        fParameters.put(name, value);
+    }
+}

source/java/org/alfresco/repo/attributes/AttrQueryTest.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing
+ */
+
+package org.alfresco.repo.attributes;
+
+import org.alfresco.service.cmr.attributes.AttrAndQuery;
+import org.alfresco.service.cmr.attributes.AttrNotQuery;
+import org.alfresco.service.cmr.attributes.AttrOrQuery;
+import org.alfresco.service.cmr.attributes.AttrQuery;
+import org.alfresco.service.cmr.attributes.AttrQueryGT;
+import org.alfresco.service.cmr.attributes.AttrQueryHelper;
+import org.alfresco.service.cmr.attributes.AttrQueryLT;
+import org.alfresco.service.cmr.attributes.AttrQueryLike;
+
+import junit.framework.TestCase;
+
+/**
+ * Tests of AttrQueries.
+ * @author britt
+ */
+public class AttrQueryTest extends TestCase
+{
+    private AttrQueryHelper fHelper;
+
+    /* (non-Javadoc)
+     * @see junit.framework.TestCase#setUp()
+     */
+    @Override
+    protected void setUp() throws Exception
+    {
+        fHelper = new AttrQueryHelperImpl();
+    }
+    
+    /**
+     * Do all the testing in one.
+     */
+    public void testAll()
+    {
+        AttrQuery query = 
+            new AttrOrQuery(
+                new AttrAndQuery(new AttrQueryGT("cat"), new AttrQueryLT("hat")),
+                new AttrNotQuery(new AttrQueryLike("fur%")));
+        String predicate = query.getPredicate(fHelper);
+        System.out.println(predicate);
+        System.out.println(fHelper.getParameters());
+        assertEquals("((me.key > :name0 and me.key < :name1) or (not me.key like :name2))",
+                     predicate);
+        assertEquals("cat", fHelper.getParameters().get(":name0"));
+        assertEquals("hat", fHelper.getParameters().get(":name1"));
+        assertEquals("fur%", fHelper.getParameters().get(":name2"));
+    }
+}

source/java/org/alfresco/repo/attributes/GlobalAttributeEntry.java

@@ -31,5 +31,13 @@ package org.alfresco.repo.attributes;
  */
 public interface GlobalAttributeEntry
 {
-    // TODO This is a stub and needs to be completed.
+    /**
+     * Get the name of the entry.
+     */
+    public String getName();
+    
+    /**
+     * Get the Attribute.
+     */
+    public Attribute getAttribute();
 }

source/java/org/alfresco/repo/attributes/GlobalAttributeEntryImpl.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing
+ */
+
+package org.alfresco.repo.attributes;
+
+/**
+ * @author britt
+ *
+ */
+public class GlobalAttributeEntryImpl implements GlobalAttributeEntry
+{
+    private String fName;
+    
+    private Attribute fAttribute;
+    
+    public GlobalAttributeEntryImpl(String name, Attribute attr)
+    {
+        fName = name;
+        fAttribute = attr;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.attributes.GlobalAttributeEntry#getAttribute()
+     */
+    public Attribute getAttribute()
+    {
+        return fAttribute;
+    }
+
+    /**
+     * Setter.
+     */
+    public void setAttribute(Attribute attr)
+    {
+        fAttribute = attr;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.attributes.GlobalAttributeEntry#getName()
+     */
+    public String getName()
+    {
+        return fName;
+    }
+    
+    /**
+     * Setter.
+     */
+    public void setName(String name)
+    {
+        fName = name;
+    }
+}

source/java/org/alfresco/repo/attributes/MapAttributeImpl.java

@@ -25,10 +25,17 @@
 
 package org.alfresco.repo.attributes;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
 
+import org.alfresco.repo.avm.AVMDAOs;
+
 /**
  * @author britt
  *
@@ -53,8 +60,7 @@ public class MapAttributeImpl extends AttributeImpl implements MapAttribute
     @Override
     public void clear()
     {
-        // TODO Auto-generated method stub
+        AVMDAOs.Instance().fMapEntryDAO.delete(this);
-        super.clear();
     }
 
     /* (non-Javadoc)
@@ -63,8 +69,13 @@ public class MapAttributeImpl extends AttributeImpl implements MapAttribute
     @Override
     public Set<Entry<String, Attribute>> entrySet()
     {
-        // TODO Auto-generated method stub
+        List<MapEntry> entries = AVMDAOs.Instance().fMapEntryDAO.get(this);
-        return super.entrySet();
+        Map<String, Attribute> map = new HashMap<String, Attribute>();
+        for (MapEntry entry : entries)
+        {
+            map.put(entry.getKey(), entry.getAttribute());
+        }
+        return map.entrySet();
     }
 
     /* (non-Javadoc)
@@ -73,8 +84,7 @@ public class MapAttributeImpl extends AttributeImpl implements MapAttribute
     @Override
     public Attribute get(String key)
     {
-        // TODO Auto-generated method stub
+        return AVMDAOs.Instance().fMapEntryDAO.get(this, key).getAttribute();
-        return super.get(key);
     }
 
     /* (non-Javadoc)
@@ -83,8 +93,13 @@ public class MapAttributeImpl extends AttributeImpl implements MapAttribute
     @Override
     public Set<String> keySet()
     {
-        // TODO Auto-generated method stub
+        List<MapEntry> entries = AVMDAOs.Instance().fMapEntryDAO.get(this);
-        return super.keySet();
+        Set<String> keys = new HashSet<String>();
+        for (MapEntry entry : entries)
+        {
+            keys.add(entry.getKey());
+        }
+        return keys;
     }
 
     /* (non-Javadoc)
@@ -93,8 +108,8 @@ public class MapAttributeImpl extends AttributeImpl implements MapAttribute
     @Override
     public void put(String key, Attribute value)
     {
-        // TODO Auto-generated method stub
+        MapEntry entry = new MapEntryImpl(this, key, value);
-        super.put(key, value);
+        AVMDAOs.Instance().fMapEntryDAO.save(entry);
     }
 
     /* (non-Javadoc)
@@ -103,8 +118,11 @@ public class MapAttributeImpl extends AttributeImpl implements MapAttribute
     @Override
     public void remove(String key)
     {
-        // TODO Auto-generated method stub
+        MapEntry entry = AVMDAOs.Instance().fMapEntryDAO.get(this, key);
-        super.remove(key);
+        if (entry != null)
+        {
+            AVMDAOs.Instance().fMapEntryDAO.delete(entry);
+        }
     }
 
     /* (non-Javadoc)
@@ -113,7 +131,12 @@ public class MapAttributeImpl extends AttributeImpl implements MapAttribute
     @Override
     public Collection<Attribute> values()
     {
-        // TODO Auto-generated method stub
+        List<MapEntry> entries = AVMDAOs.Instance().fMapEntryDAO.get(this);
-        return super.values();
+        List<Attribute> attrs = new ArrayList<Attribute>();
+        for (MapEntry entry : entries)
+        {
+            attrs.add(entry.getAttribute());
+        }
+        return attrs;
     }
 }

source/java/org/alfresco/repo/attributes/MapEntry.java

@@ -31,5 +31,27 @@ package org.alfresco.repo.attributes;
  */
 public interface MapEntry
 {
-    // TODO This is a stub. Fix it.
+    /**
+     * Get the primary key.
+     * @return The key.
+     */
+    public long getId();
+    
+    /**
+     * Get the map attribute that this entry belongs to.
+     * @return The map attribute.
+     */
+    public MapAttribute getMap();
+    
+    /**
+     * Get the lookup key for this entry.
+     * @return The key.
+     */
+    public String getKey();
+    
+    /**
+     * Get the value attribute.
+     * @return The value attribute.
+     */
+    public Attribute getAttribute();
 }

source/java/org/alfresco/repo/attributes/MapEntryImpl.java

@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing
+ */
+
+package org.alfresco.repo.attributes;
+
+/**
+ * Implementation of map entries.
+ * @author britt
+ */
+public class MapEntryImpl implements MapEntry
+{
+    private long fID;
+    
+    private MapAttribute fMap;
+    
+    private String fKey;
+    
+    private Attribute fAttribute;
+    
+    public MapEntryImpl(MapAttribute map,
+                        String key,
+                        Attribute attribute)
+    {
+        fMap = map;
+        fKey = key;
+        fAttribute = attribute;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.attributes.MapEntry#getAttribute()
+     */
+    public Attribute getAttribute()
+    {
+        return fAttribute;
+    }
+
+    /**
+     * Set the attribute.
+     * @param attr The attribute.
+     */
+    public void setAttribute(Attribute attr)
+    {
+        fAttribute = attr;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.attributes.MapEntry#getId()
+     */
+    public long getId()
+    {
+        return fID;
+    }
+
+    /**
+     * Setter.
+     */
+    public void setId(long id)
+    {
+        fID = id;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.attributes.MapEntry#getKey()
+     */
+    public String getKey()
+    {
+        return fKey;
+    }
+    
+    /**
+     * Setter.
+     */
+    public void setKey(String key)
+    {
+        fKey = key;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.attributes.MapEntry#getMap()
+     */
+    public MapAttribute getMap()
+    {
+        return fMap;
+    }
+    
+    /**
+     * Setter.
+     */
+    public void setMap(MapAttribute map)
+    {
+        fMap = map;
+    }
+}

source/java/org/alfresco/repo/attributes/hibernate/AttributeDAOHibernate.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing
+ */
+
+package org.alfresco.repo.attributes.hibernate;
+
+import java.util.List;
+
+import org.alfresco.repo.attributes.Attribute;
+import org.alfresco.repo.attributes.AttributeDAO;
+import org.alfresco.service.cmr.attributes.AttrQuery;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
+
+/**
+ * Hibernate implementation of persistence for Attributes.
+ * @author britt
+ */
+public class AttributeDAOHibernate extends HibernateDaoSupport implements
+        AttributeDAO
+{
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.attributes.AttributeDAO#delete(org.alfresco.repo.attributes.Attribute)
+     */
+    public void delete(Attribute attr)
+    {
+        getSession().delete(attr);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.attributes.AttributeDAO#find(java.lang.String, org.alfresco.service.cmr.attributes.AttrQuery)
+     */
+    public List<Attribute> find(String path, AttrQuery query)
+    {
+        // TODO Need to implement query processing.
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.attributes.AttributeDAO#save(org.alfresco.repo.attributes.Attribute)
+     */
+    public void save(Attribute attr)
+    {
+        getSession().save(attr);
+    }
+}

source/java/org/alfresco/repo/attributes/hibernate/Attributes.hbm.xml

@@ -86,6 +86,6 @@
             <many-to-one class="MapAttributeImpl" name="map" column="map_id"/>
             <property name="key" type="string" length="160" column="key" index="map_key_index"/>
         </natural-id>
-        <many-to-one class="AttributeImpl" name="attribute" columne="attribute_id"/>
+        <many-to-one class="AttributeImpl" name="attribute" column="attribute_id"/>
     </class>        
 </hibernate-mapping>

source/java/org/alfresco/repo/attributes/hibernate/GlobalAttributeEntryDAOHibernate.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing
+ */
+
+package org.alfresco.repo.attributes.hibernate;
+
+import org.alfresco.repo.attributes.Attribute;
+import org.alfresco.repo.attributes.GlobalAttributeEntry;
+import org.alfresco.repo.attributes.GlobalAttributeEntryDAO;
+import org.alfresco.repo.attributes.GlobalAttributeEntryImpl;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
+
+/**
+ * Hibernate implementation of Global Attribute Entries.
+ * @author britt
+ */
+public class GlobalAttributeEntryDAOHibernate extends HibernateDaoSupport
+        implements GlobalAttributeEntryDAO
+{
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.attributes.GlobalAttributeEntryDAO#delete(org.alfresco.repo.attributes.GlobalAttributeEntry)
+     */
+    public void delete(GlobalAttributeEntry entry)
+    {
+        getSession().delete(entry);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.attributes.GlobalAttributeEntryDAO#delete(java.lang.String)
+     */
+    public void delete(String name)
+    {
+        delete((GlobalAttributeEntry)getSession().get(GlobalAttributeEntryImpl.class, name));
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.attributes.GlobalAttributeEntryDAO#get(java.lang.String)
+     */
+    public Attribute get(String name)
+    {
+        GlobalAttributeEntry entry =
+            (GlobalAttributeEntry)getSession().get(GlobalAttributeEntryImpl.class, name);
+        return entry.getAttribute();
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.attributes.GlobalAttributeEntryDAO#save(org.alfresco.repo.attributes.GlobalAttributeEntry)
+     */
+    public void save(GlobalAttributeEntry entry)
+    {
+        getSession().save(entry);
+    }
+}

source/java/org/alfresco/repo/attributes/hibernate/MapEntryDAOHibernate.java

@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing
+ */
+
+package org.alfresco.repo.attributes.hibernate;
+
+import java.util.List;
+
+import org.alfresco.repo.attributes.MapAttribute;
+import org.alfresco.repo.attributes.MapEntry;
+import org.alfresco.repo.attributes.MapEntryDAO;
+import org.hibernate.Query;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
+
+/**
+ * Hibernate implementation of persistence for MapEntries.
+ * @author britt
+ */
+public class MapEntryDAOHibernate extends HibernateDaoSupport implements
+        MapEntryDAO
+{
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.attributes.MapEntryDAO#delete(org.alfresco.repo.attributes.MapEntry)
+     */
+    public void delete(MapEntry entry)
+    {
+        getSession().delete(entry);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.attributes.MapEntryDAO#delete(org.alfresco.repo.attributes.MapAttribute)
+     */
+    public void delete(MapAttribute mapAttr)
+    {
+        Query query = getSession().createQuery("delete from MapEntryImpl me where me.map = :map");
+        query.setEntity("map", mapAttr);
+        query.executeUpdate();
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.attributes.MapEntryDAO#get(org.alfresco.repo.attributes.MapAttribute, java.lang.String)
+     */
+    public MapEntry get(MapAttribute mapAttr, String key)
+    {
+        Query query = getSession().createQuery("from MapEntryImpl me where me.map = :map and me.key = :key");
+        query.setEntity("map", mapAttr);
+        query.setParameter("key", key);
+        return (MapEntry)query.uniqueResult();
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.attributes.MapEntryDAO#get(org.alfresco.repo.attributes.MapAttribute)
+     */
+    @SuppressWarnings("unchecked")
+    public List<MapEntry> get(MapAttribute mapAttr)
+    {
+        Query query = getSession().createQuery("from MapEntryImpl me where me.map = :map");
+        query.setEntity("map", mapAttr);
+        return (List<MapEntry>)query.list();
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.attributes.MapEntryDAO#save(org.alfresco.repo.attributes.MapEntry)
+     */
+    public void save(MapEntry entry)
+    {
+        getSession().save(entry);
+    }
+}

source/java/org/alfresco/repo/avm/AVMDAOs.java

@@ -3,6 +3,10 @@
  */
 package org.alfresco.repo.avm;
 
+import org.alfresco.repo.attributes.AttributeDAO;
+import org.alfresco.repo.attributes.GlobalAttributeEntryDAO;
+import org.alfresco.repo.attributes.MapEntryDAO;
+
 /**
  * This is the (shudder) global context for AVM.  It a rendezvous
  * point for access to needed global instances.
@@ -79,6 +83,12 @@ public class AVMDAOs
      */
     public AVMAspectNameDAO fAVMAspectNameDAO;
     
+    public AttributeDAO fAttributeDAO;
+    
+    public MapEntryDAO fMapEntryDAO;
+    
+    public GlobalAttributeEntryDAO fGlobalAttributeEntryDAO;
+    
     /**
      * @param nodeDAO the fAVMNodeDAO to set
      */
@@ -149,4 +159,19 @@ public class AVMDAOs
     {
         fAVMAspectNameDAO = avmAspectNameDAO;
     }
+    
+    public void setAttributeDAO(AttributeDAO dao)
+    {
+        fAttributeDAO = dao;
+    }
+    
+    public void setMapEntryDAO(MapEntryDAO dao)
+    {
+        fMapEntryDAO = dao;
+    }
+    
+    public void setGlobalAttributeEntryDAO(GlobalAttributeEntryDAO dao)
+    {
+        fGlobalAttributeEntryDAO = dao;
+    }
 }

source/java/org/alfresco/service/cmr/attributes/AttrAndQuery.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing
+ */
+
+package org.alfresco.service.cmr.attributes;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * And aggregate query.
+ * @author britt
+ */
+public class AttrAndQuery extends AttrQuery
+{
+    private static final long serialVersionUID = 5452165715643751502L;
+
+    private List<AttrQuery> fSubQueries;
+    
+    public AttrAndQuery(List<AttrQuery> queries)
+    {
+        fSubQueries = queries;
+    }
+    
+    public AttrAndQuery(AttrQuery... queries)
+    {
+        fSubQueries = new ArrayList<AttrQuery>();
+        for (AttrQuery query : queries)
+        {
+            fSubQueries.add(query);
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.attributes.AttrQuery#getPredicate(org.alfresco.service.cmr.attributes.AttrQueryHelper)
+     */
+    @Override
+    public String getPredicate(AttrQueryHelper helper)
+    {
+        StringBuilder builder = new StringBuilder();
+        builder.append('(');
+        for (int i = 0; i < fSubQueries.size() - 1; i++)
+        {
+            builder.append(fSubQueries.get(i).getPredicate(helper));
+            builder.append(" and ");
+        }
+        builder.append(fSubQueries.get(fSubQueries.size() - 1).getPredicate(helper));
+        builder.append(')');
+        return builder.toString();
+    }
+}

source/java/org/alfresco/service/cmr/attributes/AttrNotQuery.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing
+ */
+
+package org.alfresco.service.cmr.attributes;
+
+/**
+ * The negation of a sub query.
+ * @author britt
+ */
+public class AttrNotQuery extends AttrQuery
+{
+    private static final long serialVersionUID = -7798693028454128695L;
+
+    private AttrQuery fSubQuery;
+
+    public AttrNotQuery(AttrQuery sub)
+    {
+        fSubQuery = sub;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.attributes.AttrQuery#getPredicate(org.alfresco.service.cmr.attributes.AttrQueryHelper)
+     */
+    @Override
+    public String getPredicate(AttrQueryHelper helper)
+    {
+        StringBuilder builder = new StringBuilder();
+        builder.append("(not ");
+        builder.append(fSubQuery.getPredicate(helper));
+        builder.append(')');
+        return builder.toString();
+    }
+}

source/java/org/alfresco/service/cmr/attributes/AttrOrQuery.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing
+ */
+
+package org.alfresco.service.cmr.attributes;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author britt
+ *
+ */
+public class AttrOrQuery extends AttrQuery
+{
+    private static final long serialVersionUID = 2295618804175882547L;
+
+    private List<AttrQuery> fSubQueries;
+    
+    public AttrOrQuery(List<AttrQuery> queries)
+    {
+        fSubQueries = queries;
+    }
+    
+    public AttrOrQuery(AttrQuery... queries)
+    {
+        fSubQueries = new ArrayList<AttrQuery>();
+        for (AttrQuery query : queries)
+        {
+            fSubQueries.add(query);
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.attributes.AttrQuery#getPredicate(int)
+     */
+    @Override
+    public String getPredicate(AttrQueryHelper helper)
+    {
+        StringBuilder builder = new StringBuilder();
+        builder.append('(');
+        for (int i = 0; i < fSubQueries.size() - 1; i++)
+        {
+            builder.append(fSubQueries.get(i).getPredicate(helper));
+            builder.append(" or ");
+        }
+        builder.append(fSubQueries.get(fSubQueries.size() - 1).getPredicate(helper));
+        builder.append(')');
+        return builder.toString();
+    }
+}

source/java/org/alfresco/service/cmr/attributes/AttrQuery.java

@@ -27,162 +27,26 @@ package org.alfresco.service.cmr.attributes;
 
 import java.io.Serializable;
 
-import org.alfresco.repo.attributes.Attribute;
-import org.alfresco.repo.attributes.AttributeUnsupportedQueryType;
-
 /**
  * Abstract base class for Attribute Query nodes.
  * @author britt
  */
 public abstract class AttrQuery implements Serializable
 {
-    protected Attribute fValue;
+    protected String fValue;
     
-    protected String fAttrName;
+    protected AttrQuery()
+    {
+    }
     
-    protected String fEntityName;
+    protected AttrQuery(String value)
-    
-    protected AttrQuery(Attribute value)
     {
         fValue = value;
-        switch (fValue.getType())
-        {
-            case BOOLEAN :
-            {
-                fAttrName = "booleanValue";
-                fEntityName = "BooleanAttributeImpl";
-                break;
-            }
-            case BYTE :
-            {
-                fAttrName = "byteValue";
-                fEntityName = "ByteAttributeImpl";
-                break;
-            }
-            case SHORT :
-            {
-                fAttrName = "shortValue";
-                fEntityName = "ShortAttributeImpl";
-                break;
-            }
-            case INT :
-            {
-                fAttrName = "intValue";
-                fEntityName = "IntAttributeImpl";
-                break;
-            }
-            case LONG :
-            {
-                fAttrName = "longValue";
-                fEntityName = "LongAttributeImpl";
-                break;
-            }
-            case FLOAT :
-            {
-                fAttrName = "floatValue";
-                fEntityName = "FloatAttributeImpl";
-                break;
-            }
-            case DOUBLE :
-            {
-                fAttrName = "doubleValue";
-                fEntityName = "DoubleAttributeImpl";
-                break;
-            }
-            case STRING :
-            {
-                fAttrName = "stringValue";
-                fEntityName = "StringAttributeImpl";
-                break;
-            }
-            case BLOB :
-            {
-                fAttrName = "blobValue";
-                fEntityName = "BlobValueImpl";
-                break;
-            }
-            case SERIALIZABLE :
-            {
-                fAttrName = "serializableValue";
-                fEntityName = "SerializableValueImpl";
-                break;                    
-            }
-            case MAP :
-            {
-                fAttrName = "mapValue";  // This doesn't need to make sense.
-                fEntityName = "MapValueImpl"; // Nor does this.
-            }
-        }
     }
     
     /**
      * Get the predicate that goes into a Hibernate query.
      * @return The predicate.
      */
-    public abstract String getPredicate();
+    public abstract String getPredicate(AttrQueryHelper helper);
-    
-    /**
-     * Get the entity that this predicate applies to.
-     * @return The entity name.
-     */
-    public String getEntity()
-    {
-        return fEntityName;
-    }
-    
-    protected String getValue()
-    {
-        switch (fValue.getType())
-        {
-            case BOOLEAN :
-            {
-                return fValue.getBooleanValue() ? "1" : "0";
-            }
-            case BYTE :
-            {
-                return Byte.toString(fValue.getByteValue());
-            }
-            case SHORT :
-            {
-                return Short.toString(fValue.getShortValue());
-            }
-            case INT :
-            {
-                return Integer.toString(fValue.getIntValue());
-            }
-            case LONG :
-            {
-                return Long.toString(fValue.getLongValue());
-            }
-            case FLOAT :
-            {
-                return Float.toString(fValue.getFloatValue());
-            }
-            case DOUBLE :
-            {
-                return Double.toString(fValue.getDoubleValue());
-            }
-            case STRING :
-            {
-                StringBuilder builder = new StringBuilder();
-                char[] chars = fValue.getStringValue().toCharArray();
-                builder.append('\'');
-                for (char c : chars)
-                {
-                    if (c == '\'')
-                    {
-                        builder.append("\\'");
-                        continue;
-                    }
-                    builder.append(c);
-                }
-                builder.append('\'');
-                return builder.toString();
-            }
-            default :
-            {
-                throw new AttributeUnsupportedQueryType(fValue.getType().name());
-            }
-        }
-    }
 }

source/java/org/alfresco/service/cmr/attributes/AttrQueryEquals.java

@@ -25,9 +25,6 @@
 
 package org.alfresco.service.cmr.attributes;
 
-import org.alfresco.repo.attributes.Attribute;
-import org.alfresco.repo.attributes.AttributeUnsupportedQueryType;
-
 /**
  * The equals predicate.
  * @author britt
@@ -36,17 +33,19 @@ public class AttrQueryEquals extends AttrQuery
 {
     private static final long serialVersionUID = 2180915053803244460L;
 
-    public AttrQueryEquals(Attribute value)
+    public AttrQueryEquals(String name)
     {
-        super(value);
+        super(name);
     }
     
     /* (non-Javadoc)
      * @see org.alfresco.service.cmr.attributes.AttrQuery#getPredicate()
      */
     @Override
-    public String getPredicate() 
+    public String getPredicate(AttrQueryHelper helper) 
     {
-        return "ent." + fAttrName + " = " + getValue();
+        String name = ":name" + helper.getNextSuffix();
+        helper.setParameter(name, fValue);
+        return "me.key = " + name;
     }
 }

source/java/org/alfresco/service/cmr/attributes/AttrQueryGT.java

@@ -25,8 +25,6 @@
 
 package org.alfresco.service.cmr.attributes;
 
-import org.alfresco.repo.attributes.Attribute;
-
 /**
  * Greater than query.
  * @author britt
@@ -36,19 +34,21 @@ public class AttrQueryGT extends AttrQuery
     private static final long serialVersionUID = 3171792743187950462L;
 
     /**
-     * @param value
+     * @param name
      */
-    public AttrQueryGT(Attribute value) 
+    public AttrQueryGT(String name) 
     {
-        super(value);
+        super(name);
     }
 
     /* (non-Javadoc)
      * @see org.alfresco.service.cmr.attributes.AttrQuery#getPredicate()
      */
     @Override
-    public String getPredicate() 
+    public String getPredicate(AttrQueryHelper helper) 
     {
-        return "ent." + fAttrName + " > " + getValue();
+        String name = ":name" + helper.getNextSuffix();
+        helper.setParameter(name, fValue);
+        return "me.key > " + name;
     }
 }

source/java/org/alfresco/service/cmr/attributes/AttrQueryGTE.java

@@ -25,7 +25,6 @@
 
 package org.alfresco.service.cmr.attributes;
 
-import org.alfresco.repo.attributes.Attribute;
 
 /**
  * Greater than or equals predicate.
@@ -36,19 +35,21 @@ public class AttrQueryGTE extends AttrQuery
     private static final long serialVersionUID = -7957078449719425057L;
 
     /**
-     * @param value
+     * @param name
      */
-    public AttrQueryGTE(Attribute value) 
+    public AttrQueryGTE(String name) 
     {
-        super(value);
+        super(name);
     }
 
     /* (non-Javadoc)
      * @see org.alfresco.service.cmr.attributes.AttrQuery#getPredicate()
      */
     @Override
-    public String getPredicate() 
+    public String getPredicate(AttrQueryHelper helper) 
     {
-        return "ent." + fAttrName + " >= " + getValue();
+        String name = ":name" + helper.getNextSuffix();
+        helper.setParameter(name, fValue);
+        return "me.key >= " + name;
     }
 }

source/java/org/alfresco/service/cmr/attributes/AttrQueryHelper.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing
+ */
+
+package org.alfresco.service.cmr.attributes;
+
+import java.util.Map;
+
+/**
+ * An implementation of this is passed into an AttrQuery to aid it
+ * in generating the actual predicate.
+ * @author britt
+ */
+public interface AttrQueryHelper
+{
+    /**
+     * Get the next integer suffix for named arguments.
+     * @return The next integer suffix.
+     */
+    public int getNextSuffix();
+    
+    /**
+     * As an AttrQuery is generating the predicate, it
+     * tells this helper about its parameter names and bindings.
+     * @param name The name of the parameter
+     * @param value The binding.
+     */
+    public void setParameter(String name, String value);
+    
+    /**
+     * Get the parameter bindings for a generated predicate.
+     * @return The parameter bindings.
+     */
+    public Map<String, String> getParameters();
+}

source/java/org/alfresco/service/cmr/attributes/AttrQueryLT.java

@@ -25,8 +25,6 @@
 
 package org.alfresco.service.cmr.attributes;
 
-import org.alfresco.repo.attributes.Attribute;
-
 /**
  * Query a less than condition.
  * @author britt
@@ -36,19 +34,21 @@ public class AttrQueryLT extends AttrQuery
     private static final long serialVersionUID = -2385160490778425115L;
 
     /**
-     * @param value
+     * @param name
      */
-    public AttrQueryLT(Attribute value) 
+    public AttrQueryLT(String name) 
     {
-        super(value);
+        super(name);
     }
 
     /* (non-Javadoc)
      * @see org.alfresco.service.cmr.attributes.AttrQuery#getPredicate()
      */
     @Override
-    public String getPredicate() 
+    public String getPredicate(AttrQueryHelper helper) 
     {
-        return "ent." + fAttrName + " < " + getValue();
+        String name = ":name" + helper.getNextSuffix();
+        helper.setParameter(name, fValue);
+        return "me.key < " + name;
     }
 }

source/java/org/alfresco/service/cmr/attributes/AttrQueryLTE.java

@@ -25,8 +25,6 @@
 
 package org.alfresco.service.cmr.attributes;
 
-import org.alfresco.repo.attributes.Attribute;
-
 /**
  * Less than or equal query
  * @author britt
@@ -38,7 +36,7 @@ public class AttrQueryLTE extends AttrQuery
     /**
      * @param value
      */
-    public AttrQueryLTE(Attribute value) 
+    public AttrQueryLTE(String value) 
     {
         super(value);
     }
@@ -47,8 +45,10 @@ public class AttrQueryLTE extends AttrQuery
      * @see org.alfresco.service.cmr.attributes.AttrQuery#getPredicate()
      */
     @Override
-    public String getPredicate() 
+    public String getPredicate(AttrQueryHelper helper)
     {
-        return "ent." + fAttrName + " <= " + getValue();
+        String name = ":name" + helper.getNextSuffix();
+        helper.setParameter(name, fValue);
+        return "me.key <= " + name;
     }
 }

source/java/org/alfresco/service/cmr/attributes/AttrQueryLike.java

@@ -25,8 +25,6 @@
 
 package org.alfresco.service.cmr.attributes;
 
-import org.alfresco.repo.attributes.Attribute;
-import org.alfresco.repo.attributes.AttributeUnsupportedQueryType;
 
 /**
  * A "like" query.
@@ -37,23 +35,21 @@ public class AttrQueryLike extends AttrQuery
     private static final long serialVersionUID = -984397014171296687L;
 
     /**
-     * @param value
+     * @param name
      */
-    public AttrQueryLike(Attribute value) 
+    public AttrQueryLike(String name) 
     {
-        super(value);
+        super(name);
     }
 
     /* (non-Javadoc)
      * @see org.alfresco.service.cmr.attributes.AttrQuery#getPredicate()
      */
     @Override
-    public String getPredicate() 
+    public String getPredicate(AttrQueryHelper helper) 
     {
-        if (fValue.getType() != Attribute.Type.STRING)
+        String name = ":name" + helper.getNextSuffix();
-        {
+        helper.setParameter(name, fValue);
-            throw new AttributeUnsupportedQueryType(fValue.getType().name());
+        return "me.key like " + name;
-        }
-        return "ent." + fAttrName + " like " + getValue();
     }
 }

source/java/org/alfresco/service/cmr/attributes/AttrQueryNE.java

@@ -25,8 +25,6 @@
 
 package org.alfresco.service.cmr.attributes;
 
-import org.alfresco.repo.attributes.Attribute;
-
 /**
  * Not equals query.
  * @author britt
@@ -36,19 +34,21 @@ public class AttrQueryNE extends AttrQuery
     private static final long serialVersionUID = 103038173214972590L;
 
     /**
-     * @param value
+     * @param name
      */
-    public AttrQueryNE(Attribute value) 
+    public AttrQueryNE(String name) 
     {
-        super(value);
+        super(name);
     }
 
     /* (non-Javadoc)
      * @see org.alfresco.service.cmr.attributes.AttrQuery#getPredicate()
      */
     @Override
-    public String getPredicate() 
+    public String getPredicate(AttrQueryHelper helper) 
     {
-        return "ent." + fAttrName + " <> " + getValue();
+        String name = ":name" + helper.getNextSuffix();
+        helper.setParameter(name, fValue);
+        return "me.key <> " + name;
     }
 }

source/java/org/alfresco/service/cmr/attributes/AttributeService.java

@@ -27,6 +27,8 @@ package org.alfresco.service.cmr.attributes;
 
 import java.util.List;
 
+import org.alfresco.repo.attributes.Attribute;
+
 /**
  * This provides services for reading, writing, and querying global attributes.
  * @author britt
@@ -35,24 +37,23 @@ public interface AttributeService
 {
     /**
      * Get a Global Attribute.
-     * @param path The path of the Attribute. Attribute paths are of the form
+     * @param path The path of the Attribute.
-     * {name}({name}|[index])*
      * @return The value of the attribute or null.
      */
-    public Object getValue(String path);
+    public Attribute getAttribute(String path);
     
     /**
      * Set a Global Attribute. Overwrites if it exists.
      * @param name The name of the Attribute.
      * @param value The value to set.
      */
-    public void setValue(String path, Object value);
+    public void setAttribute(String path, Attribute value);
     
     /**
      * Remove an Attribute.
      * @param name The name of the Attribute.
      */
-    public void removeValue(String path);
+    public void removeAttribute(String path);
 
     /**
      * Query for a list of attributes which are contained in the container
@@ -61,5 +62,5 @@ public interface AttributeService
      * @param query
      * @return A List of matching attributes.
      */
-    public List<Object> query(String path, AttrQuery query);
+    public List<Attribute> query(String path, AttrQuery query);
 }