0001860: symmetric-wrapper should not include the version number, oth…

…erwise the service needs to be reinstalled on each upgrade
JumpMind · Aug 2, 2014 · 887e089 · 887e089
1 parent 26a7a21
commit 887e089
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git 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
@@ -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();
                 }
             }