Index: lams_build/deploy-tool/lib/lams-tool-deploy.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/deploy-tool/lib/lams-tool-deploy.jar,v diff -u -r1.4 -r1.5 Binary files differ Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java,v diff -u -r1.9 -r1.10 --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java 10 Mar 2006 06:16:00 -0000 1.9 +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java 27 Mar 2006 03:25:29 -0000 1.10 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java,v diff -u -r1.7 -r1.8 --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java 10 Mar 2006 06:16:01 -0000 1.7 +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java 27 Mar 2006 03:25:29 -0000 1.8 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployLanguageFilesTask.java,v diff -u -r1.1 -r1.2 --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployLanguageFilesTask.java 10 Mar 2006 06:16:01 -0000 1.1 +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployLanguageFilesTask.java 27 Mar 2006 03:25:29 -0000 1.2 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java,v diff -u -r1.2 -r1.3 --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java 10 Mar 2006 06:16:01 -0000 1.2 +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java 27 Mar 2006 03:25:29 -0000 1.3 @@ -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