diff --git a/source/java/org/alfresco/web/config/ServerConfigElement.java b/source/java/org/alfresco/web/config/ServerConfigElement.java
new file mode 100644
index 0000000000..1ac4746445
--- /dev/null
+++ b/source/java/org/alfresco/web/config/ServerConfigElement.java
@@ -0,0 +1,133 @@
+/*
+ * 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.web.config;
+
+import java.util.List;
+
+import org.alfresco.config.ConfigElement;
+import org.alfresco.config.ConfigException;
+import org.alfresco.config.element.ConfigElementAdapter;
+
+/**
+ * @author David Caruana
+ */
+public class ServerConfigElement extends ConfigElementAdapter
+{
+   public static final String CONFIG_ELEMENT_ID = "server";
+   
+   private String scheme = null;
+   private String hostname = null;
+   private Integer port = null;
+      
+   /**
+    * Default constructor
+    */
+   public ServerConfigElement()
+   {
+      super(CONFIG_ELEMENT_ID);
+   }
+
+   /**
+    * Constructor
+    * 
+    * @param name Name of the element this config element represents
+    */
+   public ServerConfigElement(String name)
+   {
+      super(name);
+   }
+   
+   /**
+    * @see org.alfresco.config.element.ConfigElementAdapter#getChildren()
+    */
+   public List<ConfigElement> getChildren()
+   {
+      throw new ConfigException("Reading the Server config via the generic interfaces is not supported");
+   }
+   
+   /**
+    * @see org.alfresco.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement)
+    */
+   public ConfigElement combine(ConfigElement configElement)
+   {
+      ServerConfigElement newElement = (ServerConfigElement)configElement;
+      ServerConfigElement combinedElement = new ServerConfigElement();
+      
+      combinedElement.setScheme(newElement.getScheme());
+      combinedElement.setHostName(newElement.getHostName());
+      combinedElement.setPort(newElement.getPort());
+      
+      return combinedElement;
+   }
+   
+   /**
+    * @return  server scheme
+    */
+   public String getScheme()
+   {
+      return scheme;
+   }
+
+   /**
+    * @param scheme
+    */
+   public void setScheme(String scheme)
+   {
+      this.scheme = scheme;
+   }
+      
+   /**
+    * @return  server hostname
+    */
+   public String getHostName()
+   {
+      return hostname;
+   }
+
+   /**
+    * @param hostname
+    */
+   public void setHostName(String hostname)
+   {
+      this.hostname = hostname;
+   }
+
+   /**
+    * @return  server port
+    */
+   public Integer getPort()
+   {
+      return port;
+   }
+
+   /**
+    * @param port
+    */
+   public void setPort(Integer port)
+   {
+      this.port = port;
+   }
+
+}
diff --git a/source/java/org/alfresco/web/config/ServerElementReader.java b/source/java/org/alfresco/web/config/ServerElementReader.java
new file mode 100644
index 0000000000..b79b653fea
--- /dev/null
+++ b/source/java/org/alfresco/web/config/ServerElementReader.java
@@ -0,0 +1,83 @@
+/*
+ * 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.web.config;
+
+import org.alfresco.config.ConfigElement;
+import org.alfresco.config.ConfigException;
+import org.alfresco.config.xml.elementreader.ConfigElementReader;
+import org.dom4j.Element;
+
+/**
+ * @author David Caruana
+ */
+public class ServerElementReader implements ConfigElementReader
+{
+   public static final String ELEMENT_SCHEME = "scheme";
+   public static final String ELEMENT_HOSTNAME = "hostname";
+   public static final String ELEMENT_PORT = "port";
+   
+   /**
+    * @see org.alfresco.config.xml.elementreader.ConfigElementReader#parse(org.dom4j.Element)
+    */
+   @SuppressWarnings("unchecked")
+   public ConfigElement parse(Element element)
+   {
+      ServerConfigElement configElement = new ServerConfigElement();
+      
+      if (element != null)
+      {
+         if (ServerConfigElement.CONFIG_ELEMENT_ID.equals(element.getName()) == false)
+         {
+            throw new ConfigException("ServerElementReader can only parse config elements of type '" + ServerConfigElement.CONFIG_ELEMENT_ID + "'");
+         }
+         
+         Element schemeElem = element.element(ELEMENT_SCHEME);
+         if (schemeElem != null)
+         {
+             configElement.setScheme(schemeElem.getTextTrim());
+         }
+         Element hostnameElem = element.element(ELEMENT_HOSTNAME);
+         if (hostnameElem != null)
+         {
+             configElement.setHostName(hostnameElem.getTextTrim());
+         }
+         Element portElem = element.element(ELEMENT_PORT);
+         if (portElem != null)
+         {
+             try
+             {
+                 Integer port = new Integer(portElem.getTextTrim());
+                 configElement.setPort(port);
+             }
+             catch(NumberFormatException e)
+             {
+                 throw new ConfigException("Server port is not a number", e);
+             }
+         }
+      }
+      
+      return configElement;
+   }
+}