[jboss-cvs] JBossAS SVN: r97800 - in trunk: component-matrix and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 14 13:38:39 EST 2009
Author: remy.maucherat at jboss.com
Date: 2009-12-14 13:38:38 -0500 (Mon, 14 Dec 2009)
New Revision: 97800
Added:
trunk/build/build-web.xml
Modified:
trunk/component-matrix/pom.xml
trunk/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockClusteredManager.java
trunk/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockJBossManager.java
trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/ExtendedFormAuthenticator.java
trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/FormAuthenticator.java
trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/authenticators/ExtendedJASPIFormAuthenticator.java
trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheManager.java
Log:
- JBoss Web alpha-25: EL parameters, error reporting for FORM login forward failures, changing session ids on auth.
- Add trivial script to build a web packaging.
Added: trunk/build/build-web.xml
===================================================================
--- trunk/build/build-web.xml (rev 0)
+++ trunk/build/build-web.xml 2009-12-14 18:38:38 UTC (rev 97800)
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: build.xml 97631 2009-12-09 17:46:37Z pgier $ -->
+
+<project default="main" name="JBoss WE Distribution Build" xmlns:maven="antlib:org.apache.maven.artifact.ant">
+
+ <patternset id="source.ignore">
+ <exclude name="**/output/**" />
+ <exclude name="**/CVS/**" />
+ <exclude name="**/local.properties" />
+ </patternset>
+
+ <!-- ================================================================== -->
+ <!-- Configuration -->
+ <!-- ================================================================== -->
+
+ <target name="configure">
+
+ <!-- =================== -->
+ <!-- Basic Configuration -->
+ <!-- =================== -->
+
+ <dirname property="project.root" file="${basedir}" />
+ <property name="project.build" value="${project.root}/build" />
+ <property name="project.tools" value="${project.root}/tools" />
+
+ <!-- Version identifiers for the server. -->
+ <xmlproperty file="../pom.xml" prefix="pom" />
+
+ <!-- Module name(s) & version -->
+ <property name="dist.module.name" value="jboss" />
+ <property name="dist.module.Name" value="JBoss Build" />
+ <property name="dist.module.version" value="${pom.project.version}" />
+ <property name="dist.module.output" value="${basedir}/output" />
+
+ <!-- Install/Release structure -->
+ <property name="install.id" value="${dist.module.name}-${dist.module.version}" />
+ <property name="release.id" value="${install.id}" />
+
+ <property name="install.root" value="${dist.module.output}/${install.id}" />
+
+ <property name="install.docs" value="${install.root}/docs" />
+ <property name="install.api" value="${install.docs}/api" />
+ <property name="install.jmx-api" value="${install.docs}/jmx-api" />
+ <property name="install.todo" value="${install.docs}/todo" />
+ <property name="install.examples" value="${install.docs}/examples" />
+ <property name="install.examples.jca" value="${install.docs}/examples/jca" />
+ <property name="install.examples.jms" value="${install.docs}/examples/jms" />
+ <property name="install.examples.jbossweb" value="${install.examples}/jbossweb" />
+ <property name="install.examples.netboot" value="${install.examples}/netboot" />
+ <!--<property name="install.examples.binding-manager" value="${install.examples}/binding-manager"/>-->
+ <property name="install.examples.varia" value="${install.examples}/varia" />
+ <property name="install.dtd" value="${install.docs}/dtd" />
+ <property name="install.schema" value="${install.docs}/schema" />
+
+ <property name="install.bin" value="${install.root}/bin" />
+ <property name="install.etc" value="${install.root}/etc" />
+ <property name="install.client" value="${install.root}/client" />
+ <property name="install.lib" value="${install.root}/lib" />
+
+ <property name="install.server" value="${install.root}/server" />
+
+ <property name="install.web" value="${install.server}/web" />
+ <property name="install.web.lib" value="${install.web}/lib" />
+ <property name="install.web.deploy" value="${install.web}/deploy" />
+ <property name="install.web.deployers" value="${install.web}/deployers" />
+ <property name="install.web.conf" value="${install.web}/conf" />
+
+ <!-- Module name(s) & version -->
+ <property name="web.dist.module.name" value="jboss-web" />
+ <property name="web.dist.module.Name" value="JBoss Build" />
+ <property name="web.dist.module.version" value="3.0.0-SNAPSHOT" />
+
+ <property name="web.install.id" value="${web.dist.module.name}-${web.dist.module.version}" />
+ <property name="web.release.id" value="${web.install.id}" />
+
+ <property name="web.install.root" value="${dist.module.output}/${web.install.id}" />
+
+ <!-- Bits for building source archives -->
+ <patternset id="source.ignore">
+ <exclude name="**/output/**" />
+ <exclude name="**/CVS/**" />
+ </patternset>
+ <patternset id="source.free">
+ <exclude name="tools/**" />
+ <exclude name="thirdparty/**" />
+ <include name="**" />
+ </patternset>
+ <patternset id="source.external">
+ <include name="tools/**" />
+ <include name="thirdparty/**" />
+ </patternset>
+ </target>
+
+ <target name="main" depends="configure">
+ <mkdir dir="${web.install.root}" />
+ <copy todir="${web.install.root}">
+ <fileset dir="${install.root}">
+ <exclude name="server/**" />
+ </fileset>
+ </copy>
+ <copy todir="${web.install.root}/server/default">
+ <fileset dir="${install.root}/server/web">
+ </fileset>
+ </copy>
+ <chmod perm="+x">
+ <fileset dir="${web.install.root}/bin">
+ <include name="**/*.sh"/>
+ </fileset>
+ </chmod>
+
+ <zip destfile="${basedir}/output/${web.install.id}.zip">
+ <zipfileset dir="${web.install.root}" prefix="${web.install.id}">
+ </zipfileset>
+ </zip>
+ <checksum file="${basedir}/output/${web.install.id}.zip" />
+ <checksum file="${basedir}/output/${web.install.id}.zip" algorithm="SHA-256" />
+
+ <tar destfile="${basedir}/output/${web.install.id}.tar.gz" longfile="gnu" compression="gzip">
+ <tarfileset dir="${web.install.root}" prefix="${web.install.id}">
+ </tarfileset>
+ </tar>
+ <checksum file="${basedir}/output/${web.install.id}.tar.gz" />
+ <checksum file="${basedir}/output/${web.install.id}.tar.gz" algorithm="SHA-256" />
+
+ <tar destfile="${basedir}/output/${web.install.id}-src.tar.gz" longfile="gnu" compression="gzip">
+ <tarfileset dir="${basedir}/.." prefix="${web.install.id}-src">
+ <patternset refid="source.ignore" />
+ <exclude name="tools/bin/*" />
+ <exclude name="build/output/**" />
+ </tarfileset>
+ <tarfileset dir="${basedir}/.." prefix="${web.install.id}-src" mode="755">
+ <patternset refid="source.ignore" />
+ <include name="tools/bin/*" />
+ </tarfileset>
+ </tar>
+ <checksum file="${basedir}/output/${web.install.id}-src.tar.gz" />
+ <checksum file="${basedir}/output/${web.install.id}-src.tar.gz" algorithm="SHA-256" />
+
+ </target>
+
+</project>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2009-12-14 18:32:08 UTC (rev 97799)
+++ trunk/component-matrix/pom.xml 2009-12-14 18:38:38 UTC (rev 97800)
@@ -48,7 +48,7 @@
<version.jboss.jbossws>3.2.1.GA</version.jboss.jbossws>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
<version.jboss.messaging>1.4.1.GA</version.jboss.messaging>
- <version.jboss.web>3.0.0.alpha-24</version.jboss.web>
+ <version.jboss.web>3.0.0.alpha-25</version.jboss.web>
<version.jgroups>2.6.13.GA</version.jgroups>
<version.junit>3.8.2</version.junit>
<version.org.hibernate.annotations>3.5.0-Beta-2</version.org.hibernate.annotations>
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockClusteredManager.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockClusteredManager.java 2009-12-14 18:32:08 UTC (rev 97799)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockClusteredManager.java 2009-12-14 18:38:38 UTC (rev 97800)
@@ -77,6 +77,10 @@
return newCookieIdSession;
}
+ public void changeSessionId(Session session)
+ {
+ }
+
public Session createSession(String s)
{
Session session = new MockSession(this);
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockJBossManager.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockJBossManager.java 2009-12-14 18:32:08 UTC (rev 97799)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockJBossManager.java 2009-12-14 18:38:38 UTC (rev 97800)
@@ -71,6 +71,11 @@
// no-op
}
+ public void changeSessionId(Session session)
+ {
+ // no-op
+ }
+
public Session createEmptySession()
{
return null;
Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/ExtendedFormAuthenticator.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/ExtendedFormAuthenticator.java 2009-12-14 18:32:08 UTC (rev 97799)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/ExtendedFormAuthenticator.java 2009-12-14 18:38:38 UTC (rev 97800)
@@ -120,6 +120,7 @@
* be performed
*/
protected void forwardToErrorPage(Request request, HttpServletResponse response, LoginConfig config)
+ throws IOException
{
if (trace)
log.trace("forwardToErrorPage");
@@ -137,6 +138,7 @@
* be performed
*/
protected void forwardToLoginPage(Request request, HttpServletResponse response, LoginConfig config)
+ throws IOException
{
if (trace)
log.trace("forwardToLoginPage");
Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/FormAuthenticator.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/FormAuthenticator.java 2009-12-14 18:32:08 UTC (rev 97799)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/FormAuthenticator.java 2009-12-14 18:38:38 UTC (rev 97800)
@@ -291,6 +291,7 @@
protected void forwardToErrorPage(Request request, HttpServletResponse response, LoginConfig config)
+ throws IOException
{
RequestDispatcher disp =
context.getServletContext().getRequestDispatcher
@@ -298,11 +299,16 @@
try {
disp.forward(request.getRequest(), response);
} catch (Throwable t) {
- log.warn("Unexpected error forwarding to error page", t);
+ String msg = sm.getString("Unexpected error forwarding to error page");
+ log.warn(msg, t);
+ request.setAttribute(org.apache.catalina.Globals.EXCEPTION_ATTR, t);
+ response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ msg);
}
}
protected void forwardToLoginPage(Request request, HttpServletResponse response, LoginConfig config)
+ throws IOException
{
RequestDispatcher disp =
context.getServletContext().getRequestDispatcher
@@ -310,7 +316,11 @@
try {
disp.forward(request.getRequest(), response);
} catch (Throwable t) {
- log.warn("Unexpected error forwarding to login page", t);
+ String msg = sm.getString("Unexpected error forwarding to login page");
+ log.warn(msg, t);
+ request.setAttribute(org.apache.catalina.Globals.EXCEPTION_ATTR, t);
+ response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ msg);
}
}
Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/authenticators/ExtendedJASPIFormAuthenticator.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/authenticators/ExtendedJASPIFormAuthenticator.java 2009-12-14 18:32:08 UTC (rev 97799)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/authenticators/ExtendedJASPIFormAuthenticator.java 2009-12-14 18:38:38 UTC (rev 97800)
@@ -21,6 +21,8 @@
*/
package org.jboss.web.tomcat.security.authenticators;
+import java.io.IOException;
+
import javax.servlet.http.HttpSession;
import org.apache.catalina.deploy.LoginConfig;
@@ -67,6 +69,7 @@
* be performed
*/
protected void forwardToErrorPage(Request request, Response response,LoginConfig config)
+ throws IOException
{
if( trace )
log.trace("forwardToErrorPage");
@@ -85,6 +88,7 @@
*/
protected void forwardToLoginPage(LoginConfig config,
Request request, Response response)
+ throws IOException
{
if( trace )
log.trace("forwardToLoginPage");
Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheManager.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheManager.java 2009-12-14 18:32:08 UTC (rev 97799)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheManager.java 2009-12-14 18:38:38 UTC (rev 97800)
@@ -379,6 +379,15 @@
}
}
+
+ public void changeSessionId(Session session)
+ {
+ // FIXME: Eventually support session id change
+ // FIXME: (disabled by default right now, so this should not be called for now)
+ session.setId(getNextId());
+ }
+
+
// Satisfy the Manager interface. Internally we use
// createEmptyClusteredSession to avoid a cast
public Session createEmptySession()
More information about the jboss-cvs-commits
mailing list