mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merge into HEAD from BRANCHES/V1.3
svn merge svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@2997 svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@2998 . svn merge svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3003 svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3004 . svn merge svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3009 svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3010 . git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3016 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
# Directory configuration
|
||||
|
||||
dir.root=./alf_data
|
||||
dir.root=./alf_data_new
|
||||
|
||||
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
|
||||
db.name=alfresco_new
|
||||
db.url=jdbc:mysql:///${db.name}
|
||||
db.username=alfresco
|
||||
db.password=alfresco
|
||||
db.username=alfresco_new
|
||||
db.password=alfresco_new
|
||||
|
||||
#db.name=alfresco
|
||||
#db.url=jdbc:mysql://qasi/${db.name}
|
||||
|
Reference in New Issue
Block a user