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

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-07-02 16:13:03 +00:00
parent 4c30e52dc3
commit 7dd2291753
784 changed files with 5454 additions and 5487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/java/org/alfresco/repo/module/tool/WarHelperImpl.java
View File

@@ -69,8 +69,8 @@ public class WarHelperImpl implements WarHelper
/**
* Checks if the module is compatible using the entry in the manifest. This is more accurate and works for both alfresco.war and share.war, however
* valid manifest entries weren't added until 3.4.11, 4.1.1 and Community 4.2
* @param war
* @param installingModuleDetails
* @param war TFile
* @param installingModuleDetails ModuleDetails
*/
protected void checkCompatibleVersionUsingManifest(TFile war, ModuleDetails installingModuleDetails)
{
@@ -149,9 +149,9 @@ public class WarHelperImpl implements WarHelper
/**
* Compares the version information with the module details to see if their valid. If they are invalid then it throws an exception.
* @param warVersion
* @param installingModuleDetails
* @throws ModuleManagementToolException/home/gethin/development/projects/updatetool/code/update-tool
* @param warVersion VersionNumber
* @param installingModuleDetails ModuleDetails
* @throws ModuleManagementToolException
*/
private void checkVersions(VersionNumber warVersion, ModuleDetails installingModuleDetails) throws ModuleManagementToolException
{
@@ -198,8 +198,8 @@ public class WarHelperImpl implements WarHelper
* Checks to see if the module that is being installed is compatible with the war, (using the entry in the manifest).
* This is more accurate and works for both alfresco.war and share.war, however
* valid manifest entries weren't added until 3.4.11, 4.1.1 and Community 4.2
* @param war
* @param installingModuleDetails
* @param war TFile
* @param installingModuleDetails ModuleDetails
*/
public void checkCompatibleEditionUsingManifest(TFile war, ModuleDetails installingModuleDetails)
{
@@ -381,8 +381,8 @@ public class WarHelperImpl implements WarHelper
/**
* Gets the module details for the specified module from the war.
* @param war a valid war file or exploded directory from a war
* @param moduleId
* @return
* @param moduleId String
* @return ModuleDetails
*/
protected ModuleDetails getModuleDetails(TFile war, String moduleId)
{