Weld SVN: r4888 - examples/trunk/jsf/permalink.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-09 14:48:53 -0500 (Mon, 09 Nov 2009)
New Revision: 4888
Modified:
examples/trunk/jsf/permalink/readme.txt
Log:
add urls
Modified: examples/trunk/jsf/permalink/readme.txt
===================================================================
--- examples/trunk/jsf/permalink/readme.txt 2009-11-09 18:54:19 UTC (rev 4887)
+++ examples/trunk/jsf/permalink/readme.txt 2009-11-09 19:48:53 UTC (rev 4888)
@@ -15,6 +15,20 @@
Now you are ready to deploy.
+== Deploying to JBoss AS
+
+If you run a normal Maven build, the artifact it produces is deployable to JBoss
+AS by default:
+
+ mvn package
+
+Just copy target/weld-permalink.war to the JBoss AS deploy directory. Open this
+local URL to access the running application:
+
+ http://localhost:8080/weld-permalink
+
+But you may want to take advantage of the embedded servlet containers.
+
== Deploying with an embedded servlet container
Run this command to execute the application in an embedded Jetty 6 container:
@@ -25,6 +39,10 @@
mvn war:inplace tomcat:run -Ptomcat
+You can access the application for either container at the following local URL:
+
+ http://localhost:9090/weld-permalink
+
In both cases, any changes to assets in src/main/webapp take effect immediately.
If a change to a webapp configuration file is made, the application may
automatically redeploy. The redeploy behavior can be fine-tuned in the plugin
@@ -81,6 +99,10 @@
mvn war:exploded tomcat:redeploy -Ptomcat
mvn compile war:exploded tomcat:redeploy -Ptomcat
+The application is available at the following local URL:
+
+ http://localhost:8080/weld-permalink
+
= Importing the project into Eclipse
The recommended way to setup a Seam example in Eclipse is to use the m2eclipse
14 years, 8 months
Weld SVN: r4887 - extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-09 13:54:19 -0500 (Mon, 09 Nov 2009)
New Revision: 4887
Modified:
extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java
Log:
restore missing imports (Eclipse was going crazy)
Modified: extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java
===================================================================
--- extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java 2009-11-09 18:47:35 UTC (rev 4886)
+++ extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java 2009-11-09 18:54:19 UTC (rev 4887)
@@ -16,13 +16,27 @@
*/
package org.jboss.weld.environment.servlet;
-import java.util.logging.Logger;
+import javax.el.ELContextListener;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.jsp.JspApplicationContext;
+import javax.servlet.jsp.JspFactory;
+import org.jboss.weld.bootstrap.api.Bootstrap;
+import org.jboss.weld.bootstrap.api.Environments;
+import org.jboss.weld.context.api.BeanStore;
+import org.jboss.weld.context.api.helpers.ConcurrentHashMapBeanStore;
import org.jboss.weld.environment.servlet.deployment.ServletDeployment;
import org.jboss.weld.environment.servlet.services.ServletResourceInjectionServices;
import org.jboss.weld.environment.servlet.services.ServletServicesImpl;
import org.jboss.weld.environment.servlet.util.Reflections;
import org.jboss.weld.environment.tomcat.WeldAnnotationProcessor;
+import org.jboss.weld.injection.spi.ResourceInjectionServices;
+import org.jboss.weld.manager.api.WeldManager;
+import org.jboss.weld.servlet.api.ServletListener;
+import org.jboss.weld.servlet.api.ServletServices;
+import org.jboss.weld.servlet.api.helpers.ForwardingServletListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author Pete Muir
14 years, 8 months
Weld SVN: r4886 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy.
by weld-commits＠lists.jboss.org
Author: jharting
Date: 2009-11-09 13:47:35 -0500 (Mon, 09 Nov 2009)
New Revision: 4886
Removed:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Car.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Garage.java
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java
Log:
Removed broken test
Deleted: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Car.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Car.java 2009-11-09 18:32:06 UTC (rev 4885)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Car.java 2009-11-09 18:47:35 UTC (rev 4886)
@@ -1,22 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.clientProxy;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.RequestScoped;
-
-@RequestScoped
-class Car implements Serializable
-{
- private static final long serialVersionUID = -8183045197385584658L;
- private String make = "unknown";
-
- public String getMake()
- {
- return make;
- }
-
- public void setMake(String name)
- {
- this.make = name;
- }
-}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java 2009-11-09 18:32:06 UTC (rev 4885)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java 2009-11-09 18:47:35 UTC (rev 4886)
@@ -19,6 +19,7 @@
import java.io.IOException;
import javax.enterprise.context.ContextNotActiveException;
+import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Bean;
import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -56,12 +57,11 @@
@SpecAssertion(section = "5.4.2", id = "aa")
public void testClientProxyInvocation()
{
- Bean<TunedTuna> tunaBean = getBeans(TunedTuna.class).iterator().next();
- TunedTuna tuna = (TunedTuna) getCurrentManager().getReference(tunaBean, TunedTuna.class, getCurrentManager().createCreationalContext(tunaBean));
+ TunedTuna tuna = getInstanceByType(TunedTuna.class);
assert getCurrentConfiguration().getBeans().isProxy(tuna);
assert tuna.getState().equals("tuned");
- // TODO expand this test
}
+
@Test(expectedExceptions = { ContextNotActiveException.class, IllegalStateException.class })
@SpecAssertions({
@SpecAssertion(section="5.4.2", id="ab"),
@@ -82,24 +82,4 @@
setContextActive(getCurrentConfiguration().getContexts().getRequestContext());
}
}
-
- @Test(groups = "broken")
- @SpecAssertion(section = "5.4", id = "d")
- //WELD-229
- public void testInvocationIsProcessedOnCurrentInstance() {
- // create new car
- getInstanceByType(Car.class).setMake("Honda");
- // check that the car is injected
- Garage garage = getInstanceByType(Garage.class);
- assert garage.getMakeOfTheParkedCar().equals("Honda");
- // destroy the request context
- setContextInactive(getCurrentConfiguration().getContexts().getRequestContext());
- setContextActive(getCurrentConfiguration().getContexts().getRequestContext());
- // check that the old instance is not in the context anymore
- // a new one should be created
- assert getInstanceByType(Car.class).getMake().equals("unknown");
- getInstanceByType(Car.class).setMake("Toyota");
- // check that the invocation is processed by the current instance of injected bean
- assert garage.getMakeOfTheParkedCar().equals("Toyota");
- }
}
Deleted: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Garage.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Garage.java 2009-11-09 18:32:06 UTC (rev 4885)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/Garage.java 2009-11-09 18:47:35 UTC (rev 4886)
@@ -1,18 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.clientProxy;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
-
-
-@ApplicationScoped
-class Garage
-{
- @Inject
- private Car car;
-
- public String getMakeOfTheParkedCar()
- {
- return car.getMake();
- }
-}
14 years, 8 months
Weld SVN: r4885 - examples/trunk/wicket/numberguess.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-09 13:32:06 -0500 (Mon, 09 Nov 2009)
New Revision: 4885
Modified:
examples/trunk/wicket/numberguess/pom.xml
Log:
fix deps
Modified: examples/trunk/wicket/numberguess/pom.xml
===================================================================
--- examples/trunk/wicket/numberguess/pom.xml 2009-11-09 18:21:58 UTC (rev 4884)
+++ examples/trunk/wicket/numberguess/pom.xml 2009-11-09 18:32:06 UTC (rev 4885)
@@ -29,15 +29,15 @@
</dependency>
<dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-wicket</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-wicket</artifactId>
+ </dependency>
</dependencies>
@@ -125,12 +125,6 @@
<artifactId>jsr250-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.8</version>
- </dependency>
-
<!-- JETTY DEPENDENCIES FOR IN IDE TESTING -->
<dependency>
@@ -143,7 +137,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<scope>runtime</scope>
- <version>1.5.8</version>
</dependency>
</dependencies>
@@ -158,12 +151,6 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
14 years, 8 months
Weld SVN: r4884 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-09 13:21:58 -0500 (Mon, 09 Nov 2009)
New Revision: 4884
Modified:
doc/trunk/reference/en-US/environments.xml
Log:
cleanup
Modified: doc/trunk/reference/en-US/environments.xml
===================================================================
--- doc/trunk/reference/en-US/environments.xml 2009-11-09 18:18:11 UTC (rev 4883)
+++ doc/trunk/reference/en-US/environments.xml 2009-11-09 18:21:58 UTC (rev 4884)
@@ -48,8 +48,8 @@
<para>
Weld is also built into GlassFish from V3 onwards. Since GlassFish V3 is the Java EE 6 reference
- implementation, it must support all features of CDI. What better way for it to support these features than to
- use Weld, the JSR-299 reference implementation? Just package up your CDI application and deploy.
+ implementation, it must support all features of CDI. What better way for GlassFish to support these features
+ than to use Weld, the JSR-299 reference implementation? Just package up your CDI application and deploy.
</para>
</section>
14 years, 8 months
Weld SVN: r4883 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-09 13:18:11 -0500 (Mon, 09 Nov 2009)
New Revision: 4883
Modified:
doc/trunk/reference/en-US/environments.xml
Log:
okay, nevermind, JBoss AS 5.1 isn't supported
Modified: doc/trunk/reference/en-US/environments.xml
===================================================================
--- doc/trunk/reference/en-US/environments.xml 2009-11-09 18:17:31 UTC (rev 4882)
+++ doc/trunk/reference/en-US/environments.xml 2009-11-09 18:18:11 UTC (rev 4883)
@@ -13,18 +13,13 @@
</para>
<para>
- If you aren't on JBoss AS 5.2 yet, you can still use Weld with a JBoss AS 5.1 installation. Read on to learn
- how to install Weld as an add-on to JBoss AS 5.1 or upgrade the built-in support on JBoss AS 5.2.
+ Unfortunately, you can't use Weld with earlier versions of JBoss AS since they are missing key libraries. If
+ you want to learn how to upgrade the built-in support on JBoss AS 5.2, then read on.
</para>
<para>
- Installing Weld as an add-on is easy. The Weld distribution has a build that can take care of this task for you
- in a single command. You can also use this script to update the version of Weld deployed to JBoss AS (even if
- you already have JBoss AS 5.2).
- </para>
-
- <para>
- First, we need to tell Weld where JBoss AS is located. Create a new file named
+ Upgrading the Weld add-on is easy. The Weld distribution has a build that can take care of this task for you in
+ a single command. First, we need to tell Weld where JBoss AS is located. Create a new file named
<literal>local.build.properties</literal> in the examples directory of the Weld distribution and assign the
path of your JBoss AS installation to the property key <literal>jboss.home</literal>, as follows:
</para>
@@ -42,7 +37,7 @@
<para>
A new deployer, <literal>weld.deployer</literal> is added to JBoss AS. This adds supports for JSR-299
deployments to JBoss AS, and allows Weld to query the EJB 3 container and discover which EJBs are installed
- in your application. It also performs a necessary upgrade of the Javassist library.
+ in your application. It also performs an upgrade of the Javassist library, if necessary.
</para>
</note>
14 years, 8 months
Weld SVN: r4882 - examples/trunk.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-09 13:17:31 -0500 (Mon, 09 Nov 2009)
New Revision: 4882
Modified:
examples/trunk/pom.xml
Log:
update versions, remove log4j
Modified: examples/trunk/pom.xml
===================================================================
--- examples/trunk/pom.xml 2009-11-09 18:14:56 UTC (rev 4881)
+++ examples/trunk/pom.xml 2009-11-09 18:17:31 UTC (rev 4882)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>2</version>
+ <version>6</version>
</parent>
<groupId>org.jboss.weld.examples</groupId>
<artifactId>weld-examples-parent</artifactId>
@@ -86,13 +86,11 @@
<properties>
<jsf.version>2.0.0-RC</jsf.version>
- <weld.api.version>1.0-SNAPSHOT</weld.api.version>
- <weld.core.version>1.0.0-CR1</weld.core.version>
- <weld.extensions.version>1.0.0-CR1</weld.extensions.version>
+ <weld.api.version>1.0</weld.api.version>
+ <weld.core.version>1.0.0</weld.core.version>
+ <weld.extensions.version>1.0.0-SNAPSHOT</weld.extensions.version>
<jetty.version>6.1.21</jetty.version>
<uel.glassfish.version>2.1.2-b04</uel.glassfish.version>
- <log4j.version>1.2.14</log4j.version>
- <slf4j.version>1.4.2</slf4j.version>
<!-- Testing deps -->
<testng.version>5.10</testng.version>
</properties>
@@ -201,18 +199,6 @@
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>el-impl</artifactId>
<version>${uel.glassfish.version}</version>
14 years, 8 months
Weld SVN: r4881 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-09 13:14:56 -0500 (Mon, 09 Nov 2009)
New Revision: 4881
Modified:
doc/trunk/reference/en-US/environments.xml
Log:
be clearer about Weld as an add-on to JBoss AS
Modified: doc/trunk/reference/en-US/environments.xml
===================================================================
--- doc/trunk/reference/en-US/environments.xml 2009-11-09 18:14:45 UTC (rev 4880)
+++ doc/trunk/reference/en-US/environments.xml 2009-11-09 18:14:56 UTC (rev 4881)
@@ -7,17 +7,27 @@
<title>Using Weld with JBoss AS</title>
<para>
- No special configuration is required, beyond making your application a bean archive by adding
- <literal>META-INF/beans.xml</literal> to the classpath or <literal>WEB-INF/beans.xml</literal> to the web root.
+ If you are using JBoss AS 5.2, no additional configuration is required to use Weld (or CDI for that matter).
+ All you need to do is make your application a bean bean archive by adding <literal>META-INF/beans.xml</literal>
+ to the classpath or <literal>WEB-INF/beans.xml</literal> to the web root!
</para>
<para>
- If you are using JBoss AS < 5.2, then you'll need to install Weld as an add-on. Fortunately, the
- distribution has a build that can handle this for you in a single command. First, we need to tell Weld where
- JBoss AS is located. Create a new file named <literal>local.build.properties</literal> in the examples directory
- of the Weld distribution and assign the path of your JBoss AS installation to the property key
- <literal>jboss.home</literal>, as follows:
+ If you aren't on JBoss AS 5.2 yet, you can still use Weld with a JBoss AS 5.1 installation. Read on to learn
+ how to install Weld as an add-on to JBoss AS 5.1 or upgrade the built-in support on JBoss AS 5.2.
</para>
+
+ <para>
+ Installing Weld as an add-on is easy. The Weld distribution has a build that can take care of this task for you
+ in a single command. You can also use this script to update the version of Weld deployed to JBoss AS (even if
+ you already have JBoss AS 5.2).
+ </para>
+
+ <para>
+ First, we need to tell Weld where JBoss AS is located. Create a new file named
+ <literal>local.build.properties</literal> in the examples directory of the Weld distribution and assign the
+ path of your JBoss AS installation to the property key <literal>jboss.home</literal>, as follows:
+ </para>
<programlisting><![CDATA[jboss.home=/path/to/jboss-as-5.x]]></programlisting>
@@ -35,11 +45,6 @@
in your application. It also performs a necessary upgrade of the Javassist library.
</para>
</note>
-
- <para>
- Weld is built into all releases of JBoss AS from 5.2 onwards. Regardless, you can use this script to update the
- version of Weld deployed to JBoss AS at any time.
- </para>
</section>
@@ -48,9 +53,8 @@
<para>
Weld is also built into GlassFish from V3 onwards. Since GlassFish V3 is the Java EE 6 reference
- implementation, you can be confident that it will support all features of CDI. What better way
- for it to support these features than to use the JSR-299 reference implementation? Just package up
- your CDI application and deploy away!
+ implementation, it must support all features of CDI. What better way for it to support these features than to
+ use Weld, the JSR-299 reference implementation? Just package up your CDI application and deploy.
</para>
</section>
14 years, 8 months
Weld SVN: r4880 - extensions/trunk/bom.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-09 13:14:45 -0500 (Mon, 09 Nov 2009)
New Revision: 4880
Modified:
extensions/trunk/bom/pom.xml
Log:
remove log4j
Modified: extensions/trunk/bom/pom.xml
===================================================================
--- extensions/trunk/bom/pom.xml 2009-11-09 18:05:54 UTC (rev 4879)
+++ extensions/trunk/bom/pom.xml 2009-11-09 18:14:45 UTC (rev 4880)
@@ -39,7 +39,6 @@
<wicket.version>1.4.1</wicket.version>
<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>
@@ -160,12 +159,6 @@
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>${slf4j.version}</version>
14 years, 8 months
Weld SVN: r4879 - in extensions/trunk: servlet/build and 5 other directories.
by weld-commits＠lists.jboss.org
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" />
14 years, 8 months