[java-idp-integration-tests COMMIT] in /trunk: pom.xml src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java...

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Jun  9 22:18:37 2014
New Revision: 8

URL: http://svn.shibboleth.net/view/java-idp-integration-tests?rev=8&view=rev
Log:
Checkpoint integration test work. Refactor flow tests to reuse the SAML response validator in the integration tests.

Added:
    trunk/src/test/java/net/shibboleth/idp/test/JettyServerProcess.java   (with props)
    trunk/src/test/java/net/shibboleth/idp/test/saml1/
    trunk/src/test/java/net/shibboleth/idp/test/saml1/AbstractSAML1IntegrationTest.java   (with props)
    trunk/src/test/java/net/shibboleth/idp/test/saml1/SAML1UnsolicitedSSOIntegrationTest.java   (with props)
    trunk/src/test/webapps/
    trunk/src/test/webapps/idp-testbed.xml   (with props)
Modified:
    trunk/pom.xml
    trunk/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
    trunk/src/test/java/net/shibboleth/idp/test/StatusTest.java
    trunk/src/test/resources/logback-test.xml

Modified: trunk/pom.xml
URL: http://svn.shibboleth.net/view/java-idp-integration-tests/trunk/pom.xml?rev=8&r1=7&r2=8&view=diff
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Mon Jun  9 22:18:37 2014
@@ -16,14 +16,15 @@
     <packaging>jar</packaging>
 
     <properties>
-        <!-- The idp.home directory is where idp-conf and idp.war are copied to. -->
-        <idp.home>idp.home</idp.home>
+        <test-distributions.directory>test-distributions</test-distributions.directory>
+        <jetty.version>9.1.5.v20140505</jetty.version>
         <idp.version>3.0-SNAPSHOT</idp.version>
         <opensaml.version>3.0-SNAPSHOT</opensaml.version>
         <java-support.version>3.0-SNAPSHOT</java-support.version>
         <spring-extensions.version>1.2-SNAPSHOT</spring-extensions.version>
         <jetty9-data.version>1.0-SNAPSHOT</jetty9-data.version>
         <selenium.version>2.41.0</selenium.version>
+        <testbed.version>0.1.0-SNAPSHOT</testbed.version>
         <svn.relative.location>java-idp-integration-tests</svn.relative.location>
     </properties>
 
@@ -47,80 +48,31 @@
     <dependencies>
         <!-- Compile Dependencies -->
         <dependency>
-            <groupId>${spring.groupId}</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>net.shibboleth.utilities</groupId>
-            <artifactId>java-support</artifactId>
-            <version>${java-support.version}</version>
-        </dependency>
-
-        <!-- Provided Dependencies -->
-
-        <!-- Runtime Dependencies -->
-        <dependency>
             <groupId>net.shibboleth.idp</groupId>
             <artifactId>idp-conf</artifactId>
             <version>${idp.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.shibboleth.idp</groupId>
-            <artifactId>idp-war</artifactId>
-            <version>${idp.version}</version>
-            <!-- Type is 'pom' and not 'war' to include transitive dependencies when run in Eclipse. -->
-            <type>pom</type>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.shibboleth.utilities.jetty9</groupId>
-            <artifactId>jetty9-dta-ssl</artifactId>
-            <version>${jetty9-data.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
-            <version>${jetty.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-webapp</artifactId>
-            <version>${jetty.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-jsp</artifactId>
-            <version>${jetty.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${spring.groupId}</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${spring.version}</version>
-            <scope>runtime</scope>
-        </dependency>
+            <type>test-jar</type>
+        </dependency>
+
+        <!-- Provided Dependencies -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Runtime Dependencies -->
 
         <!-- Test Dependencies -->
-        <dependency>
-            <groupId>org.opensaml</groupId>
-            <artifactId>opensaml-profile-impl</artifactId>
-            <version>${opensaml.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.shibboleth.ext</groupId>

[... 573 lines stripped ...]