safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-587: Migrate noauth and LDAP to self-contained .jar files.

Browse Source
This commit is contained in:
Michael Jumper
2015-05-11 15:52:36 -07:00
parent acc8d996fc
commit 3411c1b45a
4 changed files with 73 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
extensions/guacamole-auth-ldap/pom.xml
View File

@@ -32,6 +32,26 @@
</configuration> </configuration>
</plugin> </plugin>
<!-- Copy dependencies prior to packaging -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions>
<execution>
<id>unpack-dependencies</id>
<phase>prepare-package</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeScope>runtime</includeScope>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<!-- Assembly plugin - for easy distribution --> <!-- Assembly plugin - for easy distribution -->
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
@@ -64,6 +84,7 @@
<groupId>org.glyptodon.guacamole</groupId> <groupId>org.glyptodon.guacamole</groupId>
<artifactId>guacamole-common</artifactId> <artifactId>guacamole-common</artifactId>
<version>0.9.6</version> <version>0.9.6</version>
<scope>provided</scope>
</dependency> </dependency>
<!-- Guacamole Extension API --> <!-- Guacamole Extension API -->
@@ -71,6 +92,7 @@
<groupId>org.glyptodon.guacamole</groupId> <groupId>org.glyptodon.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>0.9.6</version> <version>0.9.6</version>
<scope>provided</scope>
</dependency> </dependency>
<!-- JLDAP --> <!-- JLDAP -->

52
extensions/guacamole-auth-ldap/src/main/assembly/dist.xml
View File

@@ -11,43 +11,29 @@
<format>tar.gz</format> <format>tar.gz</format>
</formats> </formats>
<!-- Include docs and schema --> <!-- Include docs, schema, and extension .jar -->
<fileSets> <fileSets>
<!-- Include docs --> <!-- Include docs -->
<fileSet> <fileSet>
<directory>doc</directory> <directory>doc</directory>
</fileSet> </fileSet>
<!-- Include schema --> <!-- Include schema -->
<fileSet> <fileSet>
<outputDirectory>schema</outputDirectory> <outputDirectory>schema</outputDirectory>
<directory>schema</directory> <directory>schema</directory>
</fileSet> </fileSet>
<!-- Include extension .jar -->
<fileSet>
<directory>target</directory>
<outputDirectory></outputDirectory>
<includes>
<include>*.jar</include>
</includes>
</fileSet>
</fileSets> </fileSets>
<!-- Include self and all dependencies except guacamole-common
and guacamole-ext -->
<dependencySets>
<dependencySet>
<outputDirectory>lib</outputDirectory>
<scope>runtime</scope>
<unpack>false</unpack>
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
<!-- Do not include guacamole-common -->
<exclude>org.glyptodon.guacamole:guacamole-common</exclude>
<!-- Do not include guacamole-ext -->
<exclude>org.glyptodon.guacamole:guacamole-ext</exclude>
</excludes>
</dependencySet>
</dependencySets>
</assembly> </assembly>

22
extensions/guacamole-auth-noauth/pom.xml
View File

@@ -32,6 +32,26 @@
</configuration> </configuration>
</plugin> </plugin>
<!-- Copy dependencies prior to packaging -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions>
<execution>
<id>unpack-dependencies</id>
<phase>prepare-package</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeScope>runtime</includeScope>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<!-- Assembly plugin - for easy distribution --> <!-- Assembly plugin - for easy distribution -->
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
@@ -64,6 +84,7 @@
<groupId>org.glyptodon.guacamole</groupId> <groupId>org.glyptodon.guacamole</groupId>
<artifactId>guacamole-common</artifactId> <artifactId>guacamole-common</artifactId>
<version>0.9.6</version> <version>0.9.6</version>
<scope>provided</scope>
</dependency> </dependency>
<!-- Guacamole Extension API --> <!-- Guacamole Extension API -->
@@ -71,6 +92,7 @@
<groupId>org.glyptodon.guacamole</groupId> <groupId>org.glyptodon.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>0.9.6</version> <version>0.9.6</version>
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

34
extensions/guacamole-auth-noauth/src/main/assembly/dist.xml
View File

@@ -11,7 +11,7 @@
<format>tar.gz</format> <format>tar.gz</format>
</formats> </formats>
<!-- Include docs and schema --> <!-- Include docs and extension .jar -->
<fileSets> <fileSets>
<!-- Include docs --> <!-- Include docs -->
@@ -19,29 +19,15 @@
<directory>doc</directory> <directory>doc</directory>
</fileSet> </fileSet>
<!-- Include extension .jar -->
<fileSet>
<directory>target</directory>
<outputDirectory></outputDirectory>
<includes>
<include>*.jar</include>
</includes>
</fileSet>
</fileSets> </fileSets>
<!-- Include self and all dependencies except guacamole-common
and guacamole-ext -->
<dependencySets>
<dependencySet>
<outputDirectory>lib</outputDirectory>
<scope>runtime</scope>
<unpack>false</unpack>
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
<!-- Do not include guacamole-common -->
<exclude>org.glyptodon.guacamole:guacamole-common</exclude>
<!-- Do not include guacamole-ext -->
<exclude>org.glyptodon.guacamole:guacamole-ext</exclude>
</excludes>
</dependencySet>
</dependencySets>
</assembly> </assembly>