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
This commit is contained in:
Derek Hulley
2006-06-02 15:01:44 +00:00
parent 03818ddedb
commit 7040d1befe

View File

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