Removed superseded changes brought in by the merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33777 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2012-02-08 16:05:05 +00:00
parent 503b462749
commit 1e8c35affa
3 changed files with 1 additions and 88 deletions

View File

@@ -170,32 +170,4 @@ public class ModuleDetailsHelper
exception);
}
}
/**
* Reads a .properites file from the war and returns it as a Properties object
* @param warLocation The location of the war
* @param propertiesPath Path to the properties file (including .properties)
* @return Properties object or null
*/
public static Properties getPropertiesFromWar(String warLocation, String propertiesPath)
{
Properties result = null;
try
{
File file = new File(warLocation+propertiesPath, ModuleManagementTool.DETECTOR_AMP_AND_WAR);
if (file.exists())
{
InputStream is = new FileInputStream(file);
result = new Properties();
result.load(is);
}
}
catch (IOException exception)
{
throw new ModuleManagementToolException("Unable to load properties from the war file; "+propertiesPath, exception);
}
return result;
}
}