bug_fix_for_http___www_symmetricds_org_issues_view_php_id=1530.patch (1,722 bytes)
Index: symmetric-client/src/main/java/org/jumpmind/symmetric/SymmetricAdmin.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- symmetric-client/src/main/java/org/jumpmind/symmetric/SymmetricAdmin.java (revision 7859)
+++ symmetric-client/src/main/java/org/jumpmind/symmetric/SymmetricAdmin.java (revision )
@@ -246,7 +246,7 @@
exportDefaultProperties(line, args);
return true;
} else if (cmd.equals(CMD_CREATE_WAR)) {
- generateWar(line, args);
+ generateWar(args);
return true;
} else if (cmd.equals(CMD_EXPORT_SYM_TABLES)) {
exportSymTables(line, args);
@@ -383,12 +383,16 @@
}
}
- private void generateWar(CommandLine line, List<String> args) throws Exception {
+ private void generateWar(List<String> args) throws Exception {
String warFileName = popArg(args, "Filename");
final File workingDirectory = new File("../.war");
FileUtils.deleteDirectory(workingDirectory);
FileUtils.copyDirectory(new File("../web"), workingDirectory);
FileUtils.copyDirectory(new File("../conf"), new File(workingDirectory, "WEB-INF/classes"));
+ FileUtils.moveFile(
+ new File(workingDirectory, "WEB-INF/classes/symmetric-extensions.xml"),
+ new File(workingDirectory, "WEB-INF/classes/conf/symmetric-extensions.xml")
+ );
if (propertiesFile != null && propertiesFile.exists()) {
FileUtils.copyFile(propertiesFile, new File(workingDirectory,
"WEB-INF/classes/symmetric.properties"));