Index: lams_build/deploy-tool/lib/lams-tool-deploy.jar =================================================================== diff -u -r21e57e9d24bd24305b98cb16dc363ab59b115a98 -r831d4ba9821e1a2037d2beb98cdca13c422506a2 Binary files differ Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java =================================================================== diff -u -r21e57e9d24bd24305b98cb16dc363ab59b115a98 -r831d4ba9821e1a2037d2beb98cdca13c422506a2 --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java (.../Deploy.java) (revision 21e57e9d24bd24305b98cb16dc363ab59b115a98) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java (.../Deploy.java) (revision 831d4ba9821e1a2037d2beb98cdca13c422506a2) @@ -111,7 +111,7 @@ if ( files != null && files.size() > 0 ) { DeployLanguageFilesTask deployLanguageFilesTask = new DeployLanguageFilesTask(); deployLanguageFilesTask.setLamsEarPath(config.getLamsEarPath()); - deployLanguageFilesTask.setDictionaryPacket(config.getToolSignature()); + deployLanguageFilesTask.setDictionaryPacket(config.getLanguageFilesPackage()); deployLanguageFilesTask.setDeployFiles(config.getLanguageFiles()); deployLanguageFilesTask.execute(); } Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java =================================================================== diff -u -r21e57e9d24bd24305b98cb16dc363ab59b115a98 -r831d4ba9821e1a2037d2beb98cdca13c422506a2 --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java (.../DeployConfig.java) (revision 21e57e9d24bd24305b98cb16dc363ab59b115a98) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java (.../DeployConfig.java) (revision 831d4ba9821e1a2037d2beb98cdca13c422506a2) @@ -64,6 +64,7 @@ public static final String DB_DRIVER_URL = "dbDriverUrl"; public static final String TOOL_SIGNATURE = "toolSignature"; public static final String TOOL_ACTIVITY_INSERT_SCRIPT_PATH = "toolActivityInsertScriptPath"; + public static final String I8N_LANGUAGE_FILES_PACKAGE = "languageFilesPackage"; protected transient String validationError = ""; protected transient XStream xstream; @@ -89,7 +90,13 @@ */ private String dbPassword; - + + /** + * Holds the value of the package where I8N files are store + * Export format org.lamsfoundation.lams.tool.web + */ + private String languageFilesPackage; + public DeployConfig() { this.validationError = ""; @@ -215,6 +222,10 @@ if ( key.equalsIgnoreCase(DB_DRIVER_URL) ) { setDbDriverUrl(value); } + + if ( key.equalsIgnoreCase(I8N_LANGUAGE_FILES_PACKAGE) ) { + setLanguageFilesPackage(value); + } } /** @@ -284,4 +295,12 @@ public void setDbUsername(String dbUsername) { this.dbUsername = dbUsername; } + + public String getLanguageFilesPackage() { + return languageFilesPackage; + } + + public void setLanguageFilesPackage(String languageFilesPackage) { + this.languageFilesPackage = languageFilesPackage; + } } Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployLanguageFilesTask.java =================================================================== diff -u -r21e57e9d24bd24305b98cb16dc363ab59b115a98 -r831d4ba9821e1a2037d2beb98cdca13c422506a2 --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployLanguageFilesTask.java (.../DeployLanguageFilesTask.java) (revision 21e57e9d24bd24305b98cb16dc363ab59b115a98) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployLanguageFilesTask.java (.../DeployLanguageFilesTask.java) (revision 831d4ba9821e1a2037d2beb98cdca13c422506a2) @@ -51,7 +51,7 @@ File dictionaryDir = getLamsDictionary(); for (String languageFilename : deployFiles) { - System.out.println("Copying file "+languageFilename); + System.out.println("Copying file "+languageFilename+" to "+dictionaryDir); copyFile(languageFilename, dictionaryDir); } } @@ -62,6 +62,12 @@ * the directory (as long as the lams ear exists). */ private File getLamsDictionary() throws DeployException { + // convert dictionary packet org.lamsfoundation.lams.tool.web to org/lamsfoundation/lams/tool/web + if ( dictionaryPacket != null ) { + System.out.println("dictionaryPacket "+dictionaryPacket+" being updated"); + dictionaryPacket = dictionaryPacket.replace('.',File.separatorChar); + System.out.println("dictionaryPacket now"+dictionaryPacket); + } String packageName = lamsEarPath+File.separator+LANGUAGE_JAR_DIRECTORY+File.separator+dictionaryPacket; File dictionaryDir = new File(packageName); if (!dictionaryDir.exists()) @@ -85,6 +91,7 @@ } public void setDictionaryPacket(String dictionaryPacket) { + System.out.println("DeployLanguageFile: Setting dictionary packet to "+dictionaryPacket); this.dictionaryPacket = dictionaryPacket; } Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java =================================================================== diff -u -r21e57e9d24bd24305b98cb16dc363ab59b115a98 -r831d4ba9821e1a2037d2beb98cdca13c422506a2 --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java (.../DeployToolConfig.java) (revision 21e57e9d24bd24305b98cb16dc363ab59b115a98) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java (.../DeployToolConfig.java) (revision 831d4ba9821e1a2037d2beb98cdca13c422506a2) @@ -270,6 +270,8 @@ this.setDbDriverUrl(config.getDbDriverUrl()); if (config.getDbDriverClass() != null) this.setDbDriverClass(config.getDbDriverClass()); + if (config.getLanguageFilesPackage() != null) + this.setLanguageFilesPackage(config.getLanguageFilesPackage()); if (config.getToolSignature() != null) this.toolSignature = config.getToolSignature(); @@ -312,6 +314,7 @@ System.out.println("DbPassword: " + getDbPassword()); System.out.println("DbDriverClass: " + getDbDriverClass()); System.out.println("DbDriverUrl: " + getDbDriverUrl()); + System.out.println("LanguageFilesPackage: " + getLanguageFilesPackage()); ArrayList list = this.deployFiles; for(int i=0; i