2:04 p.m.
Author: sohil.shah(a)jboss.com
Date: 2008-02-01 15:04:09 -0500 (Fri, 01 Feb 2008)
New Revision: 9703
Modified:
modules/identity/trunk/sso/build.xml
modules/identity/trunk/sso/pom.xml
modules/identity/trunk/sso/src/main/java/org/jboss/portal/identity/sso/josso/JOSSOLogoutValve.java
Log:
build cleanup
Modified: modules/identity/trunk/sso/build.xml
===================================================================
--- modules/identity/trunk/sso/build.xml 2008-02-01 18:10:37 UTC (rev 9702)
+++ modules/identity/trunk/sso/build.xml 2008-02-01 20:04:09 UTC (rev 9703)
@@ -44,26 +44,30 @@
http://repository.jboss.com/cas/3.0.7/lib/casclient-lenient.jar
-->
<target name="install-cas">
+ <!-- portal-cas sar file setup -->
+ <jar destfile="target/portal-cas.sar">
+ <fileset dir="src/resources/portal-cas-sso-sar"/>
+ <fileset dir="target"
includes="identity-sso-*-SNAPSHOT.jar"/>
+ <fileset file="${cas.client.jar}"/>
+ </jar>
+ <copy todir="${jboss.home}/server/${cas.deploy.dir}"
overwrite="true">
+ <fileset file="target/portal-cas.sar"/>
+ </copy>
+
<!-- jboss portal integration with the CAS Authentication server -->
- <copy
tofile="${JBOSS_HOME}/server/${cas.deploy.dir}/cas.war/WEB-INF/lib/portal-identity-sso-lib.jar"
overwrite="true">
+ <copy
tofile="${jboss.home}/server/${cas.deploy.dir}/cas.war/WEB-INF/lib/portal-identity-sso-lib.jar"
overwrite="true">
<fileset dir="target"
includes="identity-sso-*-SNAPSHOT.jar"/>
</copy>
- <copy todir="${JBOSS_HOME}/server/${cas.deploy.dir}/cas.war/WEB-INF"
overwrite="true">
+ <copy todir="${jboss.home}/server/${cas.deploy.dir}/cas.war/WEB-INF"
overwrite="true">
<fileset dir="src/etc/cas"
includes="deployerConfigContext.xml"/>
</copy>
<!-- core jboss portal changes -->
- <copy
todir="${JBOSS_HOME}/server/${cas.deploy.dir}/jboss-portal.sar/portal-server.war/WEB-INF"
overwrite="true">
+ <copy
todir="${jboss.home}/server/${cas.deploy.dir}/jboss-portal.sar/portal-server.war/WEB-INF"
overwrite="true">
<fileset dir="src/etc/cas" includes="context.xml"/>
- </copy>
- <!-- jboss-service.xml override -->
- <copy
todir="${JBOSS_HOME}/server/${cas.deploy.dir}/jboss-portal.sar/META-INF"
overwrite="true">
- <fileset dir="src/etc/cas" includes="jboss-service.xml"/>
- </copy>
- <!-- add cas-client to jboss portal -->
- <copy todir="${JBOSS_HOME}/server/${cas.deploy.dir}/jboss-portal.sar/lib"
file="${cas.client.jar}" overwrite="true"/>
+ </copy>
<!-- add portal-identity-sso-lib.jar to jboss portal -->
- <copy
tofile="${JBOSS_HOME}/server/${cas.deploy.dir}/jboss-portal.sar/lib/portal-identity-sso-lib.jar"
overwrite="true">
+ <copy
tofile="${jboss.home}/server/${cas.deploy.dir}/jboss-portal.sar/lib/portal-identity-sso-lib.jar"
overwrite="true">
<fileset dir="target"
includes="identity-sso-*-SNAPSHOT.jar"/>
</copy>
</target>
@@ -77,63 +81,74 @@
It also deploys any custom configuration/dependencies into the JOSSO war file which is
the
JOSSO Authentication Server
-->
- <target name="install-josso">
- <require file="${jboss.home}/server/${portal.deploy.dir}"/>
-
+ <target name="install-josso">
<!-- portal-josso sar file setup -->
- <copy todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true">
- <fileset dir="${build.lib}" includes="portal-josso.sar"/>
- </copy>
+ <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}"
overwrite="true">
+ <fileset file="target/portal-josso.sar"/>
+ </copy>
<!-- core josso integration with JBoss AS setup -->
- <copy todir="${jboss.home}/server/${portal.deploy.dir}/../conf"
overwrite="true">
- <fileset dir="${build.etc}/josso" includes="josso-agent-config.xml,
josso-config.xml, login-config.xml"/>
+ <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/${portal.deploy.dir}/jbossweb-tomcat55.sar"
overwrite="true">
- <fileset dir="${build.etc}/josso" includes="server.xml"/>
- <fileset dir="${josso.josso.lib}" includes="josso-1.5.jar,
josso-common-1.5.jar, josso-jboss4-plugin-1.5.jar,
josso-tomcat55-plugin-1.5.jar"/>
+ <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>
<!-- jboss portal integration with the josso authentication server -->
- <copy
todir="${jboss.home}/server/${portal.deploy.dir}/josso.war/WEB-INF/classes"
overwrite="true">
- <fileset dir="${build.etc}/josso"
includes="josso-gateway-config.xml"/>
+ <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
todir="${jboss.home}/server/${portal.deploy.dir}/josso.war/WEB-INF/lib"
overwrite="true">
- <fileset dir="${build.lib}"
includes="portal-identity-sso-lib.jar"/>
+ <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>
<!-- core jboss portal changes -->
- <copy
todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar/portal-server.war"
overwrite="true">
- <fileset dir="${build.etc}/josso" includes="login.jsp,
error.jsp"/>
+ <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/${portal.deploy.dir}/jboss-portal.sar/portal-server.war/WEB-INF"
overwrite="true">
- <fileset dir="${build.etc}/josso"
includes="context.xml"/>
- </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>
<!-- ================================================================== -->
<!-- Testing and Reporting. -->
<!-- ================================================================== -->
+ <!--
+ TODO: convert this to a JBoss Unit based test suite
+ -->
+ <!--
<target name="package-tests">
- <jar jarfile="${build.lib}/portal-identity-sso-test-lib.jar">
- <fileset dir="${build.classes}"/>
- <fileset dir="${build.resources}/portal-identity-test-jar"/>
+ <jar jarfile="target/portal-identity-sso-test-lib.jar">
+ <fileset dir="target/test-classes"/>
+ <fileset dir="src/resources/portal-identity-test-jar"/>
</jar>
</target>
<target name="tests" depends="package-tests">
- <execute-tests>
- <!--
- <x-sysproperty>
- <jvmarg value="-Xdebug"/>
- <jvmarg
value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>
- </x-sysproperty>
- -->
+ <execute-tests>
<x-test>
<test todir="${test.reports}"
name="org.jboss.portal.test.identity.sso.CASTestCase"/>
<test todir="${test.reports}"
name="org.jboss.portal.test.identity.sso.JOSSOTestCase"/>
</x-test>
<x-classpath>
- <pathelement
location="${build.lib}/portal-identity-sso-test-lib.jar"/>
+ <pathelement
location="target/portal-identity-sso-test-lib.jar"/>
<path refid="jboss.microcontainer.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
<path refid="jbossas/core.libs.classpath"/>
@@ -148,26 +163,27 @@
</x-classpath>
</execute-tests>
</target>
- <target name="reports">
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.reports}/html"/>
- <property name="test.reports"
value="${module.output}/tests"/>
- <junitreport todir="${build.reports}">
+ <target name="reports" depends="tests">
+ <mkdir dir="target/tests/reports"/>
+ <mkdir dir="target/tests/reports/html"/>
+ <property name="test.reports"
value="target/tests/reports"/>
+ <junitreport todir="target/tests/reports/junit">
<fileset dir="${test.reports}">
<include name="TEST-*.xml"/>
</fileset>
- <report format="frames"
todir="${build.reports}/html"/>
+ <report format="frames"
todir="target/tests/reports/html"/>
</junitreport>
</target>
- <target name="reports-noframes">
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.reports}/html"/>
- <property name="test.reports"
value="${module.output}/tests"/>
- <junitreport todir="${build.reports}">
- <fileset dir="${test.reports}">
- <include name="TEST-*.xml"/>
- </fileset>
- <report format="noframes"
todir="${build.reports}/html"/>
- </junitreport>
- </target>
+ <target name="reports-noframes" depends="tests">
+ <mkdir dir="target/tests/reports"/>
+ <mkdir dir="target/tests/reports/html"/>
+ <property name="test.reports"
value="target/tests/reports"/>
+ <junitreport todir="target/tests/reports/junit">
+ <fileset dir="${test.reports}">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report format="noframes"
todir="target/tests/reports/html"/>
+ </junitreport>
+ </target>
+ -->
</project>
Modified: modules/identity/trunk/sso/pom.xml
===================================================================
--- modules/identity/trunk/sso/pom.xml 2008-02-01 18:10:37 UTC (rev 9702)
+++ modules/identity/trunk/sso/pom.xml 2008-02-01 20:04:09 UTC (rev 9703)
@@ -23,9 +23,17 @@
</dependency>
<dependency>
<groupId>josso</groupId>
+ <artifactId>josso-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>josso</groupId>
<artifactId>josso-tomcat55-plugin</artifactId>
</dependency>
<dependency>
+ <groupId>josso</groupId>
+ <artifactId>josso-jboss4-plugin</artifactId>
+ </dependency>
+ <dependency>
<groupId>ja-sig-cas</groupId>
<artifactId>cas-server</artifactId>
</dependency>
@@ -40,6 +48,26 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <version>0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>xmldb</groupId>
+ <artifactId>xmldb-common</artifactId>
+ <version>20021220</version>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis</artifactId>
+ <version>1.4</version>
</dependency>
</dependencies>
@@ -50,11 +78,16 @@
<artifactId>maven-antrun-extended-plugin</artifactId>
<version>1.13</version>
<executions>
+ <!--
+ Development time task for installing CAS into your local Portal setup
+ -->
+ <!--
<execution>
<id>install-cas</id>
<phase>install</phase>
<configuration>
<tasks>
+ <property name="jboss.home"
value="/home/soshah/appServers/jboss-4.2.1.GA"/>
<property name="cas.deploy.dir"
value="cas-01/deploy"/>
<property name="cas.client.jar"
value="${settings.localRepository}/ja-sig-cas/cas-client/${version.cas}/cas-client-${version.cas}.jar"/>
<ant antfile="${basedir}/build.xml">
@@ -66,6 +99,36 @@
<goal>run</goal>
</goals>
</execution>
+ -->
+ <!--
+ Development time task for installing JOSSO into your local Portal setup
+ -->
+ <!--
+ <execution>
+ <id>install-josso</id>
+ <phase>install</phase>
+ <configuration>
+ <tasks>
+ <property name="jboss.home"
value="/home/soshah/appServers/jboss-4.0.5.GA"/>
+ <property name="josso.deploy.dir"
value="josso-01/deploy"/>
+ <property name="josso.jar"
value="${settings.localRepository}/josso/josso/${version.josso}/josso-${version.josso}.jar"/>
+ <property name="josso-common.jar"
value="${settings.localRepository}/josso/josso-common/${version.josso}/josso-common-${version.josso}.jar"/>
+ <property name="josso-tomcat55-plugin.jar"
value="${settings.localRepository}/josso/josso-tomcat55-plugin/${version.josso}/josso-tomcat55-plugin-${version.josso}.jar"/>
+ <property name="josso-jboss4-plugin.jar"
value="${settings.localRepository}/josso/josso-jboss4-plugin/${version.josso}/josso-jboss4-plugin-${version.josso}.jar"/>
+ <property name="commons-configuration.jar"
value="${settings.localRepository}/commons-configuration/commons-configuration/1.2/commons-configuration-1.2.jar"/>
+ <property name="commons-discovery.jar"
value="${settings.localRepository}/commons-discovery/commons-discovery/0.4/commons-discovery-0.4.jar"/>
+ <property name="xmldb-common.jar"
value="${settings.localRepository}/xmldb/xmldb-common/20021220/xmldb-common-20021220.jar"/>
+ <property name="axis.jar"
value="${settings.localRepository}/axis/axis/1.4/axis-1.4.jar"/>
+ <ant antfile="${basedir}/build.xml">
+ <target name="install-josso"/>
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ -->
</executions>
</plugin>
</plugins>
Modified:
modules/identity/trunk/sso/src/main/java/org/jboss/portal/identity/sso/josso/JOSSOLogoutValve.java
===================================================================
---
modules/identity/trunk/sso/src/main/java/org/jboss/portal/identity/sso/josso/JOSSOLogoutValve.java 2008-02-01
18:10:37 UTC (rev 9702)
+++
modules/identity/trunk/sso/src/main/java/org/jboss/portal/identity/sso/josso/JOSSOLogoutValve.java 2008-02-01
20:04:09 UTC (rev 9703)
@@ -45,7 +45,8 @@
public void invoke(Request request, Response response) throws IOException,
ServletException
{
- HttpServletRequest httpRequest = (HttpServletRequest) request;
+ HttpServletRequest httpRequest = (HttpServletRequest) request;
+ request.setAttribute("ssoEnabled", "true");
Cookie jossoPortalCookie = this.findJOSSOPortalLogoutCookie(httpRequest);
if(jossoPortalCookie != null)