[java-idp-integration-tests COMMIT] in /trunk: pom.xml src/test/conf/ src/test/conf/metadata-providers.xml src/test/m...

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Oct  7 14:05:37 2014
New Revision: 27

URL: http://svn.shibboleth.net/view/java-idp-integration-tests?rev=27&view=rev
Log:
Fix integration tests.
Prefix additional idp properties with a "/".
Configure example metadata for integration tests.

Added:
    trunk/src/test/conf/
    trunk/src/test/conf/metadata-providers.xml   (with props)
    trunk/src/test/metadata/
    trunk/src/test/metadata/example-metadata.xml   (with props)
Modified:
    trunk/pom.xml

Modified: trunk/pom.xml
URL: http://svn.shibboleth.net/view/java-idp-integration-tests/trunk/pom.xml?rev=27&r1=26&r2=27&view=diff
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Tue Oct  7 14:05:37 2014
@@ -17,7 +17,7 @@
 
     <properties>
         <idp.version>3.0-SNAPSHOT</idp.version>
-        <selenium.version>2.41.0</selenium.version>
+        <selenium.version>2.43.1</selenium.version>
         <testbed.version>0.1.0-SNAPSHOT</testbed.version>
         <test-distributions.directory>${basedir}/test-distributions</test-distributions.directory>
         <svn.relative.location>java-idp-integration-tests</svn.relative.location>
@@ -245,6 +245,39 @@
                                 </resource>
                             </resources>
                             <outputDirectory>${test-distributions.directory}/idp-distribution-${idp.version}/jetty-base/webapps/</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <!-- Copy example metadata-providers.xml. -->
+                    <execution>
+                        <id>copy-example-metadata-providers</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>src/test/conf</directory>
+                                </resource>
+                            </resources>
+                            <outputDirectory>${test-distributions.directory}/idp-distribution-${idp.version}/conf/</outputDirectory>
+                            <overwrite>true</overwrite>
+                        </configuration>
+                    </execution>
+                    <!-- Copy example-metadata.xml. -->
+                    <execution>
+                        <id>copy-example-metadata</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>src/test/metadata</directory>
+                                </resource>
+                            </resources>
+                            <outputDirectory>${test-distributions.directory}/idp-distribution-${idp.version}/metadata/</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>