Weld SVN: r3919 - in examples/trunk/jsf/login/src/main/java/org/jboss: webbeans/examples and 3 other directories.
by weld-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-10-09 23:42:55 -0400 (Fri, 09 Oct 2009)
New Revision: 3919
Added:
examples/trunk/jsf/login/src/main/java/org/jboss/weld/
examples/trunk/jsf/login/src/main/java/org/jboss/weld/examples/
examples/trunk/jsf/login/src/main/java/org/jboss/weld/examples/login/
Removed:
examples/trunk/jsf/login/src/main/java/org/jboss/webbeans/examples/login/
Modified:
examples/trunk/jsf/login/src/main/java/org/jboss/weld/examples/login/Credentials.java
examples/trunk/jsf/login/src/main/java/org/jboss/weld/examples/login/LoggedIn.java
examples/trunk/jsf/login/src/main/java/org/jboss/weld/examples/login/Login.java
examples/trunk/jsf/login/src/main/java/org/jboss/weld/examples/login/User.java
Log:
renaming
Copied: examples/trunk/jsf/login/src/main/java/org/jboss/weld/examples/login (from rev 3906, examples/trunk/jsf/login/src/main/java/org/jboss/webbeans/examples/login)
Modified: examples/trunk/jsf/login/src/main/java/org/jboss/weld/examples/login/Credentials.java
===================================================================
--- examples/trunk/jsf/login/src/main/java/org/jboss/webbeans/examples/login/Credentials.java 2009-10-09 04:49:23 UTC (rev 3906)
+++ examples/trunk/jsf/login/src/main/java/org/jboss/weld/examples/login/Credentials.java 2009-10-10 03:42:55 UTC (rev 3919)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.examples.login;
+package org.jboss.weld.examples.login;
import java.io.Serializable;
Modified: examples/trunk/jsf/login/src/main/java/org/jboss/weld/examples/login/LoggedIn.java
===================================================================
--- examples/trunk/jsf/login/src/main/java/org/jboss/webbeans/examples/login/LoggedIn.java 2009-10-09 04:49:23 UTC (rev 3906)
+++ examples/trunk/jsf/login/src/main/java/org/jboss/weld/examples/login/LoggedIn.java 2009-10-10 03:42:55 UTC (rev 3919)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.examples.login;
+package org.jboss.weld.examples.login;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: examples/trunk/jsf/login/src/main/java/org/jboss/weld/examples/login/Login.java
===================================================================
--- examples/trunk/jsf/login/src/main/java/org/jboss/webbeans/examples/login/Login.java 2009-10-09 04:49:23 UTC (rev 3906)
+++ examples/trunk/jsf/login/src/main/java/org/jboss/weld/examples/login/Login.java 2009-10-10 03:42:55 UTC (rev 3919)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.examples.login;
+package org.jboss.weld.examples.login;
import java.io.Serializable;
import java.util.Arrays;
Modified: examples/trunk/jsf/login/src/main/java/org/jboss/weld/examples/login/User.java
===================================================================
--- examples/trunk/jsf/login/src/main/java/org/jboss/webbeans/examples/login/User.java 2009-10-09 04:49:23 UTC (rev 3906)
+++ examples/trunk/jsf/login/src/main/java/org/jboss/weld/examples/login/User.java 2009-10-10 03:42:55 UTC (rev 3919)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.examples.login;
+package org.jboss.weld.examples.login;
public class User {
private String username;
15 years, 2 months
Weld SVN: r3915 - in examples/trunk/wicket/gae/src/main/java/org/jboss: webbeans and 2 other directories.
by weld-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-10-09 19:30:34 -0400 (Fri, 09 Oct 2009)
New Revision: 3915
Added:
examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/
examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/
examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/examples/wicket/
examples/trunk/wicket/gae/src/main/java/org/jboss/weld/
examples/trunk/wicket/gae/src/main/java/org/jboss/weld/examples/
Removed:
examples/trunk/wicket/gae/src/main/java/org/jboss/webbeans/
Log:
rename package
15 years, 2 months
Weld SVN: r3914 - in examples/trunk: jsf/login and 28 other directories.
by weld-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-10-09 19:22:40 -0400 (Fri, 09 Oct 2009)
New Revision: 3914
Added:
examples/trunk/se/hello-world/src/main/java/org/jboss/weld/
examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/
examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/
examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/
examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/
examples/trunk/se/numberguess/src/main/java/org/jboss/weld/
examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/
examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/
examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/
examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/
examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/
examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/
examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/
examples/trunk/wicket/numberguess/src/test/java/org/jboss/weld/
examples/trunk/wicket/numberguess/src/test/java/org/jboss/weld/examples/
examples/trunk/wicket/numberguess/src/test/java/org/jboss/weld/examples/wicket/
Removed:
examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/
examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/
examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/
examples/trunk/wicket/numberguess/src/test/java/org/jboss/webbeans/examples/wicket/
Modified:
examples/trunk/jsf/login/pom.xml
examples/trunk/jsf/numberguess/pom.xml
examples/trunk/jsf/translator/pom.xml
examples/trunk/pom.xml
examples/trunk/se/hello-world/pom.xml
examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/CommandLineArgsValidator.java
examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/HelloWorld.java
examples/trunk/se/numberguess/pom.xml
examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/Game.java
examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/Generator.java
examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/MaxNumber.java
examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/MessageGenerator.java
examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/NumberGuessFrame.java
examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/Random.java
examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/Game.java
examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/Generator.java
examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/HomePage.java
examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/MaxNumber.java
examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/Random.java
examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/SampleApplication.java
examples/trunk/wicket/numberguess/src/test/java/org/jboss/weld/examples/wicket/Start.java
Log:
package naming refactor
Modified: examples/trunk/jsf/login/pom.xml
===================================================================
--- examples/trunk/jsf/login/pom.xml 2009-10-09 18:47:06 UTC (rev 3913)
+++ examples/trunk/jsf/login/pom.xml 2009-10-09 23:22:40 UTC (rev 3914)
@@ -3,15 +3,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jboss.webbeans.examples</groupId>
- <artifactId>webbeans-examples-parent</artifactId>
+ <groupId>org.jboss.weld.examples</groupId>
+ <artifactId>weld-examples-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.webbeans.examples.jsf</groupId>
- <artifactId>webbeans-jsf-login</artifactId>
+ <groupId>org.jboss.weld.examples.jsf</groupId>
+ <artifactId>weld-jsf-login</artifactId>
<packaging>war</packaging>
- <name>Web Beans Examples: Login</name>
+ <name>Weld Examples: Login</name>
<pluginRepositories>
<pluginRepository>
@@ -32,8 +32,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>jsr299-api</artifactId>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -68,7 +68,7 @@
</dependencies>
<build>
- <finalName>webbeans-login</finalName>
+ <finalName>weld-login</finalName>
</build>
</project>
Modified: examples/trunk/jsf/numberguess/pom.xml
===================================================================
--- examples/trunk/jsf/numberguess/pom.xml 2009-10-09 18:47:06 UTC (rev 3913)
+++ examples/trunk/jsf/numberguess/pom.xml 2009-10-09 23:22:40 UTC (rev 3914)
@@ -3,15 +3,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jboss.webbeans.examples</groupId>
- <artifactId>webbeans-examples-parent</artifactId>
+ <groupId>org.jboss.weld.examples</groupId>
+ <artifactId>weld-examples-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.webbeans.examples.jsf</groupId>
- <artifactId>webbeans-jsf-numberguess</artifactId>
+ <groupId>org.jboss.weld.examples.jsf</groupId>
+ <artifactId>weld-jsf-numberguess</artifactId>
<packaging>war</packaging>
- <name>Web Beans Examples: Numberguess</name>
+ <name>Weld Examples: Numberguess</name>
<pluginRepositories>
<pluginRepository>
@@ -34,8 +34,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>jsr299-api</artifactId>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -126,8 +126,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.webbeans.servlet</groupId>
- <artifactId>webbeans-servlet</artifactId>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet</artifactId>
<scope>runtime</scope>
</dependency>
@@ -189,8 +189,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.webbeans.servlet</groupId>
- <artifactId>webbeans-servlet</artifactId>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet</artifactId>
<scope>runtime</scope>
</dependency>
@@ -243,8 +243,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.webbeans.servlet</groupId>
- <artifactId>webbeans-servlet</artifactId>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet</artifactId>
<scope>runtime</scope>
</dependency>
@@ -345,8 +345,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.webbeans.servlet</groupId>
- <artifactId>webbeans-servlet</artifactId>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet</artifactId>
<scope>provided</scope>
</dependency>
@@ -455,7 +455,7 @@
</profiles>
<build>
- <finalName>webbeans-numberguess</finalName>
+ <finalName>weld-numberguess</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: examples/trunk/jsf/translator/pom.xml
===================================================================
--- examples/trunk/jsf/translator/pom.xml 2009-10-09 18:47:06 UTC (rev 3913)
+++ examples/trunk/jsf/translator/pom.xml 2009-10-09 23:22:40 UTC (rev 3914)
@@ -2,17 +2,17 @@
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jboss.webbeans.examples</groupId>
- <artifactId>webbeans-examples-parent</artifactId>
+ <groupId>org.jboss.weld.examples</groupId>
+ <artifactId>weld-examples-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.webbeans.examples.jsf.translator</groupId>
- <artifactId>webbeans-jsf-translator-parent</artifactId>
+ <groupId>org.jboss.weld.examples.jsf.translator</groupId>
+ <artifactId>weld-jsf-translator-parent</artifactId>
<packaging>pom</packaging>
- <name>Web Beans Examples: Translator (parent)</name>
+ <name>Weld Examples: Translator (parent)</name>
<description>
- Ear Example for the reference implementation of JSR 299: Web Beans
+ Ear Example for the reference implementation of JSR 299: Weld
</description>
<modules>
@@ -24,19 +24,19 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.jboss.webbeans.examples.jsf.translator</groupId>
- <artifactId>webbeans-jsf-translator-war</artifactId>
+ <groupId>org.jboss.weld.examples.jsf.translator</groupId>
+ <artifactId>weld-jsf-translator-war</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans.examples.jsf.translator</groupId>
- <artifactId>webbeans-jsf-translator-ear</artifactId>
+ <groupId>org.jboss.weld.examples.jsf.translator</groupId>
+ <artifactId>weld-jsf-translator-ear</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans.examples.jsf.translator</groupId>
- <artifactId>webbeans-jsf-translator-ejb</artifactId>
+ <groupId>org.jboss.weld.examples.jsf.translator</groupId>
+ <artifactId>weld-jsf-translator-ejb</artifactId>
<version>${project.version}</version>
<type>ejb</type>
</dependency>
Modified: examples/trunk/pom.xml
===================================================================
--- examples/trunk/pom.xml 2009-10-09 18:47:06 UTC (rev 3913)
+++ examples/trunk/pom.xml 2009-10-09 23:22:40 UTC (rev 3914)
@@ -2,21 +2,21 @@
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-version-matrix</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-version-matrix</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.webbeans.examples</groupId>
- <artifactId>webbeans-examples-parent</artifactId>
+ <groupId>org.jboss.weld.examples</groupId>
+ <artifactId>weld-examples-parent</artifactId>
<packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version>
- <name>Web Beans Examples</name>
+ <name>Weld Examples</name>
<description>
- Examples for the reference implementation of JSR 299: Web Beans
+ Examples for the reference implementation of JSR 299: Weld
</description>
- <url>http://www.seamframework.org/WebBeans</url>
+ <url>http://www.seamframework.org/Weld</url>
<repositories>
<repository>
@@ -120,7 +120,7 @@
<artifactId>maven-release-plugin</artifactId>
<version>2.0-beta-8</version>
<configuration>
- <tagBase>https://svn.jboss.org/repos/webbeans/examples/tags</tagBase>
+ <tagBase>https://svn.jboss.org/repos/weld/examples/tags</tagBase>
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
@@ -184,7 +184,7 @@
<issueManagement>
<system>JIRA</system>
- <url>http://jira.jboss.org/browse/WBRI</url>
+ <url>http://jira.jboss.org/browse/WELD</url>
</issueManagement>
<inceptionYear>2008</inceptionYear>
@@ -201,8 +201,8 @@
</licenses>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/examples</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/examples</developerConnection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/examples</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/examples</developerConnection>
<url>http://fisheye.jboss.org/browse/WebBeans/ri/examples</url>
</scm>
@@ -231,7 +231,7 @@
</formats>
<instrumentation>
<ignores>
- <ignore>javax.webbeans.*</ignore>
+ <ignore>javax.weld.*</ignore>
</ignores>
</instrumentation>
</configuration>
Modified: examples/trunk/se/hello-world/pom.xml
===================================================================
--- examples/trunk/se/hello-world/pom.xml 2009-10-09 18:47:06 UTC (rev 3913)
+++ examples/trunk/se/hello-world/pom.xml 2009-10-09 23:22:40 UTC (rev 3914)
@@ -2,14 +2,14 @@
<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>webbeans-examples-parent</artifactId>
- <groupId>org.jboss.webbeans.examples</groupId>
+ <artifactId>weld-examples-parent</artifactId>
+ <groupId>org.jboss.weld.examples</groupId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans.examples.se</groupId>
- <artifactId>webbeans-se-hello-world</artifactId>
+ <groupId>org.jboss.weld.examples.se</groupId>
+ <artifactId>weld-se-hello-world</artifactId>
<packaging>jar</packaging>
<name>Hello World SE</name>
@@ -36,7 +36,7 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
- <mainClass>org.jboss.webbeans.environment.se.StartMain</mainClass>
+ <mainClass>org.jboss.weld.environment.se.StartMain</mainClass>
</configuration>
</plugin>
<plugin>
@@ -66,7 +66,7 @@
<configuration>
<archive>
<manifest>
- <mainClass>org.jboss.webbeans.environment.se.StartMain</mainClass>
+ <mainClass>org.jboss.weld.environment.se.StartMain</mainClass>
</manifest>
</archive>
</configuration>
@@ -78,12 +78,12 @@
<dependencies>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-se</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-se</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-core</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Copied: examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple (from rev 3906, examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple)
Modified: examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/CommandLineArgsValidator.java
===================================================================
--- examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/CommandLineArgsValidator.java 2009-10-09 04:49:23 UTC (rev 3906)
+++ examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/CommandLineArgsValidator.java 2009-10-09 23:22:40 UTC (rev 3914)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.environment.se.example.simple;
+package org.jboss.weld.environment.se.example.simple;
import java.util.ArrayList;
import java.util.Collections;
Modified: examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/HelloWorld.java
===================================================================
--- examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/HelloWorld.java 2009-10-09 04:49:23 UTC (rev 3906)
+++ examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/HelloWorld.java 2009-10-09 23:22:40 UTC (rev 3914)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.environment.se.example.simple;
+package org.jboss.weld.environment.se.example.simple;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Observes;
Modified: examples/trunk/se/numberguess/pom.xml
===================================================================
--- examples/trunk/se/numberguess/pom.xml 2009-10-09 18:47:06 UTC (rev 3913)
+++ examples/trunk/se/numberguess/pom.xml 2009-10-09 23:22:40 UTC (rev 3914)
@@ -2,25 +2,25 @@
<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>webbeans-examples-parent</artifactId>
- <groupId>org.jboss.webbeans.examples</groupId>
+ <artifactId>weld-examples-parent</artifactId>
+ <groupId>org.jboss.weld.examples</groupId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans.examples.se</groupId>
- <artifactId>webbeans-se-numberguess</artifactId>
+ <groupId>org.jboss.weld.examples.se</groupId>
+ <artifactId>weld-se-numberguess</artifactId>
<packaging>jar</packaging>
<name>Number Guess SE</name>
<dependencies>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-se</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-se</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-core</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -37,7 +37,7 @@
<configuration>
<archive>
<manifest>
- <mainClass>org.jboss.webbeans.environment.se.StartMain</mainClass>
+ <mainClass>org.jboss.weld.environment.se.StartMain</mainClass>
</manifest>
</archive>
</configuration>
@@ -68,7 +68,7 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
- <mainClass>org.jboss.webbeans.environment.se.StartMain</mainClass>
+ <mainClass>org.jboss.weld.environment.se.StartMain</mainClass>
</configuration>
</plugin>
</plugins>
Copied: examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess (from rev 3906, examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess)
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/Game.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java 2009-10-09 04:49:23 UTC (rev 3906)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/Game.java 2009-10-09 23:22:40 UTC (rev 3914)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.environment.se.example.numberguess;
+package org.jboss.weld.environment.se.example.numberguess;
import java.io.Serializable;
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/Generator.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java 2009-10-09 04:49:23 UTC (rev 3906)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/Generator.java 2009-10-09 23:22:40 UTC (rev 3914)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.environment.se.example.numberguess;
+package org.jboss.weld.environment.se.example.numberguess;
import java.io.Serializable;
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/MaxNumber.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MaxNumber.java 2009-10-09 04:49:23 UTC (rev 3906)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/MaxNumber.java 2009-10-09 23:22:40 UTC (rev 3914)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.environment.se.example.numberguess;
+package org.jboss.weld.environment.se.example.numberguess;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/MessageGenerator.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java 2009-10-09 04:49:23 UTC (rev 3906)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/MessageGenerator.java 2009-10-09 23:22:40 UTC (rev 3914)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.environment.se.example.numberguess;
+package org.jboss.weld.environment.se.example.numberguess;
import javax.inject.Inject;
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/NumberGuessFrame.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java 2009-10-09 04:49:23 UTC (rev 3906)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/NumberGuessFrame.java 2009-10-09 23:22:40 UTC (rev 3914)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.environment.se.example.numberguess;
+package org.jboss.weld.environment.se.example.numberguess;
import java.awt.CardLayout;
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/Random.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Random.java 2009-10-09 04:49:23 UTC (rev 3906)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/Random.java 2009-10-09 23:22:40 UTC (rev 3914)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.webbeans.environment.se.example.numberguess;
+package org.jboss.weld.environment.se.example.numberguess;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Copied: examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket (from rev 3906, examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket)
Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/Game.java
===================================================================
--- examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Game.java 2009-10-09 04:49:23 UTC (rev 3906)
+++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/Game.java 2009-10-09 23:22:40 UTC (rev 3914)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.examples.wicket;
+package org.jboss.weld.examples.wicket;
import java.io.Serializable;
Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/Generator.java
===================================================================
--- examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Generator.java 2009-10-09 04:49:23 UTC (rev 3906)
+++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/Generator.java 2009-10-09 23:22:40 UTC (rev 3914)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.examples.wicket;
+package org.jboss.weld.examples.wicket;
import java.io.Serializable;
Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/HomePage.java
===================================================================
--- examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.java 2009-10-09 04:49:23 UTC (rev 3906)
+++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/HomePage.java 2009-10-09 23:22:40 UTC (rev 3914)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.examples.wicket;
+package org.jboss.weld.examples.wicket;
import java.io.Serializable;
Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/MaxNumber.java
===================================================================
--- examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/MaxNumber.java 2009-10-09 04:49:23 UTC (rev 3906)
+++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/MaxNumber.java 2009-10-09 23:22:40 UTC (rev 3914)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.examples.wicket;
+package org.jboss.weld.examples.wicket;
import static java.lang.annotation.ElementType.FIELD;
Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/Random.java
===================================================================
--- examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Random.java 2009-10-09 04:49:23 UTC (rev 3906)
+++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/Random.java 2009-10-09 23:22:40 UTC (rev 3914)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.examples.wicket;
+package org.jboss.weld.examples.wicket;
import static java.lang.annotation.ElementType.FIELD;
Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/SampleApplication.java
===================================================================
--- examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/SampleApplication.java 2009-10-09 04:49:23 UTC (rev 3906)
+++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/SampleApplication.java 2009-10-09 23:22:40 UTC (rev 3914)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.examples.wicket;
+package org.jboss.weld.examples.wicket;
import org.jboss.webbeans.wicket.WebBeansApplication;
Copied: examples/trunk/wicket/numberguess/src/test/java/org/jboss/weld/examples/wicket (from rev 3906, examples/trunk/wicket/numberguess/src/test/java/org/jboss/webbeans/examples/wicket)
Modified: examples/trunk/wicket/numberguess/src/test/java/org/jboss/weld/examples/wicket/Start.java
===================================================================
--- examples/trunk/wicket/numberguess/src/test/java/org/jboss/webbeans/examples/wicket/Start.java 2009-10-09 04:49:23 UTC (rev 3906)
+++ examples/trunk/wicket/numberguess/src/test/java/org/jboss/weld/examples/wicket/Start.java 2009-10-09 23:22:40 UTC (rev 3914)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.examples.wicket;
+package org.jboss.weld.examples.wicket;
import org.mortbay.jetty.Connector;
import org.mortbay.jetty.Server;
15 years, 2 months
Weld SVN: r3913 - in core/branches/1.0.0.PREVIEW5: cdi-api and 13 other directories.
by weld-commits＠lists.jboss.org
Author: rogerk
Date: 2009-10-09 14:47:06 -0400 (Fri, 09 Oct 2009)
New Revision: 3913
Modified:
core/branches/1.0.0.PREVIEW5/cdi-api/pom.xml
core/branches/1.0.0.PREVIEW5/core-api/pom.xml
core/branches/1.0.0.PREVIEW5/dist/pom.xml
core/branches/1.0.0.PREVIEW5/embedded-tck-runner/pom.xml
core/branches/1.0.0.PREVIEW5/impl/pom.xml
core/branches/1.0.0.PREVIEW5/inject-tck-runner/pom.xml
core/branches/1.0.0.PREVIEW5/jboss-tck-runner/pom.xml
core/branches/1.0.0.PREVIEW5/logging/pom.xml
core/branches/1.0.0.PREVIEW5/osgi-bundle/pom.xml
core/branches/1.0.0.PREVIEW5/parent/pom.xml
core/branches/1.0.0.PREVIEW5/pom.xml
core/branches/1.0.0.PREVIEW5/porting-package/pom.xml
core/branches/1.0.0.PREVIEW5/spi/pom.xml
core/branches/1.0.0.PREVIEW5/tests/pom.xml
core/branches/1.0.0.PREVIEW5/version-matrix/pom.xml
Log:
pom version updates
Modified: core/branches/1.0.0.PREVIEW5/cdi-api/pom.xml
===================================================================
--- core/branches/1.0.0.PREVIEW5/cdi-api/pom.xml 2009-10-09 15:14:14 UTC (rev 3912)
+++ core/branches/1.0.0.PREVIEW5/cdi-api/pom.xml 2009-10-09 18:47:06 UTC (rev 3913)
@@ -4,12 +4,12 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW5</version>
</parent>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW5</version>
<packaging>jar</packaging>
<name>CDI API</name>
<url>http://www.seamframework.org/Weld</url>
Modified: core/branches/1.0.0.PREVIEW5/core-api/pom.xml
===================================================================
--- core/branches/1.0.0.PREVIEW5/core-api/pom.xml 2009-10-09 15:14:14 UTC (rev 3912)
+++ core/branches/1.0.0.PREVIEW5/core-api/pom.xml 2009-10-09 18:47:06 UTC (rev 3913)
@@ -2,12 +2,12 @@
<parent>
<artifactId>weld-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW5</version>
<name>Weld Core API</name>
<dependencies>
Modified: core/branches/1.0.0.PREVIEW5/dist/pom.xml
===================================================================
--- core/branches/1.0.0.PREVIEW5/dist/pom.xml 2009-10-09 15:14:14 UTC (rev 3912)
+++ core/branches/1.0.0.PREVIEW5/dist/pom.xml 2009-10-09 18:47:06 UTC (rev 3913)
@@ -5,7 +5,7 @@
<parent>
<artifactId>weld-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.weld</groupId>
Modified: core/branches/1.0.0.PREVIEW5/embedded-tck-runner/pom.xml
===================================================================
--- core/branches/1.0.0.PREVIEW5/embedded-tck-runner/pom.xml 2009-10-09 15:14:14 UTC (rev 3912)
+++ core/branches/1.0.0.PREVIEW5/embedded-tck-runner/pom.xml 2009-10-09 18:47:06 UTC (rev 3913)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.weld</groupId>
Modified: core/branches/1.0.0.PREVIEW5/impl/pom.xml
===================================================================
--- core/branches/1.0.0.PREVIEW5/impl/pom.xml 2009-10-09 15:14:14 UTC (rev 3912)
+++ core/branches/1.0.0.PREVIEW5/impl/pom.xml 2009-10-09 18:47:06 UTC (rev 3913)
@@ -2,12 +2,12 @@
<parent>
<artifactId>weld-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW5</version>
<name>Weld Core</name>
<dependencies>
Modified: core/branches/1.0.0.PREVIEW5/inject-tck-runner/pom.xml
===================================================================
--- core/branches/1.0.0.PREVIEW5/inject-tck-runner/pom.xml 2009-10-09 15:14:14 UTC (rev 3912)
+++ core/branches/1.0.0.PREVIEW5/inject-tck-runner/pom.xml 2009-10-09 18:47:06 UTC (rev 3913)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW5</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: core/branches/1.0.0.PREVIEW5/jboss-tck-runner/pom.xml
===================================================================
--- core/branches/1.0.0.PREVIEW5/jboss-tck-runner/pom.xml 2009-10-09 15:14:14 UTC (rev 3912)
+++ core/branches/1.0.0.PREVIEW5/jboss-tck-runner/pom.xml 2009-10-09 18:47:06 UTC (rev 3913)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW5</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: core/branches/1.0.0.PREVIEW5/logging/pom.xml
===================================================================
--- core/branches/1.0.0.PREVIEW5/logging/pom.xml 2009-10-09 15:14:14 UTC (rev 3912)
+++ core/branches/1.0.0.PREVIEW5/logging/pom.xml 2009-10-09 18:47:06 UTC (rev 3913)
@@ -2,12 +2,12 @@
<parent>
<artifactId>weld-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-logging</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW5</version>
<name>Weld Logging</name>
<dependencies>
Modified: core/branches/1.0.0.PREVIEW5/osgi-bundle/pom.xml
===================================================================
--- core/branches/1.0.0.PREVIEW5/osgi-bundle/pom.xml 2009-10-09 15:14:14 UTC (rev 3912)
+++ core/branches/1.0.0.PREVIEW5/osgi-bundle/pom.xml 2009-10-09 18:47:06 UTC (rev 3913)
@@ -21,7 +21,7 @@
<parent>
<artifactId>weld-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -65,7 +65,7 @@
org.jboss.weld.jsf; include:="WeldPhaseListener"; version=${osgi.version},
javassist.util.proxy;version="3.8.1.GA"
</_exportcontents>
- <Import-Package>javax.annotation, javax.interceptor, *;resolution:=optional</Import-Package>
+ <Import-Package>javax.annotation, javax.interceptor.*, *;resolution:=optional</Import-Package>
<Private-Package>!javax.annotation.*, !javax.interceptor.*</Private-Package>
</instructions>
<!-- Maven uses the output directory (target/classes)
@@ -111,8 +111,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -134,8 +134,19 @@
<artifactId>inject-api</artifactId>
<version>1.0.0-PRD</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.interceptors</groupId>
+ <artifactId>interceptors</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+
</dependencies>
</project>
Modified: core/branches/1.0.0.PREVIEW5/parent/pom.xml
===================================================================
--- core/branches/1.0.0.PREVIEW5/parent/pom.xml 2009-10-09 15:14:14 UTC (rev 3912)
+++ core/branches/1.0.0.PREVIEW5/parent/pom.xml 2009-10-09 18:47:06 UTC (rev 3913)
@@ -3,12 +3,12 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW5</version>
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-version-matrix</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW5</version>
<relativePath>../version-matrix</relativePath>
</parent>
Modified: core/branches/1.0.0.PREVIEW5/pom.xml
===================================================================
--- core/branches/1.0.0.PREVIEW5/pom.xml 2009-10-09 15:14:14 UTC (rev 3912)
+++ core/branches/1.0.0.PREVIEW5/pom.xml 2009-10-09 18:47:06 UTC (rev 3913)
@@ -3,7 +3,7 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-build-aggregator</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW5</version>
<name>Weld Build Aggregator</name>
<url>http://www.seamframework.org/Weld</url>
@@ -56,10 +56,10 @@
<module>core-api</module>
<module>logging</module>
<module>impl</module>
- <module>tests</module>
- <module>porting-package</module>
- <module>inject-tck-runner</module>
- <module>jboss-tck-runner</module>
+<!-- <module>tests</module> -->
+<!-- <module>porting-package</module> -->
+<!-- <module>inject-tck-runner</module> -->
+<!-- <module>jboss-tck-runner</module> -->
<module>osgi-bundle</module>
</modules>
</profile>
Modified: core/branches/1.0.0.PREVIEW5/porting-package/pom.xml
===================================================================
--- core/branches/1.0.0.PREVIEW5/porting-package/pom.xml 2009-10-09 15:14:14 UTC (rev 3912)
+++ core/branches/1.0.0.PREVIEW5/porting-package/pom.xml 2009-10-09 18:47:06 UTC (rev 3913)
@@ -2,12 +2,12 @@
<parent>
<artifactId>weld-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-porting-package</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW5</version>
<name>Weld Porting Package for JSR-299 TCK</name>
<dependencies>
Modified: core/branches/1.0.0.PREVIEW5/spi/pom.xml
===================================================================
--- core/branches/1.0.0.PREVIEW5/spi/pom.xml 2009-10-09 15:14:14 UTC (rev 3912)
+++ core/branches/1.0.0.PREVIEW5/spi/pom.xml 2009-10-09 18:47:06 UTC (rev 3913)
@@ -2,12 +2,12 @@
<parent>
<artifactId>weld-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-spi</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW5</version>
<name>Weld Service Provider Interfaces</name>
<dependencies>
Modified: core/branches/1.0.0.PREVIEW5/tests/pom.xml
===================================================================
--- core/branches/1.0.0.PREVIEW5/tests/pom.xml 2009-10-09 15:14:14 UTC (rev 3912)
+++ core/branches/1.0.0.PREVIEW5/tests/pom.xml 2009-10-09 18:47:06 UTC (rev 3913)
@@ -2,12 +2,12 @@
<parent>
<artifactId>weld-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-test</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW5</version>
<name>Weld Core Tests</name>
<dependencies>
Modified: core/branches/1.0.0.PREVIEW5/version-matrix/pom.xml
===================================================================
--- core/branches/1.0.0.PREVIEW5/version-matrix/pom.xml 2009-10-09 15:14:14 UTC (rev 3912)
+++ core/branches/1.0.0.PREVIEW5/version-matrix/pom.xml 2009-10-09 18:47:06 UTC (rev 3913)
@@ -3,7 +3,7 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-version-matrix</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW5</version>
<name>Weld Version Matrix</name>
<url>http://www.seamframework.org/Weld</url>
@@ -56,12 +56,12 @@
</pluginRepositories>
<properties>
- <jsr299.tck.version>1.0.0-SNAPSHOT</jsr299.tck.version>
- <weld.version>1.0.0-SNAPSHOT</weld.version>
- <weld.servlet.version>1.0.0-SNAPSHOT</weld.servlet.version>
- <weld.se.version>1.0.0-SNAPSHOT</weld.se.version>
- <weld.wicket.version>1.0.0-SNAPSHOT</weld.wicket.version>
- <jboss.test.harness.version>1.0.0-SNAPSHOT</jboss.test.harness.version>
+ <jsr299.tck.version>1.0.0.PREVIEW5</jsr299.tck.version>
+ <weld.version>1.0.0.PREVIEW5</weld.version>
+ <weld.servlet.version>1.0.0.PREVIEW5</weld.servlet.version>
+ <weld.se.version>1.0.0.PREVIEW5</weld.se.version>
+ <weld.wicket.version>1.0.0.PREVIEW5</weld.wicket.version>
+ <jboss.test.harness.version>1.0.0.PREVIEW5</jboss.test.harness.version>
<jetty.version>6.1.21</jetty.version>
<wicket.version>1.4.1</wicket.version>
</properties>
15 years, 2 months
Weld SVN: r3912 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException and 6 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-09 11:14:14 -0400 (Fri, 09 Oct 2009)
New Revision: 3912
Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Cow.java
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/javax.enterprise.inject.spi.Extension
Removed:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/DogBone.java
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeObserver.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/Dog.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/InjectionTargetProcessor.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/EventProcessor.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java
core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java
Log:
Fix various tests
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java 2009-10-09 14:52:45 UTC (rev 3911)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java 2009-10-09 15:14:14 UTC (rev 3912)
@@ -43,7 +43,7 @@
@SpecVersion(spec="cdi", version="PFD2")
public class ProcessAnnotatedTypeEventThrowsExceptionTest extends AbstractJSR299Test
{
- @Test(groups="ri-broken")
+ @Test(groups="jboss-as-broken")
@SpecAssertion(section = "11.5.5", id = "e")
public void testProcessAnnotatedTypeEventThrowsExceptionNotOk()
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeObserver.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeObserver.java 2009-10-09 14:52:45 UTC (rev 3911)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeObserver.java 2009-10-09 15:14:14 UTC (rev 3912)
@@ -6,7 +6,7 @@
public class ProcessAnnotatedTypeObserver implements Extension
{
- public void observeAnnotatedType1(@Observes ProcessAnnotatedType<Dog> event)
+ public void observeAnnotatedType(@Observes ProcessAnnotatedType<Dog> event)
{
throw new RuntimeException();
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/Dog.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/Dog.java 2009-10-09 14:52:45 UTC (rev 3911)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/Dog.java 2009-10-09 15:14:14 UTC (rev 3912)
@@ -1,9 +1,7 @@
package org.jboss.jsr299.tck.tests.extensions.annotated.broken.processInjectionTargetThrowsException;
-import javax.inject.Inject;
class Dog
{
- @Inject
- private DogBone dogBone;
+
}
Deleted: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/DogBone.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/DogBone.java 2009-10-09 14:52:45 UTC (rev 3911)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/DogBone.java 2009-10-09 15:14:14 UTC (rev 3912)
@@ -1,6 +0,0 @@
-package org.jboss.jsr299.tck.tests.extensions.annotated.broken.processInjectionTargetThrowsException;
-
-class DogBone
-{
-
-}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/InjectionTargetProcessor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/InjectionTargetProcessor.java 2009-10-09 14:52:45 UTC (rev 3911)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/InjectionTargetProcessor.java 2009-10-09 15:14:14 UTC (rev 3912)
@@ -4,10 +4,12 @@
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.ProcessInjectionTarget;
-class InjectionTargetProcessor implements Extension
+public class InjectionTargetProcessor implements Extension
{
+
public void processDogInjectionTarget(@Observes ProcessInjectionTarget<Dog> injectionTargetEvent)
{
throw new RuntimeException();
}
+
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java 2009-10-09 14:52:45 UTC (rev 3911)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java 2009-10-09 15:14:14 UTC (rev 3912)
@@ -24,6 +24,8 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
import org.testng.annotations.Test;
/**
@@ -34,11 +36,14 @@
*/
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
+@Resources({
+ @Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
+})
@IntegrationTest
@SpecVersion(spec="cdi", version="PFD2")
public class ProcessInjectionTargetEventThrowsExceptionTest extends AbstractJSR299Test
{
- @Test(groups="ri-broken")
+ @Test(groups="jboss-as-broken")
@SpecAssertion(section = "11.5.6", id = "f")
public void testProcessInjectionTargetEventThrowsExceptionNotOk()
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-10-09 14:52:45 UTC (rev 3911)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-10-09 15:14:14 UTC (rev 3912)
@@ -65,14 +65,14 @@
@SpecVersion(spec="cdi", version="PFD2")
public class BeanManagerTest extends AbstractJSR299Test
{
- @Test(groups = "ri-broken")
+ @Test
@SpecAssertion(section = "11.3.6", id = "a")
- //WBRI-328
public void testGetPassivationCapableBeanById()
{
- Bean<?> bean = getCurrentManager().getBeans(Cat.class).iterator().next();
+ Bean<?> bean = getCurrentManager().getBeans(Cow.class).iterator().next();
assert PassivationCapable.class.isAssignableFrom(bean.getClass());
- Bean<?> passivatingBean = getCurrentManager().getPassivationCapableBean(CatBean.bean.getId());
+ PassivationCapable passivationCapable = (PassivationCapable) bean;
+ Bean<?> passivatingBean = getCurrentManager().getPassivationCapableBean(passivationCapable.getId());
assert bean == passivatingBean;
}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Cow.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Cow.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Cow.java 2009-10-09 15:14:14 UTC (rev 3912)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.extensions.beanManager;
+
+public class Cow
+{
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Cow.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/EventProcessor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/EventProcessor.java 2009-10-09 14:52:45 UTC (rev 3911)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/EventProcessor.java 2009-10-09 15:14:14 UTC (rev 3912)
@@ -4,7 +4,7 @@
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.ProcessInjectionTarget;
-class EventProcessor implements Extension
+public class EventProcessor implements Extension
{
public void processDogInjectionTarget(@Observes ProcessInjectionTarget<Dog> injectionTargetEvent)
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java 2009-10-09 14:52:45 UTC (rev 3911)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java 2009-10-09 15:14:14 UTC (rev 3912)
@@ -29,7 +29,7 @@
public class InjectionTargetDefinitionErrorTest extends AbstractJSR299Test
{
- @Test(groups = "ri-broken")
+ @Test(groups = "jboss-as-broken")
@SpecAssertions({
@SpecAssertion(section = "11.5.6", id = "da")
})
Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/javax.enterprise.inject.spi.Extension
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/javax.enterprise.inject.spi.Extension (rev 0)
+++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/javax.enterprise.inject.spi.Extension 2009-10-09 15:14:14 UTC (rev 3912)
@@ -0,0 +1 @@
+org.jboss.jsr299.tck.tests.extensions.annotated.broken.processInjectionTargetThrowsException.InjectionTargetProcessor
\ No newline at end of file
Modified: core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java 2009-10-09 14:52:45 UTC (rev 3911)
+++ core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java 2009-10-09 15:14:14 UTC (rev 3912)
@@ -185,9 +185,6 @@
private transient final ClientProxyProvider clientProxyProvider;
// TODO review this structure
- private transient final Map<String, Bean<?>> passivationCapableBeans;
-
- // TODO review this structure
private transient final Map<EjbDescriptor<?>, SessionBean<?>> enterpriseBeans;
// TODO This isn't right, specialization should follow accessibility rules, but I think we can enforce these in resolve()
@@ -293,7 +290,6 @@
new CopyOnWriteArrayList<ObserverMethod<?,?>>(),
new CopyOnWriteArrayList<String>(),
new ConcurrentHashMap<EjbDescriptor<?>, SessionBean<?>>(),
- new ConcurrentHashMap<String, Bean<?>>(),
new ClientProxyProvider(),
contexts,
new CopyOnWriteArraySet<CurrentActivity>(),
@@ -322,7 +318,6 @@
new CopyOnWriteArrayList<ObserverMethod<?,?>>(),
new CopyOnWriteArrayList<String>(),
rootManager.getEnterpriseBeans(),
- new ConcurrentHashMap<String, Bean<?>>(),
rootManager.getClientProxyProvider(),
rootManager.getContexts(),
new CopyOnWriteArraySet<CurrentActivity>(),
@@ -358,8 +353,7 @@
parentManager.getInterceptors(),
registeredObservers,
namespaces,
- parentManager.getEnterpriseBeans(),
- parentManager.getPassivationCapableBeans(),
+ parentManager.getEnterpriseBeans(),
parentManager.getClientProxyProvider(),
parentManager.getContexts(),
parentManager.getCurrentActivities(),
@@ -386,7 +380,6 @@
List<ObserverMethod<?,?>> observers,
List<String> namespaces,
Map<EjbDescriptor<?>, SessionBean<?>> enterpriseBeans,
- Map<String, Bean<?>> riBeans,
ClientProxyProvider clientProxyProvider,
ListMultimap<Class<? extends Annotation>, Context> contexts,
Set<CurrentActivity> currentActivities,
@@ -403,7 +396,6 @@
this.decorators = decorators;
this.interceptors = interceptors;
this.enterpriseBeans = enterpriseBeans;
- this.passivationCapableBeans = riBeans;
this.clientProxyProvider = clientProxyProvider;
this.contexts = contexts;
this.currentActivities = currentActivities;
@@ -569,7 +561,7 @@
}
if (bean instanceof PassivationCapable)
{
- passivationCapableBeans.put(((PassivationCapable) bean).getId(), bean);
+ Container.instance().deploymentServices().get(ContextualStore.class).putIfAbsent(bean);
}
registerBeanNamespace(bean);
for (BeanManagerImpl childActivity : childActivities)
@@ -583,7 +575,7 @@
public void addDecorator(DecoratorImpl<?> bean)
{
decorators.add(bean);
- passivationCapableBeans.put(bean.getId(), bean);
+ getServices().get(ContextualStore.class).putIfAbsent(bean);
decoratorResolver.clear();
}
@@ -803,23 +795,6 @@
return createDynamicAccessibleIterable(Transform.BEAN);
}
- /**
- * Get all the spec defined beans, including interceptor beans and decorator
- * beans. This is behavior is different to getBeans() which returns only
- * resolvable beans.
- *
- * TODO Rename method, merge into whatever we use for passivation capable or
- * split out decorators
- *
- * WARNING, method will go away!
- *
- * @return
- */
- public Map<String, Bean<?>> getPassivationCapableBeans()
- {
- return Collections.unmodifiableMap(passivationCapableBeans);
- }
-
public void addContext(Context context)
{
contexts.put(context.getScope(), context);
@@ -1314,7 +1289,7 @@
public Bean<?> getPassivationCapableBean(String id)
{
- throw new UnsupportedOperationException("Not yet implemented");
+ return getServices().get(ContextualStore.class).<Bean<Object>, Object>getContextual(id);
}
public Set<Annotation> getStereotypeDefinition(Class<? extends Annotation> stereotype)
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java 2009-10-09 14:52:45 UTC (rev 3911)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java 2009-10-09 15:14:14 UTC (rev 3912)
@@ -23,6 +23,7 @@
import javax.enterprise.event.Observes;
import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.ProcessAnnotatedType;
import javax.enterprise.inject.spi.ProcessInjectionTarget;
import javax.enterprise.inject.spi.ProcessManagedBean;
import javax.enterprise.inject.spi.ProcessObserverMethod;
@@ -47,6 +48,7 @@
import org.jboss.weld.bean.SessionBean;
import org.jboss.weld.bean.ee.EEResourceProducerField;
import org.jboss.weld.bean.ee.PersistenceContextProducerField;
+import org.jboss.weld.bootstrap.events.ProcessAnnotatedTypeImpl;
import org.jboss.weld.bootstrap.events.ProcessInjectionTargetImpl;
import org.jboss.weld.bootstrap.events.ProcessManagedBeanImpl;
import org.jboss.weld.bootstrap.events.ProcessObserverMethodImpl;
@@ -133,7 +135,7 @@
{
log.debug("Observer : " + observer);
observer.initialize();
- createAndFireProcessObserverMethodEvent(observer);
+ fireProcessObserverMethodEvent(observer);
manager.addObserver(observer);
}
@@ -223,6 +225,13 @@
}
}
+ protected <X> ProcessAnnotatedTypeImpl<X> fireProcessAnnotatedTypeEvent(WeldClass<X> clazz)
+ {
+ ProcessAnnotatedTypeImpl<X> payload = new ProcessAnnotatedTypeImpl<X>(clazz) {};
+ fireEvent(payload, ProcessAnnotatedType.class, clazz.getBaseType());
+ return payload;
+ }
+
private <X> void fireProcessManagedBeanEvent(ManagedBean<X> bean)
{
ProcessManagedBeanImpl<X> payload = new ProcessManagedBeanImpl<X>(bean) {};
@@ -245,7 +254,7 @@
}
}
- private void fireEvent(Object payload, Type rawType, Type... actualTypeArguments)
+ protected void fireEvent(Object payload, Type rawType, Type... actualTypeArguments)
{
Type eventType = new ParameterizedTypeImpl(rawType, actualTypeArguments, null);
manager.fireEvent(eventType, payload);
@@ -273,7 +282,7 @@
getEnvironment().addObserver(observer);
}
- private <X, T> void createAndFireProcessObserverMethodEvent(ObserverMethodImpl<X, T> observer)
+ private <X, T> void fireProcessObserverMethodEvent(ObserverMethodImpl<X, T> observer)
{
ProcessObserverMethodImpl<X, T> payload = new ProcessObserverMethodImpl<X, T>(observer.getMethod(), observer) {};
fireEvent(payload, ProcessObserverMethod.class, observer.getMethod().getDeclaringType().getBaseType(), observer.getObservedType());
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java 2009-10-09 14:52:45 UTC (rev 3911)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java 2009-10-09 15:14:14 UTC (rev 3912)
@@ -58,8 +58,7 @@
ClassTransformer classTransformer = Container.instance().deploymentServices().get(ClassTransformer.class);
if (!clazz.isAnnotation() && !clazz.isEnum())
{
- ProcessAnnotatedTypeImpl<?> event = createProcessAnnotatedTypeEvent(clazz, classTransformer);
- deploymentManager.fireEvent(event);
+ ProcessAnnotatedTypeImpl<?> event = fireProcessAnnotatedTypeEvent(classTransformer.loadClass(clazz));
if (!event.isVeto())
{
if (event.getAnnotatedType() instanceof WeldClass<?>)
@@ -75,12 +74,6 @@
return this;
}
- private static <X> ProcessAnnotatedTypeImpl<X> createProcessAnnotatedTypeEvent(Class<X> clazz, ClassTransformer classTransformer)
- {
- WeldClass<X> annotatedType = classTransformer.loadClass(clazz);
- return new ProcessAnnotatedTypeImpl<X>(annotatedType) {};
- }
-
// TODO Do we need to fire PAT for annotated types added via BBD? Probably not PLM.
public BeanDeployer addClass(AnnotatedType<?> clazz)
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java 2009-10-09 14:52:45 UTC (rev 3911)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java 2009-10-09 15:14:14 UTC (rev 3912)
@@ -130,6 +130,20 @@
public void deployBeans(Environment environment)
{
+ for (ExtensionBean bean : extensionBeanDeployerEnvironment.getBeans())
+ {
+ if (deployment.loadBeanDeploymentArchive(bean.getBeanClass()).equals(beanDeploymentArchive))
+ {
+ beanDeployer.getManager().addBean(bean);
+ }
+ }
+ for (ObserverMethodImpl<?, ?> observerMethod : extensionBeanDeployerEnvironment.getObservers())
+ {
+ if (deployment.loadBeanDeploymentArchive(observerMethod.getBean().getBeanClass()).equals(beanDeploymentArchive))
+ {
+ beanDeployer.getManager().addObserver(observerMethod);
+ }
+ }
beanDeployer.addClasses(beanDeploymentArchive.getBeanClasses());
beanDeployer.getEnvironment().addBean(new ManagerBean(beanManager));
beanDeployer.getEnvironment().addBean(new InjectionPointBean(beanManager));
@@ -156,20 +170,6 @@
beanDeployer.getEnvironment().addBean(new DefaultValidatorBean(beanManager));
beanDeployer.getEnvironment().addBean(new DefaultValidatorFactoryBean(beanManager));
}
- for (ExtensionBean bean : extensionBeanDeployerEnvironment.getBeans())
- {
- if (deployment.loadBeanDeploymentArchive(bean.getBeanClass()).equals(beanDeploymentArchive))
- {
- beanDeployer.getManager().addBean(bean);
- }
- }
- for (ObserverMethodImpl<?, ?> observerMethod : extensionBeanDeployerEnvironment.getObservers())
- {
- if (deployment.loadBeanDeploymentArchive(observerMethod.getBean().getBeanClass()).equals(beanDeploymentArchive))
- {
- beanDeployer.getManager().addObserver(observerMethod);
- }
- }
beanDeployer.createBeans().deploy();
}
15 years, 2 months
Weld SVN: r3911 - core/branches.
by weld-commits＠lists.jboss.org
Author: rogerk
Date: 2009-10-09 10:52:45 -0400 (Fri, 09 Oct 2009)
New Revision: 3911
Added:
core/branches/1.0.0.PREVIEW5/
Log:
1.0.0.PREVIEW5
Copied: core/branches/1.0.0.PREVIEW5 (from rev 3910, core/trunk)
15 years, 2 months
Weld SVN: r3910 - core/branches.
by weld-commits＠lists.jboss.org
Author: rogerk
Date: 2009-10-09 10:49:38 -0400 (Fri, 09 Oct 2009)
New Revision: 3910
Removed:
core/branches/1.0.0.PREVIEW5/
Log:
removing
15 years, 2 months