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

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 7dc0de5b7b
commit 2ad8f02979
5 changed files with 68 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/java/org/alfresco/repo/module/ModuleDetailsImpl.java
View File

@@ -22,6 +22,7 @@ import java.util.Properties;
import org.alfresco.repo.module.tool.ModuleManagementToolException;
import org.alfresco.service.cmr.module.ModuleDetails;
import org.alfresco.service.cmr.module.ModuleInstallState;
import org.alfresco.util.VersionNumber;
/**
@@ -39,6 +40,7 @@ public class ModuleDetailsImpl implements ModuleDetails
protected static final String PROP_DESCRIPTION = "module.description";
protected static final String PROP_VERSION = "module.version";
protected static final String PROP_INSTALL_DATE = "module.installDate";
protected static final String PROP_INSTALL_STATE = "module.installState";
/** Properties object */
protected Properties properties;
@@ -130,6 +132,20 @@ public class ModuleDetailsImpl implements ModuleDetails
return this.properties.getProperty(PROP_INSTALL_DATE);
}
/**
* @see org.alfresco.service.cmr.module.ModuleDetails#getInstallState()
*/
public ModuleInstallState getInstallState()
{
ModuleInstallState result = ModuleInstallState.INSTALLED;
String value = this.properties.getProperty(PROP_INSTALL_STATE);
if (value != null && value.length() != 0)
{
result = ModuleInstallState.valueOf(value);
}
return result;
}
/**
* @see java.lang.Object#toString()
*/

11
source/java/org/alfresco/repo/module/tool/ModuleDetailsHelper.java
View File

@@ -22,6 +22,7 @@ import java.io.OutputStream;
import java.util.Date;
import org.alfresco.repo.module.ModuleDetailsImpl;
import org.alfresco.service.cmr.module.ModuleInstallState;
import de.schlichtherle.io.File;
import de.schlichtherle.io.FileInputStream;
@@ -125,5 +126,15 @@ public class ModuleDetailsHelper extends ModuleDetailsImpl
throw new ModuleManagementToolException("Unable to save module details into WAR file.", exception);
}
}
/**
* Set the install state
*
* @param installState the install state
*/
public void setInstallState(ModuleInstallState installState)
{
this.properties.setProperty(PROP_INSTALL_STATE, installState.toString());
}
}

5
source/java/org/alfresco/repo/module/tool/ModuleManagementTool.java
View File

@@ -22,6 +22,8 @@ import java.io.InputStream;
import java.util.Map;
import java.util.Properties;
import org.alfresco.service.cmr.module.ModuleInstallState;
import org.alfresco.service.cmr.module.ModuleService;
import org.alfresco.util.GUID;
import org.apache.log4j.Logger;
import org.springframework.util.FileCopyUtils;
@@ -136,6 +138,8 @@ public class ModuleManagementTool
{
try
{
outputMessage("Installing AMP '" + ampFileLocation + "' into WAR '" + warFileLocation + "'");
if (preview == false)
{
// Make sure the module and backup directory exisits in the WAR file
@@ -239,6 +243,7 @@ public class ModuleManagementTool
installedFiles.save();
// Update the installed module details
installingModuleDetails.setInstallState(ModuleInstallState.INSTALLED);
installingModuleDetails.save(warFileLocation, installingModuleDetails.getId());
// Update the zip file's