Added LogServ to war configurations.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@110 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/webAppConfig/origin.xml b/webAppConfig/origin.xml
index caa6dd5..b7c6336 100755 (executable)
--- a/webAppConfig/origin.xml
+++ b/webAppConfig/origin.xml
@@ -6,6 +6,15 @@
 
 <web-app>
        <servlet>
+               <servlet-name>Logging Service</servlet-name>
+               <servlet-class>edu.internet2.middleware.shibboleth.log.LogServ</servlet-class>
+               <init-param>
+                       <param-name>log4jConfigFileLocation</param-name>
+                       <param-value>/WEB-INF/conf/log4j.properties</param-value>
+               </init-param>
+               <load-on-startup>1</load-on-startup>
+       </servlet>
+       <servlet>
                <servlet-name>HS</servlet-name>
                <display-name>Shibboleth Handle Service</display-name>
                <servlet-class>edu.internet2.middleware.shibboleth.hs.HandleServlet</servlet-class>

diff --git a/webAppConfig/target-includewayf.xml b/webAppConfig/target-includewayf.xml
index 75aa1b9..0f6b010 100755 (executable)
--- a/webAppConfig/target-includewayf.xml
+++ b/webAppConfig/target-includewayf.xml
@@ -6,6 +6,15 @@
 
 <web-app>
        <servlet>
+               <servlet-name>Logging Service</servlet-name>
+               <servlet-class>edu.internet2.middleware.shibboleth.log.LogServ</servlet-class>
+               <init-param>
+                       <param-name>log4jConfigFileLocation</param-name>
+                       <param-value>/WEB-INF/conf/log4j.properties</param-value>
+               </init-param>
+               <load-on-startup>1</load-on-startup>
+       </servlet>
+       <servlet>
                <servlet-name>SHIRE</servlet-name>
                <display-name>Shibboleth SHIRE Component</display-name>
                <servlet-class>edu.internet2.middleware.shibboleth.shire.ShireServlet</servlet-class>

diff --git a/webAppConfig/target.xml b/webAppConfig/target.xml
index 9a097ad..7e01c21 100755 (executable)
--- a/webAppConfig/target.xml
+++ b/webAppConfig/target.xml
@@ -6,6 +6,15 @@
 
 <web-app>
        <servlet>
+               <servlet-name>Logging Service</servlet-name>
+               <servlet-class>edu.internet2.middleware.shibboleth.log.LogServ</servlet-class>
+               <init-param>
+                       <param-name>log4jConfigFileLocation</param-name>
+                       <param-value>/WEB-INF/conf/log4j.properties</param-value>
+               </init-param>
+               <load-on-startup>1</load-on-startup>
+       </servlet>
+       <servlet>
                <servlet-name>SHIRE</servlet-name>
                <display-name>Shibboleth SHIRE Component</display-name>
                <servlet-class>edu.internet2.middleware.shibboleth.shire.ShireServlet</servlet-class>

diff --git a/webAppConfig/wayf.xml b/webAppConfig/wayf.xml
index c8c9638..d2f15fc 100755 (executable)
--- a/webAppConfig/wayf.xml
+++ b/webAppConfig/wayf.xml
@@ -6,6 +6,15 @@
 
 <web-app>
        <servlet>
+               <servlet-name>Logging Service</servlet-name>
+               <servlet-class>edu.internet2.middleware.shibboleth.log.LogServ</servlet-class>
+               <init-param>
+                       <param-name>log4jConfigFileLocation</param-name>
+                       <param-value>/WEB-INF/conf/log4j.properties</param-value>
+               </init-param>
+               <load-on-startup>1</load-on-startup>
+       </servlet>
+       <servlet>
                <servlet-name>WAYF</servlet-name>
                <display-name>Shibboleth WAYF Service</display-name>
                <servlet-class>edu.internet2.middleware.shibboleth.wayf.WayfService</servlet-class>

diff --git a/webApplication/WEB-INF/web.xml b/webApplication/WEB-INF/web.xml
index 2b82fa9..b7c6336 100755 (executable)
--- a/webApplication/WEB-INF/web.xml
+++ b/webApplication/WEB-INF/web.xml
@@ -6,25 +6,104 @@
 
 <web-app>
        <servlet>
-               <servlet-name>
-          HS
-               </servlet-name>
-               <servlet-class>
-          edu.internet2.middleware.shibboleth.hs.HandleService
-               </servlet-class>
+               <servlet-name>Logging Service</servlet-name>
+               <servlet-class>edu.internet2.middleware.shibboleth.log.LogServ</servlet-class>
+               <init-param>
+                       <param-name>log4jConfigFileLocation</param-name>
+                       <param-value>/WEB-INF/conf/log4j.properties</param-value>
+               </init-param>
+               <load-on-startup>1</load-on-startup>
        </servlet>
        <servlet>
-                       <servlet-name>WAYFTester</servlet-name>
-                       <display-name>WAYF Tester</display-name>
-                       <servlet-class>edu.internet2.middleware.shibboleth.wayf.WayfTester</servlet-class>
+               <servlet-name>HS</servlet-name>
+               <display-name>Shibboleth Handle Service</display-name>
+               <servlet-class>edu.internet2.middleware.shibboleth.hs.HandleServlet</servlet-class>
+               <init-param>
+                       <param-name>domain</param-name>
+                       <param-value>demo.edu</param-value>
+               </init-param>
+               <init-param>
+                       <param-name>HSname</param-name>
+                       <param-value>shib2.internet2.edu</param-value>
+               </init-param>
+               <init-param>
+                       <param-name>ticket</param-name>
+                       <param-value>1400000</param-value>
+               </init-param>
+               <init-param>
+                         <param-name>AAurl</param-name>
+                         <param-value>https://shib2.internet2.edu/shibboleth-origin/servlet/AA</param-value>
+               </init-param>
+               <init-param>
+                       <param-name>DBdriver</param-name>
+                       <param-value>org.gjt.mm.mysql.Driver</param-value>
+               </init-param>
+               <init-param>
+                       <param-name>DBuser</param-name>
+                       <param-value>shib</param-value>
+               </init-param>
+               <init-param>
+                       <param-name>DBpass</param-name>
+                       <param-value>shib</param-value>
+               </init-param>
+               <init-param>
+                       <param-name>DBdomain</param-name>
+                       <param-value>shib2.internet2.edu</param-value>
+               </init-param>
+               <init-param>
+                       <param-name>KSpath</param-name>
+                       <param-value>/WEB-INF/conf/keystore.jks</param-value>
+               </init-param>
+               <init-param>
+                       <param-name>KSpass</param-name>
+                       <param-value>shibhs</param-value>
+               </init-param>
+               <init-param>
+                       <param-name>KSkeyalias</param-name>
+                       <param-value>shibhs</param-value>
+               </init-param>
+               <init-param>
+                       <param-name>KSkeypass</param-name>
+                       <param-value>shibhs</param-value>
+               </init-param>
+               <init-param>
+                       <param-name>certalias</param-name>
+                       <param-value>shibhs</param-value>
+               </init-param>
        </servlet>
        <servlet>
-               <servlet-name>WAYF</servlet-name>
-               <display-name>WAYF</display-name>
-               <servlet-class>edu.internet2.middleware.shibboleth.wayf.WayfService</servlet-class>
+               <servlet-name>AA</servlet-name>
+               <display-name>Shibboleth Attribute Authority</display-name>
+               <servlet-class>edu.internet2.middleware.shibboleth.aa.AAServlet</servlet-class>
+               
+               <init-param>
+                   <param-name>domain</param-name>
+                   <param-value>shib2.internet2.edu</param-value>
+               </init-param>
+
+               <init-param>
+                   <param-name>dirUrl</param-name>
+                   <param-value>ldap://shib2.internet2.edu/ou=People,dc=internet2,dc=edu</param-value>
+               </init-param>
+
+               <init-param>
+                   <param-name>ldapUserDnPhrase</param-name>
+                   <param-value>uid=</param-value>
+               </init-param>
+
+               <init-param>
+                   <param-name>ctxFactoryClass</param-name>
+                   <param-value>edu.internet2.middleware.shibboleth.aaLocal.EchoCtxFactory</param-value>
+               </init-param>
+
+               <init-param>
+                   <param-name>arpFactoryMethod</param-name>
+                   <param-value>file</param-value>
+               </init-param>
+
                <init-param>
-                       <param-name>WAYFConfigFileLocation</param-name>
-                       <param-value>/WEB-INF/conf/shibboleth.xml</param-value>
+                   <param-name>arpFactoryData</param-name>
+                   <param-value>/tmp/shib2/</param-value>
                </init-param>
        </servlet>
       
@@ -33,32 +112,12 @@
                <url-pattern>/HS</url-pattern>
        </servlet-mapping>
        <servlet-mapping>
-               <servlet-name>WAYFTester</servlet-name>
-               <url-pattern>Test</url-pattern>
-       </servlet-mapping>
-       <servlet-mapping>
-               <servlet-name>WAYF</servlet-name>
-               <url-pattern>WAYF</url-pattern>
+               <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>HS Login Test</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>HS Login Test</realm-name>
-       </login-config>
-
 </web-app>