diff --git a/config/alfresco/authentication-services-context.xml b/config/alfresco/authentication-services-context.xml
index 2f8bce9be4..cf27fc2106 100644
--- a/config/alfresco/authentication-services-context.xml
+++ b/config/alfresco/authentication-services-context.xml
@@ -194,6 +194,25 @@
         </property>
     </bean>
 
+
+    <!-- Simple LDAP example config -->
+    <!--
+    <bean id="authenticationComponentImpl" class="org.alfresco.repo.security.authentication.LDAPAuthenticationComponentImpl">
+    </bean>
+    -->
+    
+    <!-- Simple Authentication component that rejects all authentication requests -->
+    <!-- Use this defintion for Novell IChain integration.                        -->
+    <!-- It should never go to the login screen  so this is not required          -->
+    <!-- (Enterprise version only)
+    
+    <!--
+    <bean id="authenticationComponentImpl" class="org.alfresco.repo.security.authentication.SimpleAcceptOrRejectAllAuthenticationComponentImpl">
+    </bean>
+    -->
+
+
+
     <!-- The person service.                                                -->
 
     <bean id="personService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
@@ -279,4 +298,38 @@
         </property>
     </bean>
     
+    <!-- Authentication bootstrap -->
+    
+<!-- WIP
+    <bean id="authenticationBootstrap" class="org.alfresco.repo.security.authentication.AuthenticationBootstrap" init-method="bootstrap">
+        <property name="config">
+            <ref bean="authenticationBoostrapConfig"/>
+        </property>
+        <property name="authenticationComponent">
+            <ref bean="authenticationComponentImpl"/>
+        </property>
+        <property name="authenticationService">
+            <ref bean="authenticationService"/>
+        </property>
+        <property name="authenticationDao">
+            <ref bean="alfDaoImpl" />
+        </property>
+    </bean>
+    
+    <bean id="authenticationBoostrapConfigSource" class="org.alfresco.config.source.ClassPathConfigSource">
+      <constructor-arg>
+         <list>
+            <value>alfresco/authentication-bootstrap-config.xml</value>
+         </list>
+      </constructor-arg>
+   </bean>
+   
+   <bean id="authenticationBoostrapConfig" class="org.alfresco.config.xml.XMLConfigService" init-method="init">
+      <constructor-arg>
+         <ref bean="authenticationBoostrapConfigSource"/>
+      </constructor-arg>
+   </bean>
+   
+-->
+    
 </beans>
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/analysis/PathTokeniser.java b/source/java/org/alfresco/repo/search/impl/lucene/analysis/PathTokeniser.java
deleted file mode 100644
index 868baa3fb8..0000000000
--- a/source/java/org/alfresco/repo/search/impl/lucene/analysis/PathTokeniser.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2005 Alfresco, Inc.
- *
- * Licensed under the Mozilla Public License version 1.1 
- * with a permitted attribution clause. You may obtain a
- * copy of the License at
- *
- *   http://www.alfresco.org/legal/license.txt
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific
- * language governing permissions and limitations under the
- * License.
- */
-package org.alfresco.repo.search.impl.lucene.analysis;
-
-import java.io.Reader;
-
-import org.apache.lucene.analysis.CharTokenizer;
-
-/**
- * @author andyh
- * 
- * TODO To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Style - Code Templates
- */
-public class PathTokeniser extends CharTokenizer
-{
-    public PathTokeniser(Reader in)
-    {
-        super(in);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.lucene.analysis.CharTokenizer#isTokenChar(char)
-     */
-    protected boolean isTokenChar(char c)
-    {
-        return (c != '/') && !Character.isWhitespace(c);
-    }
-
-}
diff --git a/source/java/org/alfresco/repo/security/authentication/SimpleAcceptOrRejectAllAuthenticationComponentImpl.java b/source/java/org/alfresco/repo/security/authentication/SimpleAcceptOrRejectAllAuthenticationComponentImpl.java
new file mode 100644
index 0000000000..e44eb9bc31
--- /dev/null
+++ b/source/java/org/alfresco/repo/security/authentication/SimpleAcceptOrRejectAllAuthenticationComponentImpl.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.repo.security.authentication;
+
+/**
+ * This implementation of an AuthenticationComponent can be configured to accept or reject all attempts to login.
+ * 
+ * This only affects attempts to login using a user name and password.
+ * Authentication filters etc. could still support authentication but not via user names and passwords.
+ * For example, where they set the current user using the authentication component.
+ * Then the current user is set in the security context and asserted to be authenticated.
+ * 
+ * By default, the implementation rejects all authentication attempts.
+ *  
+ * @author Andy Hind
+ */
+public class SimpleAcceptOrRejectAllAuthenticationComponentImpl extends AbstractAuthenticationComponent
+{
+    private boolean accept = false;
+
+    public SimpleAcceptOrRejectAllAuthenticationComponentImpl()
+    {
+        super();
+    }
+
+    public void setAccept(boolean accept)
+    {
+        this.accept = accept;
+    }
+    
+    public void authenticate(String userName, char[] password) throws AuthenticationException
+    {
+        if(accept)
+        {
+            setCurrentUser(userName);
+        }
+        else
+        {
+            throw new AuthenticationException("Access Denied");
+        }
+
+    }
+}
diff --git a/source/java/org/alfresco/util/ISO9075Test.java b/source/java/org/alfresco/util/ISO9075Test.java
index b1d6624369..1876c68aff 100644
--- a/source/java/org/alfresco/util/ISO9075Test.java
+++ b/source/java/org/alfresco/util/ISO9075Test.java
@@ -34,6 +34,7 @@ public class ISO9075Test extends TestCase
     public void testEncoding()
     {
         assertEquals("MyDocuments", ISO9075.encode("MyDocuments"));
+        assertEquals("My_x002f_Documents", ISO9075.encode("My/Documents"));
         assertEquals("My_Documents", ISO9075.encode("My_Documents"));
         assertEquals("My_x0020_Documents", ISO9075.encode("My Documents"));
         assertEquals("My_x0020Documents", ISO9075.encode("My_x0020Documents"));