[java-idp-integration-tests] 01/01: IDP-843 - Use jetty-base from idp-example-jetty-base.

[Tom Zeller]

This is an automated email from the git hooks/post-receive script.

tzeller pushed a commit to branch IDP-843
in repository java-idp-integration-tests.

commit 768103639232158964ca2081c8486807a71c300c
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Thu May 19 17:02:32 2016 -0500

    IDP-843 - Use jetty-base from idp-example-jetty-base.
    
    Ignore embedded/jetty-base in idp-distribution.
---
 pom.xml                                            | 26 +++++++++++++++++++++-
 .../shibboleth/idp/test/BaseIntegrationTest.java   | 14 ++----------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2c6cbc8..6d42878 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,7 @@
         <java-support.version>7.3.0-SNAPSHOT</java-support.version>
         <opensaml.version>3.3.0-SNAPSHOT</opensaml.version>
         <idp.version>3.3.0-SNAPSHOT</idp.version>
+        <idp-example-jetty-base.version>9.2.0-SNAPSHOT</idp-example-jetty-base.version>
         <selenium.version>2.45.0</selenium.version>
         <testbed.version>0.4.0-SNAPSHOT</testbed.version>
         <testbed.classifier>classes</testbed.classifier>
@@ -64,6 +65,11 @@
             <version>${idp.version}</version>
             <type>test-jar</type>
         </dependency>
+        <dependency>
+            <groupId>net.shibboleth.idp.example</groupId>
+            <artifactId>idp-example-jetty-base</artifactId>
+            <version>${idp-example-jetty-base.version}</version>
+        </dependency>
 
         <!-- Provided Dependencies -->
         <dependency>
@@ -289,6 +295,24 @@
                             <outputDirectory>${test-distributions.directory}/shibboleth-identity-provider-${idp.version}</outputDirectory>
                         </configuration>
                     </execution>
+                    <!-- Unpack idp-example-jetty-base. -->
+                    <execution>
+                        <id>unpack-idp-example-jetty-base</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>net.shibboleth.idp.example</groupId>
+                                    <artifactId>idp-example-jetty-base</artifactId>
+                                    <version>${idp-example-jetty-base}</version>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${test-distributions.directory}/shibboleth-identity-provider-${idp.version}</outputDirectory>
+                        </configuration>
+                    </execution>
                     <!-- Unpack jetty-distribution to test-distributions directory. -->
                     <execution>
                         <id>unpack-jetty-distribution</id>
@@ -387,7 +411,7 @@
                                     <includes>webapps/0-idp-testbed.xml</includes>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${test-distributions.directory}/shibboleth-identity-provider-${idp.version}/embedded/jetty-base/</outputDirectory>
+                            <outputDirectory>${test-distributions.directory}/shibboleth-identity-provider-${idp.version}/jetty-base/</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java b/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
index 245ff4d..257c715 100644
--- a/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
@@ -372,21 +372,11 @@ public abstract class BaseIntegrationTest
         // Set idp.home system property, replace '\' with '/' for Windows
         System.setProperty("idp.home", pathToIdPHome.toAbsolutePath().toString().replace('\\', '/'));
 
-        // Path to embedded/jetty.base
-        final Path pathToEmbeddedJettyBase = pathToIdPHome.resolve(Paths.get("embedded", "jetty-base"));
-        log.debug("Path to embedded jetty.base '{}'", pathToEmbeddedJettyBase.toAbsolutePath());
-        Assert.assertNotNull(pathToEmbeddedJettyBase, "Path to embedded jetty.base not found");
-        Assert.assertTrue(pathToEmbeddedJettyBase.toAbsolutePath().toFile().exists(),
-                "Path to embedded jetty.base not found");
-
         // Path to jetty.base
         pathToJettyBase = pathToIdPHome.resolve(Paths.get("jetty-base"));
         log.debug("Path to jetty.base '{}'", pathToJettyBase.toAbsolutePath());
-        Assert.assertFalse(pathToJettyBase.toAbsolutePath().toFile().exists(), "Path to jetty.base found");
-
-        FileSystemUtils.copyRecursively(pathToEmbeddedJettyBase.toAbsolutePath().toFile(),
-                pathToJettyBase.toAbsolutePath().toFile());
-        Assert.assertTrue(pathToJettyBase.toFile().exists(), "Path to jetty.base not found");
+        Assert.assertNotNull(pathToJettyBase, "Path to jetty.base not found");
+        Assert.assertTrue(pathToJettyBase.toAbsolutePath().toFile().exists(), "Path to jetty.base not found");
 
         // Path to conf/idp.properties
         pathToIdPProperties = Paths.get(pathToIdPHome.toAbsolutePath().toString(), "conf", "idp.properties");

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.