Author: sohil.shah(a)jboss.com
Date: 2009-04-20 15:45:59 -0400 (Mon, 20 Apr 2009)
New Revision: 13239
Modified:
modules/identity/trunk/sso/build.xml
Log:
reverting so no merging necessary
Modified: modules/identity/trunk/sso/build.xml
===================================================================
--- modules/identity/trunk/sso/build.xml 2009-04-20 18:10:27 UTC (rev 13238)
+++ modules/identity/trunk/sso/build.xml 2009-04-20 19:45:59 UTC (rev 13239)
@@ -81,31 +81,51 @@
It also deploys any custom configuration/dependencies into the JOSSO war file which is
the
JOSSO Authentication Server
-->
- <target name="install-josso">
- <!-- core jboss portal installation -->
+ <target name="install-josso">
+ <!-- portal-josso sar file setup -->
<jar destfile="target/portal-josso.sar">
<fileset dir="src/resources/portal-josso-sso-sar"/>
<fileset dir="target"
includes="identity-sso-*-SNAPSHOT.jar"/>
</jar>
- <copy todir="${jboss.home}/server/${josso.deploy.dir}/jboss-portal.sar"
overwrite="true">
+ <copy todir="${jboss.home}/server/${josso.deploy.dir}"
overwrite="true">
<fileset file="target/portal-josso.sar"/>
</copy>
- <copy
todir="${jboss.home}/server/${josso.deploy.dir}/jboss-portal.sar/portal-server.war"
overwrite="true">
- <fileset dir="src/etc/josso/jboss-portal"
includes="login.jsp"/>
+
+ <!-- core josso integration with JBoss AS setup -->
+ <copy todir="${jboss.home}/server/${josso.deploy.dir}/../conf"
overwrite="true">
+ <fileset dir="src/etc/josso" includes="josso-agent-config.xml,
josso-config.xml, login-config.xml"/>
+ </copy>
+ <copy
todir="${jboss.home}/server/${josso.deploy.dir}/jbossweb-tomcat55.sar"
overwrite="true">
+ <fileset dir="src/etc/josso" includes="server.xml"/>
+ <fileset file="${josso.jar}"/>
+ <fileset file="${josso-common.jar}"/>
+ <fileset file="${josso-jboss4-plugin.jar}"/>
+ <fileset file="${josso-tomcat55-plugin.jar}"/>
+ <fileset file="${commons-configuration.jar}"/>
+ <fileset file="${xmldb-common.jar}"/>
+ <fileset file="${axis.jar}"/>
+ <fileset file="${commons-discovery.jar}"/>
</copy>
- <copy
todir="${jboss.home}/server/${josso.deploy.dir}/jboss-portal.sar/portal-server.war/WEB-INF"
overwrite="true">
- <fileset dir="src/etc/josso/jboss-portal" includes="context.xml,
jboss-web.xml"/>
- </copy>
- <!-- jboss portal integration with the josso authentication server -->
+ <!-- jboss portal integration with the josso authentication server -->
+ <copy
todir="${jboss.home}/server/${josso.deploy.dir}/josso.war/WEB-INF/classes"
overwrite="true">
+ <fileset dir="src/etc/josso"
includes="josso-gateway-config.xml"/>
+ </copy>
<copy
tofile="${jboss.home}/server/${josso.deploy.dir}/josso.war/WEB-INF/lib/portal-identity-sso-lib.jar"
overwrite="true">
<fileset dir="target"
includes="identity-sso-*-SNAPSHOT.jar"/>
- </copy>
+ </copy>
- <!-- josso AS installation related -->
- <copy todir="${jboss.home}/server/${josso.deploy.dir}/conf"
overwrite="true">
- <fileset dir="src/etc/josso/conf"/>
- </copy>
+ <!-- core jboss portal changes -->
+ <copy
todir="${jboss.home}/server/${josso.deploy.dir}/jboss-portal.sar/portal-server.war"
overwrite="true">
+ <fileset dir="src/etc/josso" includes="login.jsp,
error.jsp"/>
+ </copy>
+ <copy
todir="${jboss.home}/server/${josso.deploy.dir}/jboss-portal.sar/portal-server.war/WEB-INF"
overwrite="true">
+ <fileset dir="src/etc/josso" includes="context.xml"/>
+ </copy>
+ <!-- add portal-identity-sso-lib.jar to jboss portal -->
+ <copy
tofile="${jboss.home}/server/${josso.deploy.dir}/jboss-portal.sar/lib/portal-identity-sso-lib.jar"
overwrite="true">
+ <fileset dir="target"
includes="identity-sso-*-SNAPSHOT.jar"/>
+ </copy>
</target>
<!-- ================================================================== -->