From 7040d1befe61442cf8d3e50b54c98da91dfd99d9 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Fri, 2 Jun 2006 15:01:44 +0000
Subject: [PATCH] Merged 3011 from BRANCHES\1.3 to HEAD    svn merge
 svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3010
 svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3011 .

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3020 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/repository.properties | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties
index aba2b0bd76..e185d91381 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -1,6 +1,6 @@
 # Directory configuration
 
-dir.root=./alf_data_new
+dir.root=./alf_data
 
 dir.contentstore=${dir.root}/contentstore
 dir.contentstore.deleted=${dir.root}/contentstore.deleted
@@ -50,10 +50,10 @@ lucene.lock.poll.interval=100
 # Database configuration
 
 db.driver=org.gjt.mm.mysql.Driver
-db.name=alfresco_new
+db.name=alfresco
 db.url=jdbc:mysql:///${db.name}
-db.username=alfresco_new
-db.password=alfresco_new
+db.username=alfresco
+db.password=alfresco
 
 #db.name=alfresco
 #db.url=jdbc:mysql://qasi/${db.name}