diff --git a/config/alfresco/authentication-services-context.xml b/config/alfresco/authentication-services-context.xml
index 2187c22172..ed1fcab05d 100644
--- a/config/alfresco/authentication-services-context.xml
+++ b/config/alfresco/authentication-services-context.xml
@@ -357,7 +357,7 @@
         </property>
     </bean>
     
-    <bean name="homeFolderManager" class="org.alfresco.repo.security.person.HomeFolderManager">
+    <bean name="homeFolderManager" class="org.alfresco.repo.security.person.HomeFolderManager" init-method="init">
         <property name="nodeService">
             <ref bean="nodeService" />
         </property>
diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index d67aedf0b9..329e8b0748 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -734,7 +734,7 @@
     <!--  Lock Service           -->
     <!--                               -->
 
-    <bean id="lockService" class="org.alfresco.repo.lock.LockServiceImpl" init-method="initialise">
+    <bean id="lockService" class="org.alfresco.repo.lock.LockServiceImpl" init-method="init">
         <property name="nodeService">
             <ref bean="nodeService" />
         </property>
diff --git a/config/alfresco/ownable-services-context.xml b/config/alfresco/ownable-services-context.xml
index 9e2848e0c2..11e3c2ca4f 100644
--- a/config/alfresco/ownable-services-context.xml
+++ b/config/alfresco/ownable-services-context.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
 
 <beans>
-    <bean id="ownableService" class="org.alfresco.repo.ownable.impl.OwnableServiceImpl">
+    <bean id="ownableService" class="org.alfresco.repo.ownable.impl.OwnableServiceImpl" init-method="init">
         <property name="nodeService">
             <ref bean="nodeService"/>
         </property>
@@ -12,8 +12,8 @@
         <property name="nodeOwnerCache">
             <ref bean="nodeOwnerCache"/>
         </property>
-		<property name="policyComponent">
-			<ref bean="policyComponent" />
-		</property>
+        <property name="policyComponent">
+            <ref bean="policyComponent" />
+        </property>
     </bean>
 </beans>
\ No newline at end of file
diff --git a/config/alfresco/public-services-security-context.xml b/config/alfresco/public-services-security-context.xml
index a747146dfb..58f209f1fc 100644
--- a/config/alfresco/public-services-security-context.xml
+++ b/config/alfresco/public-services-security-context.xml
@@ -39,7 +39,7 @@
       <bean id="permissionServiceImpl" class="org.alfresco.repo.security.permissions.noop.PermissionServiceNOOPImpl" />
     -->
     
-    <bean id="permissionServiceImpl" class="org.alfresco.repo.security.permissions.impl.PermissionServiceImpl">
+    <bean id="permissionServiceImpl" class="org.alfresco.repo.security.permissions.impl.PermissionServiceImpl" init-method="init">
         <property name="nodeService">
             <ref bean="mtAwareNodeService" />
         </property>
diff --git a/source/java/org/alfresco/repo/lock/LockServiceImpl.java b/source/java/org/alfresco/repo/lock/LockServiceImpl.java
index 1e2f67ed28..d0dcae3bd4 100644
--- a/source/java/org/alfresco/repo/lock/LockServiceImpl.java
+++ b/source/java/org/alfresco/repo/lock/LockServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Alfresco Software Limited.
+ * Copyright (C) 2005-2009 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
@@ -182,7 +182,7 @@ public class LockServiceImpl implements LockService,
     /**
      * Initialise methods called by Spring framework
      */
-    public void initialise()
+    public void init()
     {
         // Register the various class behaviours to enable lock checking
         this.policyComponent.bindAssociationBehaviour(
diff --git a/source/java/org/alfresco/repo/ownable/impl/OwnableServiceImpl.java b/source/java/org/alfresco/repo/ownable/impl/OwnableServiceImpl.java
index 81868d6a4c..dba84aec62 100644
--- a/source/java/org/alfresco/repo/ownable/impl/OwnableServiceImpl.java
+++ b/source/java/org/alfresco/repo/ownable/impl/OwnableServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Alfresco Software Limited.
+ * Copyright (C) 2005-2009 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
@@ -109,7 +109,10 @@ public class OwnableServiceImpl implements OwnableService, InitializingBean, Nod
         {
             throw new IllegalArgumentException("Property 'policyComponent' has not been set");
         }
-
+    }
+    
+    public void init()
+    {
         policyComponent.bindClassBehaviour(QName.createQName(NamespaceService.ALFRESCO_URI, "onAddAspect"), ContentModel.ASPECT_OWNABLE, new JavaBehaviour(this, "onAddAspect"));
         policyComponent.bindClassBehaviour(QName.createQName(NamespaceService.ALFRESCO_URI, "onUpdateProperties"), ContentModel.ASPECT_OWNABLE, new JavaBehaviour(this, "onUpdateProperties"));
         policyComponent.bindClassBehaviour(QName.createQName(NamespaceService.ALFRESCO_URI, "onRemoveAspect"), ContentModel.ASPECT_OWNABLE, new JavaBehaviour(this,
@@ -121,7 +124,6 @@ public class OwnableServiceImpl implements OwnableService, InitializingBean, Nod
         policyComponent.bindClassBehaviour(QName.createQName(NamespaceService.ALFRESCO_URI, "onRemoveAspect"), ContentModel.ASPECT_AUDITABLE, new JavaBehaviour(this,
                 "onRemoveAspect"));
         policyComponent.bindClassBehaviour(QName.createQName(NamespaceService.ALFRESCO_URI, "onDeleteNode"), ContentModel.ASPECT_AUDITABLE, new JavaBehaviour(this, "onDeleteNode"));
-
     }
 
     // OwnableService implmentation
diff --git a/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java b/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java
index 7df41d6fa7..0d7b4da7e9 100644
--- a/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java
+++ b/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java
@@ -287,11 +287,15 @@ public class PermissionServiceImpl implements PermissionServiceSPI, Initializing
             throw new IllegalArgumentException("Property 'aclDaoComponent' has not been set");
         }
 
-        policyComponent.bindClassBehaviour(QName.createQName(NamespaceService.ALFRESCO_URI, "onMoveNode"), ContentModel.TYPE_BASE, new JavaBehaviour(this, "onMoveNode"));
-
         allPermissionReference = getPermissionReference(ALL_PERMISSIONS);
         
     }
+    
+    public void init()
+    {
+        policyComponent.bindClassBehaviour(QName.createQName(NamespaceService.ALFRESCO_URI, "onMoveNode"), ContentModel.TYPE_BASE, new JavaBehaviour(this, "onMoveNode"));
+
+    }
 
     //
     // Permissions Service
diff --git a/source/java/org/alfresco/repo/security/person/HomeFolderManager.java b/source/java/org/alfresco/repo/security/person/HomeFolderManager.java
index f9bef16786..863eee99bb 100644
--- a/source/java/org/alfresco/repo/security/person/HomeFolderManager.java
+++ b/source/java/org/alfresco/repo/security/person/HomeFolderManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Alfresco Software Limited.
+ * Copyright (C) 2005-2009 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
@@ -36,14 +36,13 @@ import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
-import org.springframework.beans.factory.InitializingBean;
 
 /**
  * Manage home folder creation by binding to events from the cm:person type.
  *  
  * @author Andy Hind
  */
-public class HomeFolderManager implements InitializingBean, NodeServicePolicies.OnCreateNodePolicy
+public class HomeFolderManager implements NodeServicePolicies.OnCreateNodePolicy
 {
     
     private PolicyComponent policyComponent;
@@ -65,7 +64,7 @@ public class HomeFolderManager implements InitializingBean, NodeServicePolicies.
     /**
      * Bind the class behaviour to this implementation
      */
-    public void afterPropertiesSet() throws Exception
+    public void init() throws Exception
     {
         if (enableHomeFolderCreationAsPeopleAreCreated)
         {