Skip to content

Commit

Permalink
0001860: symmetric-wrapper should not include the version number, oth…
Browse files Browse the repository at this point in the history 
…erwise the service needs to be reinstalled on each upgrade
  • Loading branch information
@erilong
erilong committed Aug 5, 2014
1 parent 69de265 commit 5211eae
Show file tree
Hide file tree
Showing 3 changed files with 113 additions and 100 deletions.
208 changes: 110 additions & 98 deletions symmetric-assemble/src/assembly/assembly-server.xml
View file
Expand Up @@ -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>
3 changes: 2 additions & 1 deletion symmetric-wrapper/src/main/java/org/jumpmind/symmetric/wrapper/Wrapper.java
View file
Expand Up @@ -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());
}
}

Expand Down
2 changes: 1 addition & 1 deletion symmetric-wrapper/src/main/java/org/jumpmind/symmetric/wrapper/WrapperConfig.java
View file
Expand Up @@ -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();
}
}
Expand Down

0 comments on commit 5211eae

Please sign in to comment.