Author: sohil.shah(a)jboss.com
Date: 2007-09-20 00:26:05 -0400 (Thu, 20 Sep 2007)
New Revision: 8376
Modified:
modules/identity/trunk/sso/build.xml
Log:
sso build cleanup
Modified: modules/identity/trunk/sso/build.xml
===================================================================
--- modules/identity/trunk/sso/build.xml 2007-09-20 02:00:51 UTC (rev 8375)
+++ modules/identity/trunk/sso/build.xml 2007-09-20 04:26:05 UTC (rev 8376)
@@ -208,17 +208,43 @@
<mkdir dir="${build.lib}"/>
<jar jarfile="${build.lib}/portal-identity-sso-lib.jar">
<fileset dir="${build.classes}"
excludes="org/jboss/portal/test/**"/>
- </jar>
+ </jar>
+
+ <!-- CAS archive creation -->
+ <copy todir="${build.resources}/portal-cas-sso.sar"
overwrite="true">
+ <fileset dir="${build.resources}/portal-cas-sso-sar"/>
+ </copy>
+ <copy todir="${build.resources}/portal-cas-sso.sar/lib"
overwrite="true">
+ <fileset dir="${cas.cas.lib}" includes="casclient.jar"/>
+ <fileset dir="${build.lib}"
includes="portal-identity-sso-lib.jar"/>
+ </copy>
+ <jar jarfile="${build.lib}/portal-cas.sar">
+ <fileset dir="${build.resources}/portal-cas-sso.sar"/>
+ </jar>
+
+ <copy todir="${build.resources}/portal-caslenient-sso.sar/META-INF"
overwrite="true">
+ <fileset dir="${build.resources}/portal-cas-sso-sar/META-INF"
includes="jboss-service.xml"/>
+ </copy>
+ <copy todir="${build.resources}/portal-caslenient-sso.sar/lib"
overwrite="true">
+ <fileset dir="${cas.cas.lib}"
includes="casclient-lenient.jar"/>
+ <fileset dir="${build.lib}"
includes="portal-identity-sso-lib.jar"/>
+ </copy>
+ <jar jarfile="${build.lib}/portal-cas-lenient.sar">
+ <fileset dir="${build.resources}/portal-caslenient-sso.sar"/>
+ </jar>
+
+ <!-- JOSSO archive creation -->
+ <copy todir="${build.resources}/portal-josso-sso.sar"
overwrite="true">
+ <fileset dir="${build.resources}/portal-josso-sso-sar"/>
+ </copy>
+ <copy todir="${build.resources}/portal-josso-sso.sar/lib"
overwrite="true">
+ <fileset dir="${build.lib}"
includes="portal-identity-sso-lib.jar"/>
+ </copy>
+ <jar jarfile="${build.lib}/portal-josso.sar">
+ <fileset dir="${build.resources}/portal-josso-sso.sar"/>
+ </jar>
</target>
- <target name="package-tests" depends="output">
- <jar jarfile="${build.lib}/portal-identity-sso-test-lib.jar">
- <fileset dir="${build.classes}"/>
- <fileset dir="${build.resources}/portal-identity-test-jar"/>
- </jar>
- </target>
-
-
<!-- ================================================================== -->
<!-- Cleaning -->
<!-- ================================================================== -->
@@ -245,7 +271,17 @@
<target name="main" depends="most"/>
<target name="all" depends="_default:all"/>
<target name="most" depends="_default:most"/>
- <target name="help" depends="_default:help"/>
+ <!--
+ <target name="help" depends="_default:help"/>
+ -->
+ <target name="help">
+ <echo>Clean Build = ant clean main</echo>
+ <echo>Deploy the CAS Integration = ant deploy-cas</echo>
+ <echo>Deploy the CAS Integration (Lenient Version) = ant
deploy-cas-lenient</echo>
+ <echo>Deploy the JOSSO Integration = ant deploy-josso</echo>
+ <echo>Run the test suite = ant tests</echo>
+ <echo>Run the test suite and produce a report = ant tests
reports</echo>
+ </target>
<!-- ================================================================== -->
<!-- Deployment. -->
@@ -262,16 +298,12 @@
-->
<target name="deploy-cas" depends="output">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <delete
file="${jboss.home}/server/${portal.deploy.dir}/portal-cas-sso.sar/lib/casclient-lenient.jar"/>
+ <delete
file="${jboss.home}/server/${portal.deploy.dir}/portal-cas-lenient.sar"/>
<!-- portal-cas-sso sar file setup -->
- <copy
todir="${jboss.home}/server/${portal.deploy.dir}/portal-cas-sso.sar/META-INF"
overwrite="true">
- <fileset dir="${build.resources}/portal-cas-sso-sar/META-INF"
includes="jboss-service.xml"/>
- </copy>
- <copy
todir="${jboss.home}/server/${portal.deploy.dir}/portal-cas-sso.sar/lib"
overwrite="true">
- <fileset dir="${cas.cas.lib}" includes="casclient.jar"/>
- <fileset dir="${build.lib}"
includes="portal-identity-sso-lib.jar"/>
- </copy>
+ <copy todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true">
+ <fileset dir="${build.lib}" includes="portal-cas.sar"/>
+ </copy>
<!-- jboss portal integration with the CAS Authentication server -->
<copy
todir="${jboss.home}/server/${portal.deploy.dir}/cas.war/WEB-INF/lib"
overwrite="true">
@@ -288,16 +320,12 @@
</target>
<target name="deploy-cas-lenient" depends="output">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <delete
file="${jboss.home}/server/${portal.deploy.dir}/portal-cas-sso.sar/lib/casclient.jar"/>
+ <delete
file="${jboss.home}/server/${portal.deploy.dir}/portal-cas.sar"/>
<!-- portal-cas-sso sar file setup -->
- <copy
todir="${jboss.home}/server/${portal.deploy.dir}/portal-cas-sso.sar/META-INF"
overwrite="true">
- <fileset dir="${build.resources}/portal-cas-sso-sar/META-INF"
includes="jboss-service.xml"/>
- </copy>
- <copy
todir="${jboss.home}/server/${portal.deploy.dir}/portal-cas-sso.sar/lib"
overwrite="true">
- <fileset dir="${cas.cas.lib}"
includes="casclient-lenient.jar"/>
- <fileset dir="${build.lib}"
includes="portal-identity-sso-lib.jar"/>
- </copy>
+ <copy todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true">
+ <fileset dir="${build.lib}"
includes="portal-cas-lenient.sar"/>
+ </copy>
<!-- jboss portal integration with the CAS Authentication server -->
<copy
todir="${jboss.home}/server/${portal.deploy.dir}/cas.war/WEB-INF/lib"
overwrite="true">
@@ -313,7 +341,7 @@
</copy>
</target>
- <!--
+ <!--
Deploying the JOSSO SSO Framework integration
These tasks deploy the JBoss Portal JOSSO integration as a separate service packaged
as
@@ -324,13 +352,11 @@
-->
<target name="deploy-josso" depends="output">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
+
<!-- portal-josso sar file setup -->
- <copy
todir="${jboss.home}/server/${portal.deploy.dir}/portal-josso-sso.sar/META-INF"
overwrite="true">
- <fileset dir="${build.resources}/portal-josso-sso-sar/META-INF"
includes="jboss-service.xml"/>
- </copy>
- <copy
todir="${jboss.home}/server/${portal.deploy.dir}/portal-josso-sso.sar/lib"
overwrite="true">
- <fileset dir="${build.lib}"
includes="portal-identity-sso-lib.jar"/>
- </copy>
+ <copy todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true">
+ <fileset dir="${build.lib}" includes="portal-josso.sar"/>
+ </copy>
<!-- core josso integration with JBoss AS setup -->
<copy todir="${jboss.home}/server/${portal.deploy.dir}/../conf"
overwrite="true">
@@ -361,10 +387,14 @@
<!-- ================================================================== -->
<!-- Testing and Reporting. -->
- <!-- ================================================================== -->
- <!--
- Unit Testing the SSO Framework integrations
- -->
+ <!-- ================================================================== -->
+ <target name="package-tests" depends="output">
+ <jar jarfile="${build.lib}/portal-identity-sso-test-lib.jar">
+ <fileset dir="${build.classes}"/>
+ <fileset dir="${build.resources}/portal-identity-test-jar"/>
+ </jar>
+ </target>
+
<target name="tests" depends="package-tests">
<execute-tests>
<!--
@@ -392,11 +422,7 @@
<path refid="jboss.portal/modules/common.classpath"/>
</x-classpath>
</execute-tests>
- </target>
-
- <!--
- Produces test reports
- -->
+ </target>
<target name="reports" depends="init">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.reports}/html"/>
Show replies by date