12:05 p.m.
Author: pete.muir(a)jboss.org
Date: 2009-11-09 13:05:54 -0500 (Mon, 09 Nov 2009)
New Revision: 4879
Removed:
extensions/trunk/servlet/support/src/main/java/org/jboss/webbeans/environment/tomcat/
Modified:
extensions/trunk/bom/pom.xml
extensions/trunk/servlet/build/pom.xml
extensions/trunk/servlet/int/pom.xml
extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/deployment/WebAppBeanDeploymentArchive.java
extensions/trunk/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/lookup/Mouse.java
extensions/trunk/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/lookup/Vole.java
extensions/trunk/servlet/tests/src/test/resources/org/jboss/weld/test/tomcat/lookup/context-servlet-injection.xml
extensions/trunk/servlet/tests/src/test/resources/org/jboss/weld/test/tomcat/lookup/context.xml
Log:
switch Manager->BeanManager in tests, use slf4j-jdk14 binding in shaded jar only
Modified: extensions/trunk/bom/pom.xml
===================================================================
--- extensions/trunk/bom/pom.xml 2009-11-09 17:58:07 UTC (rev 4878)
+++ extensions/trunk/bom/pom.xml 2009-11-09 18:05:54 UTC (rev 4879)
@@ -40,6 +40,7 @@
<tomcat.version>6.0.20</tomcat.version>
<uel.glassfish.version>2.1.2-b04</uel.glassfish.version>
<log4j.version>1.2.14</log4j.version>
+ <slf4j.version>1.5.9.RC1</slf4j.version>
</properties>
<!-- Dependency management, including extra repositories if needed -->
@@ -163,6 +164,12 @@
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: extensions/trunk/servlet/build/pom.xml
===================================================================
--- extensions/trunk/servlet/build/pom.xml 2009-11-09 17:58:07 UTC (rev 4878)
+++ extensions/trunk/servlet/build/pom.xml 2009-11-09 18:05:54 UTC (rev 4879)
@@ -32,6 +32,12 @@
<artifactId>javassist</artifactId>
<optional>true</optional>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
Modified: extensions/trunk/servlet/int/pom.xml
===================================================================
--- extensions/trunk/servlet/int/pom.xml 2009-11-09 17:58:07 UTC (rev 4878)
+++ extensions/trunk/servlet/int/pom.xml 2009-11-09 18:05:54 UTC (rev 4879)
@@ -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>
@@ -12,7 +13,7 @@
<packaging>jar</packaging>
<name>Weld Servlet Integration</name>
<url>http://www.seamframework.org/Weld</url>
-
+
<dependencies>
<dependency>
<groupId>org.testng</groupId>
@@ -26,18 +27,18 @@
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-spi</artifactId>
</dependency>
-
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
@@ -51,15 +52,15 @@
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
</dependency>
-
+
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -67,19 +68,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- <version>1.5.8</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <scope>runtime</scope>
- </dependency>
-
+
</dependencies>
</project>
Modified:
extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/deployment/WebAppBeanDeploymentArchive.java
===================================================================
---
extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/deployment/WebAppBeanDeploymentArchive.java 2009-11-09
17:58:07 UTC (rev 4878)
+++
extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/deployment/WebAppBeanDeploymentArchive.java 2009-11-09
18:05:54 UTC (rev 4879)
@@ -125,7 +125,8 @@
public String getId()
{
- return "web-module";
+ // Use "flat" to allow us to continue to use ManagerObjectFactory
+ return "flat";
}
}
Modified:
extensions/trunk/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/lookup/Mouse.java
===================================================================
---
extensions/trunk/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/lookup/Mouse.java 2009-11-09
17:58:07 UTC (rev 4878)
+++
extensions/trunk/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/lookup/Mouse.java 2009-11-09
18:05:54 UTC (rev 4879)
@@ -11,7 +11,7 @@
{
try
{
- return (BeanManager) new
InitialContext().lookup("java:comp/env/app/Manager");
+ return (BeanManager) new
InitialContext().lookup("java:comp/env/BeanManager");
}
catch (NamingException e)
{
Modified:
extensions/trunk/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/lookup/Vole.java
===================================================================
---
extensions/trunk/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/lookup/Vole.java 2009-11-09
17:58:07 UTC (rev 4878)
+++
extensions/trunk/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/lookup/Vole.java 2009-11-09
18:05:54 UTC (rev 4879)
@@ -6,7 +6,7 @@
public class Vole
{
- @Resource(mappedName="java:comp/env/app/Manager")
+ @Resource(mappedName="java:comp/env/BeanManager")
BeanManager manager;
public BeanManager getManager()
Modified:
extensions/trunk/servlet/tests/src/test/resources/org/jboss/weld/test/tomcat/lookup/context-servlet-injection.xml
===================================================================
---
extensions/trunk/servlet/tests/src/test/resources/org/jboss/weld/test/tomcat/lookup/context-servlet-injection.xml 2009-11-09
17:58:07 UTC (rev 4878)
+++
extensions/trunk/servlet/tests/src/test/resources/org/jboss/weld/test/tomcat/lookup/context-servlet-injection.xml 2009-11-09
18:05:54 UTC (rev 4879)
@@ -1,6 +1,6 @@
<Context>
- <Resource name="app/Manager" auth="Container"
- type="javax.inject.manager.Manager"
+ <Resource name="BeanManager" auth="Container"
+ type="javax.inject.manager.BeanManager"
factory="org.jboss.weld.resources.ManagerObjectFactory"/>
<!-- Uncomment to enable injection into Servlet -->
<Listener
className="org.jboss.weld.environment.tomcat.WeldLifecycleListener" />
Modified:
extensions/trunk/servlet/tests/src/test/resources/org/jboss/weld/test/tomcat/lookup/context.xml
===================================================================
---
extensions/trunk/servlet/tests/src/test/resources/org/jboss/weld/test/tomcat/lookup/context.xml 2009-11-09
17:58:07 UTC (rev 4878)
+++
extensions/trunk/servlet/tests/src/test/resources/org/jboss/weld/test/tomcat/lookup/context.xml 2009-11-09
18:05:54 UTC (rev 4879)
@@ -1,6 +1,6 @@
<Context>
- <Resource name="app/Manager" auth="Container"
- type="javax.inject.manager.Manager"
+ <Resource name="BeanManager" auth="Container"
+ type="javax.inject.manager.BeanManager"
factory="org.jboss.weld.resources.ManagerObjectFactory"/>
<!-- Uncomment to enable injection into Servlet -->
<Listener
className="org.jboss.weld.environment.tomcat.WeldLifecycleListener" />