From 8bbfd3be4ccb9f09e3bb94186563362a07a1656d Mon Sep 17 00:00:00 2001
From: Jesse McConnell <jesse.mcconnell@gmail.com>
Date: Fri, 14 Sep 2012 17:54:35 -0500
Subject: [PATCH] setuid passing test on osx

---
 jetty-setuid/jetty-setuid-osx/pom.xml         |  2 +-
 jetty-setuid/jetty-setuid-test/pom.xml        | 47 ++++++++++++++++---
 .../org/eclipse/jetty/setuid/TestSetuid.java  |  3 +-
 jetty-setuid/pom.xml                          |  2 +-
 4 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/jetty-setuid/jetty-setuid-osx/pom.xml b/jetty-setuid/jetty-setuid-osx/pom.xml
index dd12041452e..fae0a24289a 100644
--- a/jetty-setuid/jetty-setuid-osx/pom.xml
+++ b/jetty-setuid/jetty-setuid-osx/pom.xml
@@ -6,7 +6,7 @@
     <version>9.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>jetty-setuid-osx</artifactId>
+  <artifactId>libsetuid_osx</artifactId>
   <name>Jetty :: SetUID OSX Native</name>
   <packaging>so</packaging>
   <properties>
diff --git a/jetty-setuid/jetty-setuid-test/pom.xml b/jetty-setuid/jetty-setuid-test/pom.xml
index c3f2e70904e..84ec87e30c4 100644
--- a/jetty-setuid/jetty-setuid-test/pom.xml
+++ b/jetty-setuid/jetty-setuid-test/pom.xml
@@ -10,7 +10,6 @@
   <name>Jetty :: SetUID Test</name>
   <packaging>jar</packaging>
   <build>
-    <defaultGoal>test</defaultGoal>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -19,6 +18,7 @@
           <skip>true</skip>
         </configuration>
       </plugin>
+      
     </plugins>
   </build>
   <dependencies>
@@ -32,6 +32,10 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.toolchain</groupId>
+      <artifactId>jetty-test-helper</artifactId>
+    </dependency>
   </dependencies>
   <profiles>
     <profile>
@@ -44,9 +48,9 @@
       <dependencies>
         <dependency>
           <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-setuid-linux</artifactId>
+          <artifactId>libsetuid_linux</artifactId>
           <version>${project.version}</version>
-          <type>pom</type>
+          <type>so</type>
         </dependency>
       </dependencies>
     </profile>
@@ -54,15 +58,44 @@
       <id>env-mac</id>
       <activation>
         <os>
-          <name>mac</name>
+          <family>mac</family>
         </os>
       </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>copy</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.eclipse.jetty.setuid</groupId>
+                      <artifactId>libsetuid_osx</artifactId>
+                      <version>${project.version}</version>
+                      <type>so</type>
+                      <overWrite>true</overWrite>
+                      <outputDirectory>target/native</outputDirectory>
+                      <destFileName>libsetuid.so</destFileName>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
       <dependencies>
         <dependency>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-setuid-osx</artifactId>
+          <groupId>org.eclipse.jetty.setuid</groupId>
+          <artifactId>libsetuid_osx</artifactId>
           <version>${project.version}</version>
-          <type>pom</type>
+          <type>so</type>
         </dependency>
       </dependencies>
     </profile>
diff --git a/jetty-setuid/jetty-setuid-test/src/test/java/org/eclipse/jetty/setuid/TestSetuid.java b/jetty-setuid/jetty-setuid-test/src/test/java/org/eclipse/jetty/setuid/TestSetuid.java
index 6c8bf3930f8..cf5d8598e97 100644
--- a/jetty-setuid/jetty-setuid-test/src/test/java/org/eclipse/jetty/setuid/TestSetuid.java
+++ b/jetty-setuid/jetty-setuid-test/src/test/java/org/eclipse/jetty/setuid/TestSetuid.java
@@ -23,6 +23,7 @@ import org.eclipse.jetty.setuid.SetUID;
 import java.io.File;
 import org.eclipse.jetty.setuid.Passwd;
 import org.eclipse.jetty.setuid.Group;
+import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
 
 public class TestSetuid extends TestCase
 {
@@ -34,7 +35,7 @@ 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 = new File("../../modules/native/target/libsetuid.so");
+            File lib = MavenTestingUtils.getTargetFile("native/libsetuid.so");
             String libPath = lib.getCanonicalPath();
             System.setProperty("jetty.libsetuid.path", libPath);   
             
diff --git a/jetty-setuid/pom.xml b/jetty-setuid/pom.xml
index 548ddb70b62..c6d0669eeba 100644
--- a/jetty-setuid/pom.xml
+++ b/jetty-setuid/pom.xml
@@ -12,7 +12,7 @@
 		<modules>
 			<module>jetty-setuid-java</module>
 			<module>jetty-setuid-native</module>
-			<!-- module>jetty-setuid-test</module -->
+			<module>jetty-setuid-test</module>
 		</modules>
     <profiles>
         <profile>