Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

JVM default classloader assembly #9

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

JVM default classloader assembly #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b594f7
Added maven failsafe plugin to sonos-root.
Phylock Mar 15, 2013
df92a0f
Rewrote sonos-java dist assembly
Phylock Apr 11, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions sonos-java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,26 +51,28 @@
src/build/distrib.xml
</descriptor>
</descriptors>
<!-- <outputDirectory> -->
<!-- target/zip-ressources -->
<!-- </outputDirectory> -->
<attach>false</attach>
<!-- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> -->
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Main-Class>org.tensin.sonos.run.Sonos</Main-Class>
</manifestEntries>
<manifest>
<addClasspath>true</addClasspath>
<Main-Class>org.tensin.sonos.commander.CLIController</Main-Class>
</manifest>
</archive>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</configuration>
</plugin>

Expand Down
58 changes: 20 additions & 38 deletions sonos-java/src/build/distrib.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<assembly>
<id>dist</id>
<formats>
<format>zip</format>
</formats>
<fileSets>
<!-- dependencies -->
<fileSet>
<directory>target/dependency/</directory>
<outputDirectory>lib/</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
</fileSet>
<!-- current jar -->
<fileSet>
<directory>target/</directory>
<outputDirectory>lib/</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
<excludes>
<exclude>*-javadoc.jar</exclude>
<exclude>*-sources.jar</exclude>
</excludes>
</fileSet>
<!-- launch script -->
<fileSet>
<directory>src/script</directory>
<outputDirectory>.</outputDirectory>
<includes>
<include>*.sh</include>
</includes>
<excludes>
<exclude>deploy.sh</exclude>
</excludes>
</fileSet>
</fileSets>
</assembly>
<id>dist</id>
<formats>
<format>zip</format>
<format>tar.gz</format>
</formats>
<files>
<file>
<source>src/script/sonos.sh</source>
<outputDirectory>/</outputDirectory>
</file>
</files>
<dependencySets>
<!-- dependencies -->
<dependencySet>
<useProjectArtifact>true</useProjectArtifact>
<outputDirectory>lib/</outputDirectory>
<scope>runtime</scope>
</dependencySet>
</dependencySets>
</assembly>
3 changes: 3 additions & 0 deletions sonos-java/src/main/java/org/tensin/sonos/commander/CLIController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ public static SystemHelper getSystemHelper() {
* the sonos exception
*/
public static void main(final String args[]) throws SonosException {
// CLINQ library is not compatible with IPv6 stack
// (which is, by the way, for example the default in recent archlinux distributions)
System.setProperty("java.net.preferIPv4Stack", "true");
final CLIController a = createController();
a.start(args);
}
Expand Down
2 changes: 1 addition & 1 deletion ...st/java/org/tensin/sonos/CLITestCase.java → .../test/java/org/tensin/sonos/ClientIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
/**
* The Class CLITestCase.
*/
public class CLITestCase {
public class ClientIT {

/** The zone command dispatcher. */
private final ZoneCommandDispatcher zoneCommandDispatcher = ZoneCommandDispatcher.getInstance();
Expand Down
2 changes: 1 addition & 1 deletion .../java/org/tensin/sonos/ClingTestCase.java → ...c/test/java/org/tensin/sonos/ClingIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
/**
* The Class ClingTestCase.
*/
public class ClingTestCase {
public class ClingIT {

/**
* Test discovery.
Expand Down
14 changes: 13 additions & 1 deletion sonos-root/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,19 @@
<includeScope>compile</includeScope>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.12.4</version>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.8</version>
Expand Down