[Bug 395649] add jetty-setuid back into jetty 9 and distribution
This commit is contained in:
Jesse McConnell
parent
b2e878a7e8
commit
ec4d926b4b
|
|
@ -220,6 +220,7 @@
|
|||
<outputDirectory>${assembly-directory}/lib/annotations</outputDirectory>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
||||
<execution>
|
||||
<id>copy-orbit-lib-jta-deps</id>
|
||||
<phase>generate-resources</phase>
|
||||
|
|
@ -487,4 +488,134 @@
|
|||
</dependency>
|
||||
-->
|
||||
</dependencies>
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>env-linux</id>
|
||||
<activation>
|
||||
<os>
|
||||
<name>Linux</name>
|
||||
</os>
|
||||
</activation>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>copy-setuid-deps</id>
|
||||
<phase>generate-resources</phase>
|
||||
<goals>
|
||||
<goal>copy</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<artifactItems>
|
||||
<artifactItem>
|
||||
<groupId>org.eclipse.jetty.setuid</groupId>
|
||||
<artifactId>jetty-setuid-java</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>jar</type>
|
||||
<overWrite>true</overWrite>
|
||||
<outputDirectory>${assembly-directory}/lib/setuid</outputDirectory>
|
||||
</artifactItem>
|
||||
<artifactItem>
|
||||
<groupId>org.eclipse.jetty.setuid</groupId>
|
||||
<artifactId>libsetuid-linux</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>so</type>
|
||||
<overWrite>true</overWrite>
|
||||
<outputDirectory>${assembly-directory}/lib/setuid</outputDirectory>
|
||||
</artifactItem>
|
||||
</artifactItems>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>unpack-setuid</id>
|
||||
<phase>process-resources</phase>
|
||||
<goals>
|
||||
<goal>unpack</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<artifactItems>
|
||||
<artifactItem>
|
||||
<groupId>org.eclipse.jetty.setuid</groupId>
|
||||
<artifactId>jetty-setuid-java</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<classifier>config</classifier>
|
||||
<type>jar</type>
|
||||
<overWrite>true</overWrite>
|
||||
<outputDirectory>${assembly-directory}</outputDirectory>
|
||||
</artifactItem>
|
||||
</artifactItems>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>env-mac</id>
|
||||
<activation>
|
||||
<os>
|
||||
<family>mac</family>
|
||||
</os>
|
||||
</activation>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>copy-setuid-deps</id>
|
||||
<phase>generate-resources</phase>
|
||||
<goals>
|
||||
<goal>copy</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<artifactItems>
|
||||
<artifactItem>
|
||||
<groupId>org.eclipse.jetty.setuid</groupId>
|
||||
<artifactId>jetty-setuid-java</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>jar</type>
|
||||
<overWrite>true</overWrite>
|
||||
<outputDirectory>${assembly-directory}/lib/setuid</outputDirectory>
|
||||
</artifactItem>
|
||||
<artifactItem>
|
||||
<groupId>org.eclipse.jetty.setuid</groupId>
|
||||
<artifactId>libsetuid-osx</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>so</type>
|
||||
<overWrite>true</overWrite>
|
||||
<outputDirectory>${assembly-directory}/lib/setuid</outputDirectory>
|
||||
</artifactItem>
|
||||
</artifactItems>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>unpack-setuid</id>
|
||||
<phase>process-resources</phase>
|
||||
<goals>
|
||||
<goal>unpack</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<artifactItems>
|
||||
<artifactItem>
|
||||
<groupId>org.eclipse.jetty.setuid</groupId>
|
||||
<artifactId>jetty-setuid-java</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<classifier>config</classifier>
|
||||
<type>jar</type>
|
||||
<overWrite>true</overWrite>
|
||||
<outputDirectory>${assembly-directory}</outputDirectory>
|
||||
</artifactItem>
|
||||
</artifactItems>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -71,12 +71,12 @@
|
|||
<artifactItems>
|
||||
<artifactItem>
|
||||
<groupId>org.eclipse.jetty.setuid</groupId>
|
||||
<artifactId>libsetuid_osx</artifactId>
|
||||
<artifactId>libsetuid-osx</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>so</type>
|
||||
<overWrite>true</overWrite>
|
||||
<outputDirectory>target/native</outputDirectory>
|
||||
<destFileName>libsetuid.so</destFileName>
|
||||
<!--destFileName>libsetuid.so</destFileName-->
|
||||
</artifactItem>
|
||||
</artifactItems>
|
||||
</configuration>
|
||||
|
|
@ -85,14 +85,14 @@
|
|||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<dependencies>
|
||||
<!-- dependencies>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty.setuid</groupId>
|
||||
<artifactId>libsetuid_osx</artifactId>
|
||||
<artifactId>libsetuid-osx</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>so</type>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencies-->
|
||||
</profile>
|
||||
</profiles>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -34,10 +34,14 @@ public class TestSetuid extends TestCase
|
|||
|
||||
try
|
||||
{
|
||||
// TODO use the dependency plugin to grab the proper lib and put it into place, no relative goop
|
||||
File lib = MavenTestingUtils.getTargetFile("native/libsetuid.so");
|
||||
/* This is a test of the -VERSION based loading mechanism, the
|
||||
* jetty.lib logic in SetUID looks in a directory of jetty.lib
|
||||
* and tries to load the file ending in the VERISON.so which is
|
||||
* the mechanism used by default in jetty-distro now
|
||||
*/
|
||||
File lib = new File(MavenTestingUtils.getTargetDir(), "native");
|
||||
String libPath = lib.getCanonicalPath();
|
||||
System.setProperty("jetty.libsetuid.path", libPath);
|
||||
System.setProperty("jetty.lib", libPath);
|
||||
|
||||
|
||||
try
|
||||
|
|
|
|||
|
|
@ -6,16 +6,15 @@
|
|||
<version>9.0.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>libsetuid_linux</artifactId>
|
||||
<artifactId>libsetuid-linux</artifactId>
|
||||
<name>Jetty :: SetUID Linux Native</name>
|
||||
<packaging>so</packaging>
|
||||
<properties>
|
||||
<native-source-dir>target/native</native-source-dir>
|
||||
<jetty-setuid-linkerStartOption>-shared -lc -ldl-shared -lc -ldl</jetty-setuid-linkerStartOption>
|
||||
<jetty-setuid-linkerEndOption>target/libsetuid_linux.so</jetty-setuid-linkerEndOption>
|
||||
<jetty-setuid-linkerEndOption>target/libsetuid-linux.so</jetty-setuid-linkerEndOption>
|
||||
</properties>
|
||||
<build>
|
||||
<finalName>libsetuid_linux</finalName>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
|
|
@ -86,7 +85,7 @@
|
|||
</linkerStartOptions>
|
||||
<linkerEndOptions>
|
||||
<linkerEndOptions>-o
|
||||
${project.build.directory}/libsetuid.so</linkerEndOptions>
|
||||
${project.build.directory}/libsetuid-linux.so</linkerEndOptions>
|
||||
</linkerEndOptions>
|
||||
</configuration>
|
||||
<executions>
|
||||
|
|
@ -6,17 +6,16 @@
|
|||
<version>9.0.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>libsetuid_osx</artifactId>
|
||||
<artifactId>libsetuid-osx</artifactId>
|
||||
<name>Jetty :: SetUID OSX Native</name>
|
||||
<packaging>so</packaging>
|
||||
<properties>
|
||||
<native-source-dir>target/generated</native-source-dir>
|
||||
<jetty-setuid-linkerStartOption>-lc -ldl -dynamiclib -undefined
|
||||
dynamic_lookup -single_module</jetty-setuid-linkerStartOption>
|
||||
<jetty-setuid-linkerEndOption>target/libsetuid_osx.so</jetty-setuid-linkerEndOption>
|
||||
<jetty-setuid-linkerEndOption>target/libsetuid-osx.so</jetty-setuid-linkerEndOption>
|
||||
</properties>
|
||||
<build>
|
||||
<finalName>libsetuid_osx</finalName>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
|
|
@ -64,7 +63,7 @@
|
|||
</linkerStartOptions>
|
||||
<linkerEndOptions>
|
||||
<linkerEndOptions>-o
|
||||
${project.build.directory}/libsetuid_osx.so</linkerEndOptions>
|
||||
${project.build.directory}/libsetuid-osx.so</linkerEndOptions>
|
||||
</linkerEndOptions>
|
||||
</configuration>
|
||||
<executions>
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
</os>
|
||||
</activation>
|
||||
<modules>
|
||||
<module>jetty-setuid-linux</module>
|
||||
<module>libsetuid-linux</module>
|
||||
</modules>
|
||||
</profile>
|
||||
<profile>
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
</os>
|
||||
</activation>
|
||||
<modules>
|
||||
<module>jetty-setuid-osx</module>
|
||||
<module>libsetuid-osx</module>
|
||||
</modules>
|
||||
</profile>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue