[weld-commits] Weld SVN: r5749 - in servlet/trunk/int: src/main/java/org/jboss/weld/environment/servlet and 1 other directory.

Author: pete.muir(a)jboss.org Date: 2010-02-04 17:49:55 -0500 (Thu, 04 Feb 2010) New Revision: 5749 Modified: servlet/trunk/int/pom.xml servlet/trunk/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java Log: force javasisst to use TCCL on TC Modified: servlet/trunk/int/pom.xml =================================================================== --- servlet/trunk/int/pom.xml 2010-02-04 22:03:26 UTC (rev 5748) +++ servlet/trunk/int/pom.xml 2010-02-04 22:49:55 UTC (rev 5749) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <artifactId>weld-servlet-parent</artifactId> <groupId>org.jboss.weld.servlet</groupId> @@ -69,6 +70,11 @@ <artifactId>slf4j-api</artifactId> </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + </dependencies> <scm> Modified: servlet/trunk/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java =================================================================== --- servlet/trunk/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java 2010-02-04 22:03:26 UTC (rev 5748) +++ servlet/trunk/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java 2010-02-04 22:49:55 UTC (rev 5749) @@ -16,6 +16,9 @@ */ package org.jboss.weld.environment.servlet; +import javassist.util.proxy.ProxyFactory; +import javassist.util.proxy.ProxyFactory.ClassLoaderProvider; + import javax.el.ELContextListener; import javax.servlet.ServletContextEvent; import javax.servlet.jsp.JspApplicationContext; @@ -124,6 +127,16 @@ if (tomcat) { + // Make Javassist always use the TCCL to load classes + ProxyFactory.classLoaderProvider = new ClassLoaderProvider() + { + + public ClassLoader get(ProxyFactory pf) + { + return Thread.currentThread().getContextClassLoader(); + } + + }; // Try pushing a Tomcat AnnotationProcessor into the servlet context try {