inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge into HEAD from BRANCHES/V1.3

Browse Source 
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:
Derek Hulley
2006-06-02 11:52:15 +00:00
parent 77ee4260ad
commit ff4d11c719
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/alfresco/repository.properties
View File

@@ -1,6 +1,6 @@
# Directory configuration # Directory configuration
dir.root=./alf_data dir.root=./alf_data_new
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 db.name=alfresco_new
db.url=jdbc:mysql:///${db.name} db.url=jdbc:mysql:///${db.name}
db.username=alfresco db.username=alfresco_new
db.password=alfresco db.password=alfresco_new
#db.name=alfresco #db.name=alfresco
#db.url=jdbc:mysql://qasi/${db.name} #db.url=jdbc:mysql://qasi/${db.name}

14
source/java/org/alfresco/repo/importer/ImporterComponent.java
View File

@@ -551,7 +551,19 @@ public class ImporterComponent
DataTypeDefinition valueDataType = context.getPropertyDataType(property.getKey()); DataTypeDefinition valueDataType = context.getPropertyDataType(property.getKey());
if (valueDataType != null && valueDataType.getName().equals(DataTypeDefinition.CONTENT)) if (valueDataType != null && valueDataType.getName().equals(DataTypeDefinition.CONTENT))
{ {
importContent(nodeRef, property.getKey(), (String)property.getValue()); // the property may be a single value or a collection - handle both
Object objVal = property.getValue();
if (objVal instanceof String)
{
importContent(nodeRef, property.getKey(), (String)objVal);
}
else if (objVal instanceof List)
{
for (String value : (List<String>)objVal)
{
importContent(nodeRef, property.getKey(), value);
}
}
} }
} }

6
source/java/org/alfresco/repo/jscript/Node.java
View File

@@ -782,7 +782,7 @@ public final class Node implements Serializable
public void save() public void save()
{ {
// persist properties back to the node in the DB // persist properties back to the node in the DB
Map<QName, Serializable> props = new HashMap<QName, Serializable>(this.properties.size()); Map<QName, Serializable> props = new HashMap<QName, Serializable>(getProperties().size());
for (String key : this.properties.keySet()) for (String key : this.properties.keySet())
{ {
Serializable value = (Serializable)this.properties.get(key); Serializable value = (Serializable)this.properties.get(key);
@@ -911,9 +911,9 @@ public final class Node implements Serializable
} }
/** /**
* Delete this node. Any references to this Node or its NodeRef should be discarded! * Remove this node. Any references to this Node or its NodeRef should be discarded!
*/ */
public boolean delete() public boolean remove()
{ {
boolean success = false; boolean success = false;