Build cleanups. Removed targets for old "shib target" code.
authorwassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Wed, 6 Nov 2002 19:28:37 +0000 (19:28 +0000)
committerwassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Wed, 6 Nov 2002 19:28:37 +0000 (19:28 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@344 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

build.xml
webAppConfig/all.xml [moved from webApplication/WEB-INF/web.xml with 70% similarity]
webAppConfig/target-includewayf.xml [deleted file]
webAppConfig/target.xml [deleted file]
webAppConfig/wayf.xml

index 48be80a..3f0ac0a 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -46,7 +46,6 @@
     <!-- Compile classes and move them to ${build} -->
     <target name="compile-all" depends="init">
         <javac srcdir="${src}" destdir="${build}" includes="**/*.java" debug="on">
-            <exclude name="edu/internet2/middleware/shibboleth/hs-cmu/**" />
             <classpath refid="build.path" />
         </javac>
         <copy todir="${build}/schemas">
@@ -72,7 +71,7 @@
     <target name="dist" depends="dist-all" />
     <target name="dist-all" depends="compile-all, test-all, package-all, clean-build" />
     <target name="package-all">
-        <war warfile="${dist}/${distname}.war" webxml="${approot}/WEB-INF/web.xml" basedir="${approot}" update="no" />
+        <war warfile="${dist}/${distname}.war" webxml="${configroot}/all.xml" basedir="${approot}" update="no" />
     </target>
 
     <target name="dist-origin" depends="compile-all, test-origin, package-origin, clean-build" />
         <war warfile="${dist}/${distname}-origin.war" webxml="${configroot}/origin.xml" basedir="${approot}" update="no" />
     </target>
 
-    <target name="dist-target" depends="compile-all, test-target, package-target, clean-build" />
-    <target name="package-target">
-        <war warfile="${dist}/${distname}-target.war" webxml="${configroot}/target.xml" basedir="${approot}" update="no" />
-    </target>
-
-    <target name="dist-target-includewayf" depends="compile-all, test-target, test-wayf, package-target-includewayf, clean-build" />
-    <target name="package-target-includewayf">
-        <war warfile="${dist}/${distname}-target.war" webxml="${configroot}/target-includewayf.xml" basedir="${approot}" update="no" />
-    </target>
-
     <!-- Build utilities -->
     <target name="build-util" depends="compile-all">
         <jar jarfile="${dist}/shib-util.jar" basedir="${build}" />
 
     
     <!-- Run automated tests on compiled code -->
-    <target name="test-all" depends="test-origin, test-target, test-wayf" />
+    <target name="test-all" depends="test-origin, test-wayf" />
     <target name="test-origin" depends="test-common" />
-    <target name="test-target" depends="test-common" />
     <target name="test-wayf" depends="test-common" />
     <target name="test-common" depends="compile-all">
         <junit printsummary="no" fork="no" haltonfailure="yes" haltonerror="no">
similarity index 70%
rename from webApplication/WEB-INF/web.xml
rename to webAppConfig/all.xml
index 4a8ed86..78aa998 100755 (executable)
                     <param-value>/sites.xml</param-value>
                 </init-param>
        </servlet>
-       <servlet>
-               <servlet-name>WAYFTester</servlet-name>
-               <display-name>Simple servlet for testing WAYF functionality</display-name>
-               <servlet-class>edu.internet2.middleware.shibboleth.wayf.WayfTester</servlet-class>
-       </servlet>
-       <servlet>
-               <servlet-name>SHIRE</servlet-name>
-               <display-name>Shibboleth SHIRE Component</display-name>
-               <servlet-class>edu.internet2.middleware.shibboleth.shire.ShireServlet</servlet-class>
-       <init-param>
-               <param-name>cookie-name</param-name>
-               <param-value>shib_shib1</param-value>
-       </init-param>
-       <init-param>
-               <param-name>session-dir</param-name>
-               <param-value>/tmp/shiresessions</param-value>
-       </init-param>
-       <init-param>
-               <param-name>ssl-only</param-name>
-               <param-value>true</param-value>
-       </init-param>
-       <init-param>
-               <param-name>check-address</param-name>
-               <param-value>true</param-value>
-       </init-param>
-       <init-param>
-               <param-name>verbose</param-name>
-               <param-value>true</param-value>
-       </init-param>
-       <init-param>
-               <param-name>keystore-path</param-name>
-               <param-value>/WEB-INF/conf/roots.jks</param-value>
-       </init-param>
-       <init-param>
-               <param-name>keystore-alias</param-name>
-               <param-value>internet2</param-value>
-       </init-param>
-       <init-param>
-               <param-name>keystore-password</param-name>
-               <param-value>shibboleth</param-value>
-       </init-param>
-       <init-param>
-               <param-name>registry-uri</param-name>
-               <param-value>http://shib1.internet2.edu:8000/shibboleth-target/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>WAYFTester</servlet-name>
-               <url-pattern>/WAYFTester</url-pattern>
-       </servlet-mapping>  
      <servlet-mapping>
                <servlet-name>HS</servlet-name>
                <url-pattern>/HS</url-pattern>
                <servlet-name>AA</servlet-name>
                <url-pattern>/AA</url-pattern>
        </servlet-mapping>
-       <servlet-mapping>
-               <servlet-name>SHIRE</servlet-name>
-               <url-pattern>/SHIRE</url-pattern>
-       </servlet-mapping>
        
        <mime-mapping>
                <extension>css</extension>
diff --git a/webAppConfig/target-includewayf.xml b/webAppConfig/target-includewayf.xml
deleted file mode 100755 (executable)
index d718888..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
-    "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
-
-<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>
-                <init-param>
-                    <param-name>SiteConfigFileLocation</param-name>
-                    <param-value>/sites.xml</param-value>
-                </init-param>
-       </servlet>
-       <servlet>
-               <servlet-name>WAYFTester</servlet-name>
-               <display-name>Simple servlet for testing WAYF functionality</display-name>
-               <servlet-class>edu.internet2.middleware.shibboleth.wayf.WayfTester</servlet-class>
-       </servlet>
-       <servlet>
-               <servlet-name>SHIRE</servlet-name>
-               <display-name>Shibboleth SHIRE Component</display-name>
-               <servlet-class>edu.internet2.middleware.shibboleth.shire.ShireServlet</servlet-class>
-       <init-param>
-               <param-name>cookie-name</param-name>
-               <param-value>shib_shib1</param-value>
-       </init-param>
-       <init-param>
-               <param-name>session-dir</param-name>
-               <param-value>/tmp/shiresessions</param-value>
-       </init-param>
-       <init-param>
-               <param-name>ssl-only</param-name>
-               <param-value>true</param-value>
-       </init-param>
-       <init-param>
-               <param-name>check-address</param-name>
-               <param-value>true</param-value>
-       </init-param>
-       <init-param>
-               <param-name>verbose</param-name>
-               <param-value>true</param-value>
-       </init-param>
-       <init-param>
-               <param-name>keystore-path</param-name>
-               <param-value>/WEB-INF/conf/roots.jks</param-value>
-       </init-param>
-       <init-param>
-               <param-name>keystore-alias</param-name>
-               <param-value>internet2</param-value>
-       </init-param>
-       <init-param>
-               <param-name>keystore-password</param-name>
-               <param-value>shibboleth</param-value>
-       </init-param>
-       <init-param>
-               <param-name>registry-uri</param-name>
-               <param-value>http://shib1.internet2.edu:8000/shibboleth-target/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>WAYFTester</servlet-name>
-               <url-pattern>/WAYFTester</url-pattern>
-       </servlet-mapping>  
-       <servlet-mapping>
-               <servlet-name>SHIRE</servlet-name>
-               <url-pattern>/SHIRE</url-pattern>
-       </servlet-mapping>
-       
-       <mime-mapping>
-               <extension>css</extension>
-               <mime-type>text/css</mime-type>
-       </mime-mapping>
-</web-app>
diff --git a/webAppConfig/target.xml b/webAppConfig/target.xml
deleted file mode 100755 (executable)
index b1f6ea9..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
-    "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
-
-<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>
-       <init-param>
-               <param-name>cookie-name</param-name>
-               <param-value>shib_shib1</param-value>
-       </init-param>
-       <init-param>
-               <param-name>session-dir</param-name>
-               <param-value>/tmp/shiresessions</param-value>
-       </init-param>
-       <init-param>
-               <param-name>ssl-only</param-name>
-               <param-value>true</param-value>
-       </init-param>
-       <init-param>
-               <param-name>check-address</param-name>
-               <param-value>true</param-value>
-       </init-param>
-       <init-param>
-               <param-name>verbose</param-name>
-               <param-value>true</param-value>
-       </init-param>
-       <init-param>
-               <param-name>keystore-path</param-name>
-               <param-value>/WEB-INF/conf/roots.jks</param-value>
-       </init-param>
-       <init-param>
-               <param-name>keystore-alias</param-name>
-               <param-value>internet2</param-value>
-       </init-param>
-       <init-param>
-               <param-name>keystore-password</param-name>
-               <param-value>shibboleth</param-value>
-       </init-param>
-       <init-param>
-               <param-name>registry-uri</param-name>
-               <param-value>http://shib1.internet2.edu:8000/shibboleth-target/sites.xml</param-value>
-       </init-param>
-       </servlet>
-     <servlet-mapping>
-               <servlet-name>SHIRE</servlet-name>
-               <url-pattern>/SHIRE</url-pattern>
-       </servlet-mapping>
-       
-       <mime-mapping>
-               <extension>css</extension>
-               <mime-type>text/css</mime-type>
-       </mime-mapping>
-</web-app>
index 94ca936..54b34ec 100755 (executable)
                     <param-value>/sites.xml</param-value>
                 </init-param>
        </servlet>
-       <servlet>
-               <servlet-name>WAYFTester</servlet-name>
-               <display-name>Simple servlet for testing WAYF functionality</display-name>
-               <servlet-class>edu.internet2.middleware.shibboleth.wayf.WayfTester</servlet-class>
-       </servlet>
       
      <servlet-mapping>
                <servlet-name>WAYF</servlet-name>
                <url-pattern>/WAYF</url-pattern>
        </servlet-mapping>
-       <servlet-mapping>
-               <servlet-name>WAYFTester</servlet-name>
-               <url-pattern>/WAYFTester</url-pattern>
-       </servlet-mapping>
        
        <mime-mapping>
                <extension>css</extension>