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

Added module status to module.properties file saved in WAR for later use. Added contribution to return node path in Reference object. Fixed issues with web service caused by outdated Jars and incorrect AuthenticationService

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4980 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2007-01-31 11:56:02 +00:00
parent 251029fc75
commit fccfa9fc65
14 changed files with 107 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/java/org/alfresco/repo/webservice/authoring/AuthoringWebService.java
View File

@@ -183,8 +183,8 @@ public class AuthoringWebService extends AbstractWebService implements
}
// store the results
originals[x] = Utils.convertToReference(original);
workingCopies[x] = Utils.convertToReference(workingCopy);
originals[x] = Utils.convertToReference(AuthoringWebService.this.nodeService, original);
workingCopies[x] = Utils.convertToReference(AuthoringWebService.this.nodeService, workingCopy);
}
// setup the result object
@@ -248,12 +248,12 @@ public class AuthoringWebService extends AbstractWebService implements
NodeRef checkedInNode = AuthoringWebService.this.cociService.checkin(node, mapComments, null, keepCheckedOut);
// Add the results to the array
checkedIn[iIndex] = Utils.convertToReference(checkedInNode);
checkedIn[iIndex] = Utils.convertToReference(AuthoringWebService.this.nodeService, checkedInNode);
// Only return the working copies if the node is keep checked out otherwise the working copies have been deleted
if (keepCheckedOut == true)
{
listWorkingCopies.add(Utils.convertToReference(node));
listWorkingCopies.add(Utils.convertToReference(AuthoringWebService.this.nodeService, node));
}
iIndex++;
}
@@ -333,7 +333,7 @@ public class AuthoringWebService extends AbstractWebService implements
contentUrl,
keepCheckedOut);
// Return the orig node ref
return Utils.convertToReference(origNodeRef);
return Utils.convertToReference(AuthoringWebService.this.nodeService, origNodeRef);
}
});
}
@@ -380,8 +380,8 @@ public class AuthoringWebService extends AbstractWebService implements
NodeRef origNode = AuthoringWebService.this.cociService.cancelCheckout(node);
// Set the value in the arrays
origNodes[iIndex] = Utils.convertToReference(origNode);
workingCopies[iIndex] = Utils.convertToReference(node);
origNodes[iIndex] = Utils.convertToReference(AuthoringWebService.this.nodeService, origNode);
workingCopies[iIndex] = Utils.convertToReference(AuthoringWebService.this.nodeService, node);
iIndex ++;
}
@@ -433,7 +433,7 @@ public class AuthoringWebService extends AbstractWebService implements
{
LockType convertedLockType = convertToLockType(lockType);
AuthoringWebService.this.lockService.lock(node, convertedLockType, 0, lockChildren);
result[iIndex] = Utils.convertToReference(node);
result[iIndex] = Utils.convertToReference(AuthoringWebService.this.nodeService, node);
iIndex++;
}
@@ -501,7 +501,7 @@ public class AuthoringWebService extends AbstractWebService implements
{
AuthoringWebService.this.lockService.unlock(node, unlockChildren);
result[iIndex] = Utils.convertToReference(node);
result[iIndex] = Utils.convertToReference(AuthoringWebService.this.nodeService, node);
iIndex++;
}
@@ -555,7 +555,7 @@ public class AuthoringWebService extends AbstractWebService implements
LockStatus lockStatus = new LockStatus();
lockStatus.setLockOwner(lockOwner);
lockStatus.setLockType(lockTypeEnum);
lockStatus.setNode(Utils.convertToReference(node));
lockStatus.setNode(Utils.convertToReference(AuthoringWebService.this.nodeService, node));
result[iIndex] = lockStatus;
iIndex++;
@@ -634,8 +634,8 @@ public class AuthoringWebService extends AbstractWebService implements
Collection<Version> versions = AuthoringWebService.this.versionService.createVersion(node, mapComments, versionChildren);
for (Version version : versions)
{
versionedReferences.add(Utils.convertToReference(version.getVersionedNodeRef()));
webServiceVersions.add(Utils.convertToVersion(version));
versionedReferences.add(Utils.convertToReference(AuthoringWebService.this.nodeService, version.getVersionedNodeRef()));
webServiceVersions.add(Utils.convertToVersion(AuthoringWebService.this.nodeService, version));
}
}
@@ -689,7 +689,7 @@ public class AuthoringWebService extends AbstractWebService implements
int iIndex = 0;
for (Version version : versions)
{
webServiceVersions[iIndex] = Utils.convertToVersion(version);
webServiceVersions[iIndex] = Utils.convertToVersion(AuthoringWebService.this.nodeService, version);
iIndex ++;
}
webServiceVersionHistory.setVersions(webServiceVersions);