Updated for new targets.

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

diff --git a/build.xml b/build.xml
index 98ebb44..efc1aa0 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -5,11 +5,12 @@
        <!-- Set global properties for this build -->
        <property name="distname" value="shibboleth" />
        <property name="root" value="." />
-       <property name="src" value="${root}/source" />
+       <property name="src" value="${root}/src" />
        <property name="approot" value="${root}/webApplication" />
+       <property name="configroot" value="${root}/webAppConfig" />
        <property name="build" value="${approot}/WEB-INF/classes" />
        <property name="libdir" value="${approot}/WEB-INF/lib" />
-       <property name="buildlibs" value="${root}/buildlibs" />
+       <property name="buildlibs" value="${root}/lib" />
        <property name="dist" value="${root}/dist" />
 
 
@@ -35,7 +36,9 @@
 
        <!-- Compile classes and move them to ${build} -->
        <target name="compile-all" depends="init">
-               <javac srcdir="${src}" destdir="${build}" includes="**/*.java" excludes="edu/internet2/middleware/shibboleth/aaLocal/**" debug="on">
+               <javac srcdir="${src}" destdir="${build}" includes="**/*.java" debug="on">
+                       <exclude name="edu/internet2/middleware/shibboleth/aaLocal/**" />
+                       <exclude name="edu/internet2/middleware/shibboleth/hs-cmu/**" />
                        <classpath refid="build.path" />
                </javac>
                <copy todir="${build}/schemas">
@@ -46,16 +49,35 @@
 
 
        <!-- Create various product distributions and move them to ${dist} -->
-       <target name="dist-all" depends="compile-all, package, clean-build" />
-       <target name="dist-origin" depends="compile-all, package, clean-build" />
-       <target name="dist-target" depends="compile-all, package, clean-build" />
-       <target name="dist-wayf" depends="compile-all, package, clean-build" />
-       <target name="package">
+       <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" />
        </target>
 
+       <target name="dist-origin" depends="compile-all, test-origin, package-origin, clean-build" />
+       <target name="package-origin">
+               <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-includeswayf" depends="compile-all, test-target, test-wayf, package-target-includeswayf, clean-build" />
+       <target name="package-target-includeswayf">
+               <war warfile="${dist}/${distname}-target.war" webxml="${configroot}/target-includeswayf.xml" basedir="${approot}" update="no" />
+       </target>
+
+       <target name="dist-wayf" depends="compile-all, test-wayf, package-wayf, clean-build" />
+       <target name="package-wayf">
+               <war warfile="${dist}/${distname}-wayf.war" webxml="${configroot}/wayf.xml" basedir="${approot}" update="no" />
+       </target>
+
 
        <!-- Cleanup after the build, test, and distribution processes -->
+       <target name="clean" depends="clean-all" />
        <target name="clean-all" depends="clean-build, clean-dist, clean-test" />
        <target name="clean-build">
                <delete dir="${build}" />
@@ -73,12 +95,15 @@
 
        
        <!-- Run automated tests on compiled code -->
-       <target name="test-all" depends="test-common" />
+       <target name="test-all" depends="test-origin, test-target, 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">
                        <classpath refid="build.path" />
                        <formatter type="plain" />
-                       <test name="edu.internet2.middleware.shibboleth.common.AQHTest" />
+               <!--    <test name="edu.internet2.middleware.shibboleth.common.AQHTest" /> -->
                </junit>
        </target>
 

diff --git a/webAppConfig/origin.xml b/webAppConfig/origin.xml
new file mode 100755 (executable)
index 0000000..8be1d46
--- /dev/null
+++ b/webAppConfig/origin.xml
@@ -0,0 +1,32 @@
+<?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>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>

diff --git a/webAppConfig/target-includewayf.xml b/webAppConfig/target-includewayf.xml
new file mode 100755 (executable)
index 0000000..9a097ad
--- /dev/null
+++ b/webAppConfig/target-includewayf.xml
@@ -0,0 +1,22 @@
+<?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>SHIRE</servlet-name>
+               <display-name>Shibboleth SHIRE Component</display-name>
+               <servlet-class>edu.internet2.middleware.shibboleth.shire.ShireServlet</servlet-class>
+       </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>

diff --git a/webAppConfig/target.xml b/webAppConfig/target.xml
new file mode 100755 (executable)
index 0000000..9a097ad
--- /dev/null
+++ b/webAppConfig/target.xml
@@ -0,0 +1,22 @@
+<?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>SHIRE</servlet-name>
+               <display-name>Shibboleth SHIRE Component</display-name>
+               <servlet-class>edu.internet2.middleware.shibboleth.shire.ShireServlet</servlet-class>
+       </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>

diff --git a/webAppConfig/wayf.xml b/webAppConfig/wayf.xml
new file mode 100755 (executable)
index 0000000..c8c9638
--- /dev/null
+++ b/webAppConfig/wayf.xml
@@ -0,0 +1,32 @@
+<?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>WAYF</servlet-name>
+               <display-name>Shibboleth WAYF Service</display-name>
+               <servlet-class>edu.internet2.middleware.shibboleth.wayf.WayfService</servlet-class>
+       </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>
+               <mime-type>text/css</mime-type>
+       </mime-mapping>
+</web-app>