[java-idp-testbed COMMIT] in /trunk: pom.xml src/main/resources/idp-server.xml src/main/webapp/WEB-INF/web.xml src/te...

[noreply at shibboleth.net]

Author: tzeller
Date: Fri Apr 18 18:58:12 2014
New Revision: 187

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=187&view=rev
Log:
Add a simple Selenium test for the IdP status servlet. Use Spring to launch Jetty to take advantage of property replacement.

Added:
    trunk/src/main/resources/idp-server.xml   (with props)
    trunk/src/test/java/idp/StatusTest.java   (with props)
Modified:
    trunk/pom.xml
    trunk/src/main/webapp/WEB-INF/web.xml

Modified: trunk/pom.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/pom.xml?rev=187&r1=186&r2=187&view=diff
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Fri Apr 18 18:58:12 2014
@@ -23,6 +23,7 @@
         <!-- TODO tz These paths are fragile. -->
         <idp.home>${project.basedir}/../java-identity-provider/idp-conf/src/main/resources</idp.home>
         <app.home>${project.basedir}/src/main/resources</app.home>
+        <selenium.version>2.41.0</selenium.version>
     </properties>
 
     <repositories>
@@ -219,6 +220,40 @@
             <version>${opensaml.version}</version>
             <scope>test</scope>
             <type>test-jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-java</artifactId>
+            <version>${selenium.version}</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xalan</groupId>
+                    <artifactId>xalan</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>${xerces.groupId}</groupId>
+            <artifactId>xml-apis</artifactId>
+            <version>${xerces.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${xerces.groupId}</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>${xerces.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${xalan.groupId}</groupId>
+            <artifactId>xalan</artifactId>
+            <version>${xalan.version}</version>
+            <scope>test</scope>
         </dependency>
 
     </dependencies>

Modified: trunk/src/main/webapp/WEB-INF/web.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/webapp/WEB-INF/web.xml?rev=187&r1=186&r2=187&view=diff
==============================================================================
--- trunk/src/main/webapp/WEB-INF/web.xml (original)
+++ trunk/src/main/webapp/WEB-INF/web.xml Fri Apr 18 18:58:12 2014
@@ -82,6 +82,22 @@
         <servlet-name>idp</servlet-name>
         <url-pattern>/idp/*</url-pattern>
     </servlet-mapping>
+    
+    <!-- Servlet for displaying IdP status. -->
+    <servlet>
+        <servlet-name>Status</servlet-name>
+        <servlet-class>net.shibboleth.idp.StatusServlet</servlet-class>
+        <!-- Space separated list of CIDR blocks allowed to access the status page -->
+        <init-param>
+            <param-name>AllowedIPs</param-name>
+            <param-value>127.0.0.1/32 ::1/128</param-value>
+        </init-param>
+        <load-on-startup>2</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>Status</servlet-name>
+        <url-pattern>/idp/status</url-pattern>
+    </servlet-mapping>
 
     <!-- The /sp app space -->
     <servlet>