From 887e0891d8faa11d5973158cc0f32d95e19d8b12 Mon Sep 17 00:00:00 2001
From: chenson42 <chenson42@gmail.com>
Date: Sat, 2 Aug 2014 14:02:53 +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             | 16 ++++++++++++++--
 .../symmetric/wrapper/WrapperConfig.java         |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/symmetric-assemble/src/assembly/assembly-server.xml b/symmetric-assemble/src/assembly/assembly-server.xml
index 9b9fd271d3..98e1d02afb 100644
--- a/symmetric-assemble/src/assembly/assembly-server.xml
+++ b/symmetric-assemble/src/assembly/assembly-server.xml
@@ -129,9 +129,21 @@
                         <useProjectArtifact>false</useProjectArtifact>
                         <useTransitiveFiltering>true</useTransitiveFiltering>
                         <excludes>
-                            <exclude>junit:junit</exclude>
+                            <exclude>junit:junit</exclude>
+                            <exclude>org.jumpmind.symmetric:symmetric-wrapper</exclude>
                         </excludes>                        
-                    </dependencySet>
+                    </dependencySet>
+                    <dependencySet>
+                        <outputDirectory>/lib</outputDirectory>
+                        <unpack>false</unpack>
+                        <scope>provided</scope>
+                        <outputFileNameMapping>symmetric-wrapper.jar</outputFileNameMapping>
+                        <useProjectArtifact>false</useProjectArtifact>
+                        <useTransitiveFiltering>true</useTransitiveFiltering>
+                        <includes>
+                            <include>org.jumpmind.symmetric:symmetric-wrapper</include>
+                        </includes>                        
+                    </dependencySet>                    
                 </dependencySets>
             </binaries>
         </moduleSet>
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();
                 }
             }