addproperty="tomcat.home.input" defaultvalue="${tomcat.home}" />
<var name="tomcat.home" value="${tomcat.home.input}" />
- <copy file="${configroot}/IdP.xml.dist" tofile="${configroot}/IdP.xml" overwrite="true" />
- <replace file="${configroot}/IdP.xml" token="$SHIB_HOME$" value="${shib.home}" />
- <war warfile="${dist}/${distname}.war" webxml="${configroot}/IdP.xml" basedir="${approot}" update="no" />
+ <copy file="${configroot}/idp.xml.dist" tofile="${configroot}/idp.xml" overwrite="true" />
+ <replace file="${configroot}/idp.xml" token="$SHIB_HOME$" value="${shib.home}" />
+ <war warfile="${dist}/${distname}.war" webxml="${configroot}/idp.xml" basedir="${approot}" update="no" />
<copy file="${dist}/${distname}.war" tofile="${tomcat.home}/webapps/${distname}.war" />
<if>
<copy todir="${shib.home}/etc" overwrite="true">
<fileset dir="${src}/conf" />
</copy>
- <replace file="${shib.home}/etc/IdP.xml" token="$SHIB_HOME$" value="${shib.home}" />
+ <replace file="${shib.home}/etc/idp.xml" token="$SHIB_HOME$" value="${shib.home}" />
</target>
<target name="install.idp.manager">
+++ /dev/null
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-
- <listener>
- <listener-class>edu.internet2.middleware.shibboleth.log.LoggingContextListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>HS</servlet-name>
- <display-name>Shibboleth Handle Service</display-name>
- <servlet-class>edu.internet2.middleware.shibboleth.hs.HandleServlet</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>AA</servlet-name>
- <display-name>Shibboleth Attribute Authority</display-name>
- <servlet-class>edu.internet2.middleware.shibboleth.aa.AAServlet</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>WAYF</servlet-name>
- <display-name>Shibboleth WAYF Service</display-name>
- <servlet-class>edu.internet2.middleware.shibboleth.wayf.WayfService</servlet-class>
- <init-param>
- <param-name>SiteConfigFileLocation</param-name>
- <param-value>/conf/sites.xml</param-value>
- </init-param>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>WAYF</servlet-name>
- <url-pattern>/WAYF</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>HS</servlet-name>
- <url-pattern>/HS</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AA</servlet-name>
- <url-pattern>/AA</url-pattern>
- </servlet-mapping>
-
- <mime-mapping>
- <extension>css</extension>
- <mime-type>text/css</mime-type>
- </mime-mapping>
-</web-app>
--- /dev/null
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+
+ <filter>
+ <filter-name>Client Cert AuthN Filter</filter-name>
+ <filter-class>edu.internet2.middleware.shibboleth.utils.ClientCertTrustFilter</filter-class>
+ <init-param>
+ <param-name>regex</param-name>
+ <param-value>.*CN=([^,/]+).*</param-value>
+ </init-param>
+ <init-param>
+ <param-name>matchGroup</param-name>
+ <param-value>1</param-value>
+ </init-param>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>Client Cert AuthN Filter</filter-name>
+ <url-pattern>/SSO</url-pattern>
+ </filter-mapping>
+
+ <context-param>
+ <param-name>IdPConfigFile</param-name>
+ <param-value>$SHIB_HOME$/etc/idp.xml</param-value>
+ </context-param>
+
+ <servlet>
+ <servlet-name>IdP</servlet-name>
+ <display-name>Shibboleth Identity Provider</display-name>
+ <servlet-class>edu.internet2.middleware.shibboleth.idp.IdPResponder</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>IdP</servlet-name>
+ <url-pattern>/SSO</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>IdP</servlet-name>
+ <url-pattern>/AA</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>IdP</servlet-name>
+ <url-pattern>/Artifact</url-pattern>
+ </servlet-mapping>
+
+ <mime-mapping>
+ <extension>css</extension>
+ <mime-type>text/css</mime-type>
+ </mime-mapping>
+
+</web-app>
--- /dev/null
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+
+ <context-param>
+ <param-name>IdPConfigFile</param-name>
+ <param-value>$SHIB_HOME$/etc/idp.xml</param-value>
+ </context-param>
+
+ <servlet>
+ <servlet-name>IdP</servlet-name>
+ <display-name>Shibboleth Identity Provider</display-name>
+ <servlet-class>edu.internet2.middleware.shibboleth.idp.IdPResponder</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>IdP</servlet-name>
+ <url-pattern>/SSO</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>IdP</servlet-name>
+ <url-pattern>/AA</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>IdP</servlet-name>
+ <url-pattern>/Artifact</url-pattern>
+ </servlet-mapping>
+
+ <mime-mapping>
+ <extension>css</extension>
+ <mime-type>text/css</mime-type>
+ </mime-mapping>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Shibboleth SSO Service</web-resource-name>
+ <url-pattern>/SSO</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>tomcat</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>Shibboleth SSO Service</realm-name>
+ </login-config>
+
+</web-app>
--- /dev/null
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+ <context-param>
+ <param-name>IdPConfigFile</param-name>
+ <param-value>$SHIB_HOME$/etc/idp.xml</param-value>
+ </context-param>
+
+ <servlet>
+ <servlet-name>IdP</servlet-name>
+ <display-name>Shibboleth Identity Provider</display-name>
+ <servlet-class>edu.internet2.middleware.shibboleth.idp.IdPResponder</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>IdP</servlet-name>
+ <url-pattern>/SSO</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>IdP</servlet-name>
+ <url-pattern>/AA</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>IdP</servlet-name>
+ <url-pattern>/Artifact</url-pattern>
+ </servlet-mapping>
+
+ <mime-mapping>
+ <extension>css</extension>
+ <mime-type>text/css</mime-type>
+ </mime-mapping>
+
+</web-app>
+++ /dev/null
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-
- <filter>
- <filter-name>Client Cert AuthN Filter</filter-name>
- <filter-class>
- edu.internet2.middleware.shibboleth.utils.ClientCertTrustFilter
- </filter-class>
- <init-param>
- <param-name>regex</param-name>
- <param-value>.*CN=([^,/]+).*</param-value>
- </init-param>
- <init-param>
- <param-name>matchGroup</param-name>
- <param-value>1</param-value>
- </init-param>
- </filter>
-
- <filter-mapping>
- <filter-name>Client Cert AuthN Filter</filter-name>
- <url-pattern>/HS</url-pattern>
- </filter-mapping>
-
- <context-param>
- <param-name>OriginConfigFile</param-name>
- <param-value>/conf/origin.xml</param-value>
- </context-param>
-
- <listener>
- <listener-class>edu.internet2.middleware.shibboleth.log.LoggingContextListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>HS</servlet-name>
- <display-name>Shibboleth Handle Service</display-name>
- <servlet-class>edu.internet2.middleware.shibboleth.hs.HandleServlet</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>AA</servlet-name>
- <display-name>Shibboleth Attribute Authority</display-name>
- <servlet-class>edu.internet2.middleware.shibboleth.aa.AAServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>HS</servlet-name>
- <url-pattern>/HS</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AA</servlet-name>
- <url-pattern>/AA</url-pattern>
- </servlet-mapping>
-
- <mime-mapping>
- <extension>css</extension>
- <mime-type>text/css</mime-type>
- </mime-mapping>
-
-</web-app>
+++ /dev/null
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
- <context-param>
- <param-name>OriginConfigFile</param-name>
- <param-value>/conf/origin.xml</param-value>
- </context-param>
-
- <listener>
- <listener-class>edu.internet2.middleware.shibboleth.log.LoggingContextListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>HS</servlet-name>
- <display-name>Shibboleth Handle Service</display-name>
- <servlet-class>edu.internet2.middleware.shibboleth.hs.HandleServlet</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>AA</servlet-name>
- <display-name>Shibboleth Attribute Authority</display-name>
- <servlet-class>edu.internet2.middleware.shibboleth.aa.AAServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>HS</servlet-name>
- <url-pattern>/HS</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AA</servlet-name>
- <url-pattern>/AA</url-pattern>
- </servlet-mapping>
-
- <mime-mapping>
- <extension>css</extension>
- <mime-type>text/css</mime-type>
- </mime-mapping>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Shibboleth Handle Service</web-resource-name>
- <url-pattern>/HS</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>tomcat</role-name>
- </auth-constraint>
- </security-constraint>
- <login-config>
- <auth-method>BASIC</auth-method>
- <realm-name>Shibboleth Handle Service</realm-name>
- </login-config>
-
-</web-app>
+++ /dev/null
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
- <context-param>
- <param-name>OriginConfigFile</param-name>
- <param-value>/conf/origin.xml</param-value>
- </context-param>
-
- <listener>
- <listener-class>edu.internet2.middleware.shibboleth.log.LoggingContextListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>HS</servlet-name>
- <display-name>Shibboleth Handle Service</display-name>
- <servlet-class>edu.internet2.middleware.shibboleth.hs.HandleServlet</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>AA</servlet-name>
- <display-name>Shibboleth Attribute Authority</display-name>
- <servlet-class>edu.internet2.middleware.shibboleth.aa.AAServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>HS</servlet-name>
- <url-pattern>/HS</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>AA</servlet-name>
- <url-pattern>/AA</url-pattern>
- </servlet-mapping>
-
- <mime-mapping>
- <extension>css</extension>
- <mime-type>text/css</mime-type>
- </mime-mapping>
-</web-app>
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
- <listener>
- <listener-class>edu.internet2.middleware.shibboleth.log.LoggingContextListener</listener-class>
- </listener>
<servlet>
<servlet-name>WAYF</servlet-name>