From 5211eae58e8d7250ad504fe52af5aceda8c9a227 Mon Sep 17 00:00:00 2001
From: erilong <erilong@users.noreply.github.com>
Date: Tue, 5 Aug 2014 15:21:45 +0000
Subject: [PATCH] 0001860: symmetric-wrapper should not include the version
 number, otherwise the service needs to be reinstalled on each upgrade

---
 .../src/assembly/assembly-server.xml          | 208 +++++++++---------
 .../jumpmind/symmetric/wrapper/Wrapper.java   |   3 +-
 .../symmetric/wrapper/WrapperConfig.java      |   2 +-
 3 files changed, 113 insertions(+), 100 deletions(-)

diff --git a/symmetric-assemble/src/assembly/assembly-server.xml b/symmetric-assemble/src/assembly/assembly-server.xml
index ddd13eefcb..98e1d02afb 100644
--- a/symmetric-assemble/src/assembly/assembly-server.xml
+++ b/symmetric-assemble/src/assembly/assembly-server.xml
@@ -20,120 +20,132 @@
     under the License.
 
 -->
-<assembly>
-    <id>server</id>
-    <formats>
+<assembly>
+    <id>server</id>
+    <formats>
         <format>zip</format>
     </formats>
-    <fileSets>
-        <fileSet>
-            <directory>.</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>COPYING</include>
-                <include>CREDITS</include>
-                <include>NOTICE</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../symmetric-server/src/main/deploy</directory>
-            <outputDirectory>/</outputDirectory>
-            <excludes>
-                <exclude>bin/sym</exclude>
-                <exclude>bin/symadmin</exclude>
-                <exclude>bin/dbexport</exclude>
-                <exclude>bin/dbimport</exclude>
-                <exclude>bin/dbfill</exclude>
-                <exclude>bin/dbsql</exclude>
-                <exclude>bin/sym_service</exclude>
-            </excludes>
+    <fileSets>
+        <fileSet>
+            <directory>.</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>COPYING</include>
+                <include>CREDITS</include>
+                <include>NOTICE</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../symmetric-server/src/main/deploy</directory>
+            <outputDirectory>/</outputDirectory>
+            <excludes>
+                <exclude>bin/sym</exclude>
+                <exclude>bin/symadmin</exclude>
+                <exclude>bin/dbexport</exclude>
+                <exclude>bin/dbimport</exclude>
+                <exclude>bin/dbfill</exclude>
+                <exclude>bin/dbsql</exclude>
+                <exclude>bin/sym_service</exclude>
+            </excludes>
         </fileSet>
         <fileSet>
             <directory>target/doc</directory>
             <outputDirectory>/doc</outputDirectory>
-        </fileSet>
-    </fileSets>
-    <files>
-        <file>
-            <source>../symmetric-server/src/main/deploy/bin/sym</source>
-            <outputDirectory>/bin</outputDirectory>
-            <fileMode>755</fileMode>
-        </file>
-        <file>
-            <source>../symmetric-server/src/main/deploy/bin/symadmin</source>
-            <outputDirectory>/bin</outputDirectory>
-            <fileMode>755</fileMode>
-        </file>
+        </fileSet>
+    </fileSets>
+    <files>
+        <file>
+            <source>../symmetric-server/src/main/deploy/bin/sym</source>
+            <outputDirectory>/bin</outputDirectory>
+            <fileMode>755</fileMode>
+        </file>
+        <file>
+            <source>../symmetric-server/src/main/deploy/bin/symadmin</source>
+            <outputDirectory>/bin</outputDirectory>
+            <fileMode>755</fileMode>
+        </file>
         <file>
             <source>../symmetric-server/src/main/deploy/bin/setenv</source>
             <outputDirectory>/bin</outputDirectory>
             <fileMode>755</fileMode>
         </file>
-        <file>
-            <source>../symmetric-server/src/main/deploy/bin/dbexport</source>
-            <outputDirectory>/bin</outputDirectory>
-            <fileMode>755</fileMode>
-        </file>
-        <file>
-            <source>../symmetric-server/src/main/deploy/bin/dbimport</source>
-            <outputDirectory>/bin</outputDirectory>
-            <fileMode>755</fileMode>
-        </file>
-        <file>
-            <source>../symmetric-server/src/main/deploy/bin/dbfill</source>
-            <outputDirectory>/bin</outputDirectory>
-            <fileMode>755</fileMode>
-        </file>
-        <file>
-            <source>../symmetric-server/src/main/deploy/bin/dbsql</source>
-            <outputDirectory>/bin</outputDirectory>
-            <fileMode>755</fileMode>
-        </file>        
-        <file>
-            <source>../symmetric-server/src/main/deploy/bin/sym_service</source>
-            <outputDirectory>/bin</outputDirectory>
-            <fileMode>755</fileMode>
-        </file>
-        <file>
-            <source>../symmetric-core/src/main/resources/symmetric-default.properties</source>
-            <outputDirectory>/conf</outputDirectory>
-            <fileMode>664</fileMode>
-            <destName>symmetric.properties</destName>
-        </file>
-    </files>
-    <moduleSets>
-        <moduleSet>
-            <includes>
-                <include>org.jumpmind.symmetric:symmetric-server</include>
-            </includes>
-            <binaries>
-                <outputDirectory>/web/WEB-INF/lib</outputDirectory>
-                <includes>
-                    <include>org.jumpmind.symmetric:symmetric-server</include>
-                </includes>
-                <unpack>false</unpack>
-                <dependencySets>
-                    <dependencySet>
-                        <outputDirectory>/web/WEB-INF/lib</outputDirectory>
-                        <unpack>false</unpack>
-                        <scope>runtime</scope>
-                        <useTransitiveFiltering>true</useTransitiveFiltering>
-                        <excludes>
-                            <exclude>log4j:log4j</exclude>
-                        </excludes>                        
+        <file>
+            <source>../symmetric-server/src/main/deploy/bin/dbexport</source>
+            <outputDirectory>/bin</outputDirectory>
+            <fileMode>755</fileMode>
+        </file>
+        <file>
+            <source>../symmetric-server/src/main/deploy/bin/dbimport</source>
+            <outputDirectory>/bin</outputDirectory>
+            <fileMode>755</fileMode>
+        </file>
+        <file>
+            <source>../symmetric-server/src/main/deploy/bin/dbfill</source>
+            <outputDirectory>/bin</outputDirectory>
+            <fileMode>755</fileMode>
+        </file>
+        <file>
+            <source>../symmetric-server/src/main/deploy/bin/dbsql</source>
+            <outputDirectory>/bin</outputDirectory>
+            <fileMode>755</fileMode>
+        </file>        
+        <file>
+            <source>../symmetric-server/src/main/deploy/bin/sym_service</source>
+            <outputDirectory>/bin</outputDirectory>
+            <fileMode>755</fileMode>
+        </file>
+        <file>
+            <source>../symmetric-core/src/main/resources/symmetric-default.properties</source>
+            <outputDirectory>/conf</outputDirectory>
+            <fileMode>664</fileMode>
+            <destName>symmetric.properties</destName>
+        </file>
+    </files>
+    <moduleSets>
+        <moduleSet>
+            <includes>
+                <include>org.jumpmind.symmetric:symmetric-server</include>
+            </includes>
+            <binaries>
+                <outputDirectory>/web/WEB-INF/lib</outputDirectory>
+                <includes>
+                    <include>org.jumpmind.symmetric:symmetric-server</include>
+                </includes>
+                <unpack>false</unpack>
+                <dependencySets>
+                    <dependencySet>
+                        <outputDirectory>/web/WEB-INF/lib</outputDirectory>
+                        <unpack>false</unpack>
+                        <scope>runtime</scope>
+                        <useTransitiveFiltering>true</useTransitiveFiltering>
+                        <excludes>
+                            <exclude>log4j:log4j</exclude>
+                        </excludes>                        
+                    </dependencySet>
+                    <dependencySet>
+                        <outputDirectory>/lib</outputDirectory>
+                        <unpack>false</unpack>
+                        <scope>provided</scope>
+                        <useProjectArtifact>false</useProjectArtifact>
+                        <useTransitiveFiltering>true</useTransitiveFiltering>
+                        <excludes>
+                            <exclude>junit:junit</exclude>
+                            <exclude>org.jumpmind.symmetric:symmetric-wrapper</exclude>
+                        </excludes>                        
                     </dependencySet>
                     <dependencySet>
                         <outputDirectory>/lib</outputDirectory>
                         <unpack>false</unpack>
                         <scope>provided</scope>
+                        <outputFileNameMapping>symmetric-wrapper.jar</outputFileNameMapping>
                         <useProjectArtifact>false</useProjectArtifact>
                         <useTransitiveFiltering>true</useTransitiveFiltering>
-                        <excludes>
-                            <exclude>junit:junit</exclude>
-                        </excludes>                        
-                    </dependencySet>
-                </dependencySets>
-            </binaries>
-        </moduleSet>
-    </moduleSets>
+                        <includes>
+                            <include>org.jumpmind.symmetric:symmetric-wrapper</include>
+                        </includes>                        
+                    </dependencySet>                    
+                </dependencySets>
+            </binaries>
+        </moduleSet>
+    </moduleSets>
 </assembly>
\ No newline at end of file
diff --git a/symmetric-wrapper/src/main/java/org/jumpmind/symmetric/wrapper/Wrapper.java b/symmetric-wrapper/src/main/java/org/jumpmind/symmetric/wrapper/Wrapper.java
index b4ac3d3406..5c237a60c6 100644
--- a/symmetric-wrapper/src/main/java/org/jumpmind/symmetric/wrapper/Wrapper.java
+++ b/symmetric-wrapper/src/main/java/org/jumpmind/symmetric/wrapper/Wrapper.java
@@ -90,7 +90,8 @@ public static void main(String[] args) throws Exception {
             }
             if (e.getNativeErrorCode() > 0) {
                 System.out.println("Native error " + e.getErrorCode());    
-            }            
+            }
+            System.exit(e.getErrorCode());
         }
     }
 
diff --git a/symmetric-wrapper/src/main/java/org/jumpmind/symmetric/wrapper/WrapperConfig.java b/symmetric-wrapper/src/main/java/org/jumpmind/symmetric/wrapper/WrapperConfig.java
index 0bef3bc2c4..87ce452be0 100644
--- a/symmetric-wrapper/src/main/java/org/jumpmind/symmetric/wrapper/WrapperConfig.java
+++ b/symmetric-wrapper/src/main/java/org/jumpmind/symmetric/wrapper/WrapperConfig.java
@@ -52,7 +52,7 @@ public String getWrapperJarPath()  {
         try {
             File libDir = new File(workingDirectory.getCanonicalPath() + File.separator + ".." + File.separator + "lib");
             for (String filename : libDir.list()) {
-                if (filename.startsWith("symmetric-wrapper-")) {
+                if (filename.startsWith("symmetric-wrapper")) {
                     return new File(libDir.getCanonicalPath() + File.separator + filename).getCanonicalPath();
                 }
             }