[weld-commits] Weld SVN: r3886 - in ri/trunk: api and 11 other directories.

weld-commits at lists.jboss.org weld-commits at lists.jboss.org
Thu Oct 8 00:41:35 EDT 2009


Author: shane.bryzak at jboss.com
Date: 2009-10-08 00:41:34 -0400 (Thu, 08 Oct 2009)
New Revision: 3886

Modified:
   ri/trunk/api/pom.xml
   ri/trunk/impl/pom.xml
   ri/trunk/inject-tck-runner/pom.xml
   ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/AtInjectTCK.java
   ri/trunk/osgi-bundle/pom.xml
   ri/trunk/parent/pom.xml
   ri/trunk/pom.xml
   ri/trunk/porting-package/pom.xml
   ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/BeansImpl.java
   ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ContextsImpl.java
   ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ELImpl.java
   ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ManagersImpl.java
   ri/trunk/spi/pom.xml
   ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java
   ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockBootstrap.java
   ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockDeployment.java
   ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbInjectionServices.java
   ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbServices.java
   ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJpaServices.java
   ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceLoader.java
   ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceServices.java
   ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockSecurityServices.java
   ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockService.java
   ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockServletServices.java
   ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockTransactionServices.java
   ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockValidationServices.java
   ri/trunk/tests/pom.xml
   ri/trunk/version-matrix/pom.xml
Log:
update poms


Modified: ri/trunk/api/pom.xml
===================================================================
--- ri/trunk/api/pom.xml	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/api/pom.xml	2009-10-08 04:41:34 UTC (rev 3886)
@@ -2,17 +2,17 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.jboss.webbeans</groupId>
-		<artifactId>webbeans-parent</artifactId>
+		<groupId>org.jboss.weld</groupId>
+		<artifactId>weld-parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
-	<groupId>org.jboss.webbeans</groupId>
+	<groupId>org.jboss.weld</groupId>
 	<artifactId>jsr299-api</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>JSR-299 API</name>
-	<url>http://www.seamframework.org/WebBeans</url>
+	<url>http://www.seamframework.org/Weld</url>
 
 	<dependencies>
 		<dependency>

Modified: ri/trunk/impl/pom.xml
===================================================================
--- ri/trunk/impl/pom.xml	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/impl/pom.xml	2009-10-08 04:41:34 UTC (rev 3886)
@@ -1,34 +1,34 @@
 <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-parent</artifactId>
-      <groupId>org.jboss.webbeans</groupId>
+      <artifactId>weld-parent</artifactId>
+      <groupId>org.jboss.weld</groupId>
       <version>1.0.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.jboss.webbeans</groupId>
-   <artifactId>webbeans-core</artifactId>
+   <groupId>org.jboss.weld</groupId>
+   <artifactId>weld-core</artifactId>
    <version>1.0.0-SNAPSHOT</version>
-   <name>Web Beans Core</name>
+   <name>Weld Core</name>
    <dependencies>
 
       <dependency>
-         <groupId>org.jboss.webbeans</groupId>
+         <groupId>org.jboss.weld</groupId>
          <artifactId>jsr299-api</artifactId>
       </dependency>
       
       <dependency>
-         <groupId>org.jboss.webbeans</groupId>
-         <artifactId>webbeans-api</artifactId>
+         <groupId>org.jboss.weld</groupId>
+         <artifactId>weld-api</artifactId>
       </dependency>
       
       <dependency>
-         <groupId>org.jboss.webbeans</groupId>
-         <artifactId>webbeans-spi</artifactId>
+         <groupId>org.jboss.weld</groupId>
+         <artifactId>weld-spi</artifactId>
       </dependency>
 
       <dependency>
-         <groupId>org.jboss.webbeans</groupId>
-         <artifactId>webbeans-logging</artifactId>
+         <groupId>org.jboss.weld</groupId>
+         <artifactId>weld-logging</artifactId>
       </dependency>
       
       <dependency>

Modified: ri/trunk/inject-tck-runner/pom.xml
===================================================================
--- ri/trunk/inject-tck-runner/pom.xml	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/inject-tck-runner/pom.xml	2009-10-08 04:41:34 UTC (rev 3886)
@@ -1,26 +1,26 @@
 <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-parent</artifactId>
-      <groupId>org.jboss.webbeans</groupId>
+      <artifactId>weld-parent</artifactId>
+      <groupId>org.jboss.weld</groupId>
       <version>1.0.0-SNAPSHOT</version>
       <relativePath>../parent</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.jboss.webbeans</groupId>
-   <artifactId>webbeans-inject-tck-runner</artifactId>
-   <name>javax.inject TCK runner for Web Beans</name>
-   <description>Aggregates dependencies and run's the javax.inject TCK for Web Beans</description>
+   <groupId>org.jboss.weld</groupId>
+   <artifactId>weld-inject-tck-runner</artifactId>
+   <name>javax.inject TCK runner for Weld</name>
+   <description>Aggregates dependencies and run's the javax.inject TCK for Weld</description>
    
    <dependencies>
 
       <dependency>
-         <groupId>org.jboss.webbeans</groupId>
-         <artifactId>webbeans-core</artifactId>
+         <groupId>org.jboss.weld</groupId>
+         <artifactId>weld-core</artifactId>
       </dependency>
 
       <dependency>
-         <groupId>org.jboss.webbeans</groupId>
-         <artifactId>webbeans-porting-package</artifactId>
+         <groupId>org.jboss.weld</groupId>
+         <artifactId>weld-porting-package</artifactId>
       </dependency>
 
       <dependency>

Modified: ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/AtInjectTCK.java
===================================================================
--- ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/AtInjectTCK.java	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/AtInjectTCK.java	2009-10-08 04:41:34 UTC (rev 3886)
@@ -16,8 +16,8 @@
 import org.atinject.tck.auto.V8Engine;
 import org.atinject.tck.auto.accessories.Cupholder;
 import org.atinject.tck.auto.accessories.SpareTire;
-import org.jboss.webbeans.mock.MockEELifecycle;
-import org.jboss.webbeans.mock.TestContainer;
+import org.jboss.weld.mock.MockEELifecycle;
+import org.jboss.weld.mock.TestContainer;
 
 /**
  * Configure the AtInject TCK for use with the 299 RI

Modified: ri/trunk/osgi-bundle/pom.xml
===================================================================
--- ri/trunk/osgi-bundle/pom.xml	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/osgi-bundle/pom.xml	2009-10-08 04:41:34 UTC (rev 3886)
@@ -19,16 +19,16 @@
 -->
 <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-parent</artifactId>
-      <groupId>org.jboss.webbeans</groupId>
+      <artifactId>weld-parent</artifactId>
+      <groupId>org.jboss.weld</groupId>
       <version>1.0.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
 
-   <groupId>org.jboss.webbeans</groupId>
-   <artifactId>webbeans-osgi-bundle</artifactId>
-   <name>Web Beans OSGi Bundle</name>
-   <description>Web Beans implementation packaged as an OSGi bundle</description>
+   <groupId>org.jboss.weld</groupId>
+   <artifactId>weld-osgi-bundle</artifactId>
+   <name>Weld OSGi Bundle</name>
+   <description>Weld implementation packaged as an OSGi bundle</description>
 
    <developers>
         <developer>
@@ -59,10 +59,10 @@
                         <_include>-osgi.bundle</_include>
 
                         <Embed-Dependency>*; scope=compile; inline=true</Embed-Dependency>
-                        <_exportcontents>javax.event; javax.context; javax.webbeans; javax.decorator; javax.inject; javax.enterprise.*; version=${osgi.version},
-                                         org.jboss.webbeans.context; org.jboss.webbeans.ejb; org.jboss.webbeans.bean; org.jboss.webbeans.bean.proxy; org.jboss.webbeans.*.api.*; org.jboss.webbeans.*.spi.*; org.jboss.webbeans.conversation; org.jboss.webbeans; org.jboss.webbeans.bootstrap; org.jboss.webbeans.introspector; org.jboss.webbeans.servlet; version=${osgi.version},
-                                         org.jboss.webbeans.el; version=${osgi.version},
-                                         org.jboss.webbeans.jsf; include:="WebBeansPhaseListener"; version=${osgi.version},
+                        <_exportcontents>javax.event; javax.context; javax.weld; javax.decorator; javax.inject; javax.enterprise.*; version=${osgi.version},
+                                         org.jboss.weld.context; org.jboss.weld.ejb; org.jboss.weld.bean; org.jboss.weld.bean.proxy; org.jboss.weld.*.api.*; org.jboss.weld.*.spi.*; org.jboss.weld.conversation; org.jboss.weld; org.jboss.weld.bootstrap; org.jboss.weld.introspector; org.jboss.weld.servlet; version=${osgi.version},
+                                         org.jboss.weld.el; version=${osgi.version},
+                                         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>
@@ -93,31 +93,31 @@
    </build>
    <dependencies>
      <dependency>
-       <groupId>org.jboss.webbeans</groupId>
+       <groupId>org.jboss.weld</groupId>
 
        <artifactId>jsr299-api</artifactId>
        <version>${project.version}</version>
      </dependency>
      <dependency>
-       <groupId>org.jboss.webbeans</groupId>
-       <artifactId>webbeans-api</artifactId>
+       <groupId>org.jboss.weld</groupId>
+       <artifactId>weld-api</artifactId>
        <version>${project.version}</version>
 
      </dependency>
      <dependency>
-       <groupId>org.jboss.webbeans</groupId>
-       <artifactId>webbeans-spi</artifactId>
+       <groupId>org.jboss.weld</groupId>
+       <artifactId>weld-spi</artifactId>
        <version>${project.version}</version>
      </dependency>
      <dependency>
 
-       <groupId>org.jboss.webbeans</groupId>
-       <artifactId>webbeans-core</artifactId>
+       <groupId>org.jboss.weld</groupId>
+       <artifactId>weld-core</artifactId>
        <version>${project.version}</version>
      </dependency>
      <dependency>
-       <groupId>org.jboss.webbeans</groupId>
-       <artifactId>webbeans-logging</artifactId>
+       <groupId>org.jboss.weld</groupId>
+       <artifactId>weld-logging</artifactId>
 
        <version>${project.version}</version>
      </dependency>

Modified: ri/trunk/parent/pom.xml
===================================================================
--- ri/trunk/parent/pom.xml	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/parent/pom.xml	2009-10-08 04:41:34 UTC (rev 3886)
@@ -1,22 +1,22 @@
 <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>
-   <groupId>org.jboss.webbeans</groupId>
-   <artifactId>webbeans-parent</artifactId>
+   <groupId>org.jboss.weld</groupId>
+   <artifactId>weld-parent</artifactId>
    <packaging>pom</packaging>
    <version>1.0.0-SNAPSHOT</version>
    
    <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>
       <relativePath>../version-matrix</relativePath>
    </parent>
 
-   <name>Web Beans, the reference implementation of JSR-299</name>
-   <url>http://www.seamframework.org/WebBeans</url>
+   <name>Weld, the reference implementation of JSR-299</name>
+   <url>http://www.seamframework.org/Weld</url>
 
    <description>
-      The reference implementation of JSR 299: Web Beans
+      The reference implementation of JSR 299: Weld
    </description>
 
    <developers>
@@ -68,7 +68,7 @@
            <artifactId>maven-release-plugin</artifactId>
            <version>2.0-beta-8</version>
            <configuration>
-             <tagBase>https://svn.jboss.org/repos/webbeans/ri/tags</tagBase>
+             <tagBase>https://svn.jboss.org/repos/weld/ri/tags</tagBase>
              <autoVersionSubmodules>true</autoVersionSubmodules>
            </configuration>
          </plugin>
@@ -211,7 +211,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>
@@ -228,21 +228,21 @@
    </licenses>
 
    <scm>
-      <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/trunk/parent</connection>
-      <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/trunk/parent</developerConnection>
-      <url>http://fisheye.jboss.org/browse/WebBeans/ri</url>
+      <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/ri/trunk/parent</connection>
+      <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/ri/trunk/parent</developerConnection>
+      <url>http://fisheye.jboss.org/browse/Weld/ri</url>
    </scm>
 
    <distributionManagement>
       <repository>
-         <id>repository.jboss.org</id>
-         <name>JBoss Releases Repository</name>
-         <url>dav:https://svn.jboss.org/repos/repository.jboss.org/maven2</url>
+         <id>oss.sonatype.org</id>
+         <name>Sonatype Nexus Maven Repository</name>
+         <url>dav:https://oss.sonatype.org/content/repositories/jboss-releases/</url>
       </repository>
       <snapshotRepository>
-         <id>snapshots.jboss.org</id>
-         <name>JBoss Snapshot Repository</name>
-         <url>dav:https://snapshots.jboss.org/maven2</url>
+         <id>oss.sonatype.org</id>
+         <name>Sonatype Nexus Snapshot Repository</name>
+         <url>dav:https://oss.sonatype.org/content/repositories/jboss-snapshots/</url>
       </snapshotRepository>
    </distributionManagement>
 
@@ -258,7 +258,7 @@
                </formats>
                <instrumentation>
                   <ignores>
-                     <ignore>javax.webbeans.*</ignore>
+                     <ignore>javax.weld.*</ignore>
                   </ignores>
                </instrumentation>
             </configuration>

Modified: ri/trunk/pom.xml
===================================================================
--- ri/trunk/pom.xml	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/pom.xml	2009-10-08 04:41:34 UTC (rev 3886)
@@ -1,29 +1,29 @@
 <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>
-   <groupId>org.jboss.webbeans</groupId>
-   <artifactId>webbeans-build-aggregator</artifactId>
+   <groupId>org.jboss.weld</groupId>
+   <artifactId>weld-build-aggregator</artifactId>
    <packaging>pom</packaging>
    <version>1.0.0-SNAPSHOT</version>
 
-   <name>Web Beans Build Aggregator</name>
-   <url>http://www.seamframework.org/WebBeans</url>
+   <name>Weld Build Aggregator</name>
+   <url>http://www.seamframework.org/Weld</url>
 
    <scm>
-      <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/trunk</connection>
-      <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/trunk</developerConnection>
-      <url>http://fisheye.jboss.org/browse/WebBeans</url>
+      <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/ri/trunk</connection>
+      <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/ri/trunk</developerConnection>
+      <url>http://fisheye.jboss.org/browse/Weld</url>
    </scm>
 
    <distributionManagement>
        <repository>
-          <id>repository.jboss.org</id>
-          <name>JBoss Releases Repository</name>
-          <url>dav:https://svn.jboss.org/repos/repository.jboss.org/maven2</url>
+          <id>oss.sonatype.org</id>
+          <name>Sonatype Nexus Maven Repository</name>
+          <url>dav:http://oss.sonatype.org/content/repositories/jboss-releases/</url>
       </repository>
       <snapshotRepository>
          <id>snapshots.jboss.org</id>
-         <name>JBoss Snapshot Repository</name>
-         <url>dav:https://snapshots.jboss.org/maven2</url>
+         <name>Sonatype Nexus Snapshot Repository</name>
+         <url>dav:http://oss.sonatype.org/content/repositories/jboss-snapshots/</url>
       </snapshotRepository>
    </distributionManagement>
 

Modified: ri/trunk/porting-package/pom.xml
===================================================================
--- ri/trunk/porting-package/pom.xml	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/porting-package/pom.xml	2009-10-08 04:41:34 UTC (rev 3886)
@@ -1,24 +1,24 @@
 <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-parent</artifactId>
-      <groupId>org.jboss.webbeans</groupId>
+      <artifactId>weld-parent</artifactId>
+      <groupId>org.jboss.weld</groupId>
       <version>1.0.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.jboss.webbeans</groupId>
-   <artifactId>webbeans-porting-package</artifactId>
+   <groupId>org.jboss.weld</groupId>
+   <artifactId>weld-porting-package</artifactId>
    <version>1.0.0-SNAPSHOT</version>
-   <name>Web Beans Porting Package for JSR-299 TCK</name>
+   <name>Weld Porting Package for JSR-299 TCK</name>
    <dependencies>
 
       <dependency>
-         <groupId>org.jboss.webbeans</groupId>
+         <groupId>org.jboss.weld</groupId>
          <artifactId>jsr299-api</artifactId>
       </dependency>
       
       <dependency>
-         <groupId>org.jboss.webbeans</groupId>
-         <artifactId>webbeans-core</artifactId>
+         <groupId>org.jboss.weld</groupId>
+         <artifactId>weld-core</artifactId>
       </dependency>
 
       <dependency>
@@ -35,8 +35,8 @@
       </dependency>
       
       <dependency>
-      	<groupId>org.jboss.webbeans</groupId>
-	      <artifactId>webbeans-core-test</artifactId>
+      	<groupId>org.jboss.weld</groupId>
+	      <artifactId>weld-core-test</artifactId>
      </dependency>
       
    </dependencies>

Modified: ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/BeansImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/BeansImpl.java	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/BeansImpl.java	2009-10-08 04:41:34 UTC (rev 3886)
@@ -1,7 +1,7 @@
 package org.jboss.weld.tck;
 
 import org.jboss.jsr299.tck.spi.Beans;
-import org.jboss.webbeans.util.Proxies;
+import org.jboss.weld.util.Proxies;
 
 /**
  * Implements the Beans SPI for the TCK specifically for the JBoss RI.

Modified: ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ContextsImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ContextsImpl.java	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ContextsImpl.java	2009-10-08 04:41:34 UTC (rev 3886)
@@ -1,11 +1,11 @@
 package org.jboss.weld.tck;
 
 import org.jboss.jsr299.tck.spi.Contexts;
-import org.jboss.webbeans.Container;
-import org.jboss.webbeans.context.AbstractContext;
-import org.jboss.webbeans.context.AbstractMapContext;
-import org.jboss.webbeans.context.ContextLifecycle;
-import org.jboss.webbeans.context.RequestContext;
+import org.jboss.weld.Container;
+import org.jboss.weld.context.AbstractContext;
+import org.jboss.weld.context.AbstractMapContext;
+import org.jboss.weld.context.ContextLifecycle;
+import org.jboss.weld.context.RequestContext;
 
 public class ContextsImpl implements Contexts<AbstractContext>
 {

Modified: ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ELImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ELImpl.java	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ELImpl.java	2009-10-08 04:41:34 UTC (rev 3886)
@@ -5,8 +5,8 @@
 import org.jboss.jsr299.tck.api.JSR299Configuration;
 import org.jboss.testharness.api.Configurable;
 import org.jboss.testharness.api.Configuration;
-import org.jboss.webbeans.BeanManagerImpl;
-import org.jboss.webbeans.mock.el.EL;
+import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.mock.el.EL;
 
 public class ELImpl implements org.jboss.jsr299.tck.spi.EL, Configurable
 {

Modified: ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ManagersImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ManagersImpl.java	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/porting-package/src/main/java/org/jboss/weld/tck/ManagersImpl.java	2009-10-08 04:41:34 UTC (rev 3886)
@@ -6,10 +6,10 @@
 
 import org.jboss.jsr299.tck.spi.Managers;
 import org.jboss.testharness.impl.runner.servlet.ServletTestRunner;
-import org.jboss.webbeans.DefinitionException;
-import org.jboss.webbeans.DeploymentException;
-import org.jboss.webbeans.mock.MockServletContext;
-import org.jboss.webbeans.servlet.ServletHelper;
+import org.jboss.weld.DefinitionException;
+import org.jboss.weld.DeploymentException;
+import org.jboss.weld.mock.MockServletContext;
+import org.jboss.weld.servlet.ServletHelper;
 
 public class ManagersImpl implements Managers
 {

Modified: ri/trunk/spi/pom.xml
===================================================================
--- ri/trunk/spi/pom.xml	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/pom.xml	2009-10-08 04:41:34 UTC (rev 3886)
@@ -1,18 +1,18 @@
 <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-parent</artifactId>
-      <groupId>org.jboss.webbeans</groupId>
+      <artifactId>weld-parent</artifactId>
+      <groupId>org.jboss.weld</groupId>
       <version>1.0.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.jboss.webbeans</groupId>
-   <artifactId>webbeans-spi</artifactId>
+   <groupId>org.jboss.weld</groupId>
+   <artifactId>weld-spi</artifactId>
    <version>1.0.0-SNAPSHOT</version>
-   <name>Web Beans Service Provider Interfaces</name>
+   <name>Weld Service Provider Interfaces</name>
    <dependencies>
 
       <dependency>
-         <groupId>org.jboss.webbeans</groupId>
+         <groupId>org.jboss.weld</groupId>
          <artifactId>jsr299-api</artifactId>
       </dependency>
       

Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java	2009-10-08 04:41:34 UTC (rev 3886)
@@ -1,20 +1,20 @@
 package org.jboss.webbeans.bootstrap.api.test;
 
-import org.jboss.webbeans.bootstrap.api.Bootstrap;
-import org.jboss.webbeans.bootstrap.api.Environments;
-import org.jboss.webbeans.bootstrap.api.ServiceRegistry;
-import org.jboss.webbeans.bootstrap.api.helpers.SimpleServiceRegistry;
 import org.jboss.webbeans.bootstrap.api.test.MockDeployment.MockBeanDeploymentArchive;
-import org.jboss.webbeans.bootstrap.spi.Deployment;
-import org.jboss.webbeans.ejb.spi.EjbServices;
-import org.jboss.webbeans.injection.spi.EjbInjectionServices;
-import org.jboss.webbeans.injection.spi.JpaInjectionServices;
-import org.jboss.webbeans.injection.spi.ResourceInjectionServices;
-import org.jboss.webbeans.resources.spi.ResourceLoader;
-import org.jboss.webbeans.security.spi.SecurityServices;
-import org.jboss.webbeans.servlet.api.ServletServices;
-import org.jboss.webbeans.transaction.spi.TransactionServices;
-import org.jboss.webbeans.validation.spi.ValidationServices;
+import org.jboss.weld.bootstrap.api.Bootstrap;
+import org.jboss.weld.bootstrap.api.Environments;
+import org.jboss.weld.bootstrap.api.ServiceRegistry;
+import org.jboss.weld.bootstrap.api.helpers.SimpleServiceRegistry;
+import org.jboss.weld.bootstrap.spi.Deployment;
+import org.jboss.weld.ejb.spi.EjbServices;
+import org.jboss.weld.injection.spi.EjbInjectionServices;
+import org.jboss.weld.injection.spi.JpaInjectionServices;
+import org.jboss.weld.injection.spi.ResourceInjectionServices;
+import org.jboss.weld.resources.spi.ResourceLoader;
+import org.jboss.weld.security.spi.SecurityServices;
+import org.jboss.weld.servlet.api.ServletServices;
+import org.jboss.weld.transaction.spi.TransactionServices;
+import org.jboss.weld.validation.spi.ValidationServices;
 import org.testng.annotations.Test;
 
 public class BootstrapTest

Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockBootstrap.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockBootstrap.java	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockBootstrap.java	2009-10-08 04:41:34 UTC (rev 3886)
@@ -2,14 +2,14 @@
 
 import java.util.Set;
 
-import org.jboss.webbeans.bootstrap.api.Bootstrap;
-import org.jboss.webbeans.bootstrap.api.Environment;
-import org.jboss.webbeans.bootstrap.api.Service;
-import org.jboss.webbeans.bootstrap.api.ServiceRegistry;
-import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.webbeans.bootstrap.spi.Deployment;
-import org.jboss.webbeans.context.api.BeanStore;
-import org.jboss.webbeans.manager.api.WebBeansManager;
+import org.jboss.weld.bootstrap.api.Bootstrap;
+import org.jboss.weld.bootstrap.api.Environment;
+import org.jboss.weld.bootstrap.api.Service;
+import org.jboss.weld.bootstrap.api.ServiceRegistry;
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.weld.bootstrap.spi.Deployment;
+import org.jboss.weld.context.api.BeanStore;
+import org.jboss.weld.manager.api.WebBeansManager;
 
 public class MockBootstrap implements Bootstrap
 {

Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockDeployment.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockDeployment.java	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockDeployment.java	2009-10-08 04:41:34 UTC (rev 3886)
@@ -21,10 +21,10 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.jboss.webbeans.bootstrap.api.ServiceRegistry;
-import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.webbeans.bootstrap.spi.Deployment;
-import org.jboss.webbeans.ejb.spi.EjbDescriptor;
+import org.jboss.weld.bootstrap.api.ServiceRegistry;
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.weld.bootstrap.spi.Deployment;
+import org.jboss.weld.ejb.spi.EjbDescriptor;
 
 /**
  * @author pmuir

Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbInjectionServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbInjectionServices.java	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbInjectionServices.java	2009-10-08 04:41:34 UTC (rev 3886)
@@ -18,7 +18,7 @@
 
 import javax.enterprise.inject.spi.InjectionPoint;
 
-import org.jboss.webbeans.injection.spi.EjbInjectionServices;
+import org.jboss.weld.injection.spi.EjbInjectionServices;
 
 /**
  * @author pmuir

Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbServices.java	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbServices.java	2009-10-08 04:41:34 UTC (rev 3886)
@@ -2,10 +2,10 @@
 
 import javax.enterprise.inject.spi.InjectionPoint;
 
-import org.jboss.webbeans.ejb.api.SessionObjectReference;
-import org.jboss.webbeans.ejb.spi.EjbDescriptor;
-import org.jboss.webbeans.ejb.spi.EjbServices;
-import org.jboss.webbeans.ejb.spi.InterceptorBindings;
+import org.jboss.weld.ejb.api.SessionObjectReference;
+import org.jboss.weld.ejb.spi.EjbDescriptor;
+import org.jboss.weld.ejb.spi.EjbServices;
+import org.jboss.weld.ejb.spi.InterceptorBindings;
 
 public class MockEjbServices extends MockService implements EjbServices
 {

Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJpaServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJpaServices.java	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJpaServices.java	2009-10-08 04:41:34 UTC (rev 3886)
@@ -6,7 +6,7 @@
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
-import org.jboss.webbeans.injection.spi.JpaInjectionServices;
+import org.jboss.weld.injection.spi.JpaInjectionServices;
 
 public class MockJpaServices extends MockService implements JpaInjectionServices
 {

Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceLoader.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceLoader.java	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceLoader.java	2009-10-08 04:41:34 UTC (rev 3886)
@@ -3,7 +3,7 @@
 import java.net.URL;
 import java.util.Collection;
 
-import org.jboss.webbeans.resources.spi.ResourceLoader;
+import org.jboss.weld.resources.spi.ResourceLoader;
 
 public class MockResourceLoader extends MockService implements ResourceLoader
 {

Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceServices.java	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceServices.java	2009-10-08 04:41:34 UTC (rev 3886)
@@ -2,7 +2,7 @@
 
 import javax.enterprise.inject.spi.InjectionPoint;
 
-import org.jboss.webbeans.injection.spi.ResourceInjectionServices;
+import org.jboss.weld.injection.spi.ResourceInjectionServices;
 
 public class MockResourceServices extends MockService implements ResourceInjectionServices
 {

Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockSecurityServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockSecurityServices.java	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockSecurityServices.java	2009-10-08 04:41:34 UTC (rev 3886)
@@ -18,7 +18,7 @@
 
 import java.security.Principal;
 
-import org.jboss.webbeans.security.spi.SecurityServices;
+import org.jboss.weld.security.spi.SecurityServices;
 
 /**
  * @author pmuir

Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockService.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockService.java	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockService.java	2009-10-08 04:41:34 UTC (rev 3886)
@@ -16,7 +16,7 @@
  */
 package org.jboss.webbeans.bootstrap.api.test;
 
-import org.jboss.webbeans.bootstrap.api.Service;
+import org.jboss.weld.bootstrap.api.Service;
 
 /**
  * @author pmuir

Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockServletServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockServletServices.java	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockServletServices.java	2009-10-08 04:41:34 UTC (rev 3886)
@@ -18,8 +18,8 @@
 
 import javax.servlet.ServletContext;
 
-import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.webbeans.servlet.api.ServletServices;
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.weld.servlet.api.ServletServices;
 
 /**
  * @author pmuir

Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockTransactionServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockTransactionServices.java	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockTransactionServices.java	2009-10-08 04:41:34 UTC (rev 3886)
@@ -3,7 +3,7 @@
 import javax.transaction.Synchronization;
 import javax.transaction.UserTransaction;
 
-import org.jboss.webbeans.transaction.spi.TransactionServices;
+import org.jboss.weld.transaction.spi.TransactionServices;
 
 public class MockTransactionServices extends MockService implements TransactionServices
 {

Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockValidationServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockValidationServices.java	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockValidationServices.java	2009-10-08 04:41:34 UTC (rev 3886)
@@ -18,7 +18,7 @@
 
 import javax.validation.ValidatorFactory;
 
-import org.jboss.webbeans.validation.spi.ValidationServices;
+import org.jboss.weld.validation.spi.ValidationServices;
 
 /**
  * @author pmuir

Modified: ri/trunk/tests/pom.xml
===================================================================
--- ri/trunk/tests/pom.xml	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/tests/pom.xml	2009-10-08 04:41:34 UTC (rev 3886)
@@ -1,14 +1,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-parent</artifactId>
-      <groupId>org.jboss.webbeans</groupId>
+      <artifactId>weld-parent</artifactId>
+      <groupId>org.jboss.weld</groupId>
       <version>1.0.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.jboss.webbeans</groupId>
-   <artifactId>webbeans-core-test</artifactId>
+   <groupId>org.jboss.weld</groupId>
+   <artifactId>weld-core-test</artifactId>
    <version>1.0.0-SNAPSHOT</version>
-   <name>Web Beans Core Tests</name>
+   <name>Weld Core Tests</name>
    <dependencies>
 
       <dependency>
@@ -50,13 +50,13 @@
       </dependency>
       
       <dependency>
-         <groupId>org.jboss.webbeans</groupId>
-         <artifactId>webbeans-core</artifactId>
+         <groupId>org.jboss.weld</groupId>
+         <artifactId>weld-core</artifactId>
       </dependency>
       
       <dependency>
-         <groupId>org.jboss.webbeans</groupId>
-         <artifactId>webbeans-spi</artifactId>
+         <groupId>org.jboss.weld</groupId>
+         <artifactId>weld-spi</artifactId>
       </dependency>
       
       <dependency>

Modified: ri/trunk/version-matrix/pom.xml
===================================================================
--- ri/trunk/version-matrix/pom.xml	2009-10-08 04:30:52 UTC (rev 3885)
+++ ri/trunk/version-matrix/pom.xml	2009-10-08 04:41:34 UTC (rev 3886)
@@ -1,15 +1,15 @@
 <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>
-   <groupId>org.jboss.webbeans</groupId>
-   <artifactId>webbeans-version-matrix</artifactId>
+   <groupId>org.jboss.weld</groupId>
+   <artifactId>weld-version-matrix</artifactId>
    <packaging>pom</packaging>
    <version>1.0.0-SNAPSHOT</version>
 
-   <name>Web Beans Version Matrix</name>
-   <url>http://www.seamframework.org/WebBeans</url>
+   <name>Weld Version Matrix</name>
+   <url>http://www.seamframework.org/Weld</url>
 
    <description>
-      A version matrix for a Web Beans projects
+      A version matrix for Weld projects
    </description>
 
    <repositories>
@@ -36,6 +36,17 @@
             <updatePolicy>never</updatePolicy>
          </snapshots>
       </repository>
+      <repository>
+        <id>oss.sonatype.org</id>
+        <name>Sonatype Nexus Snapshots Repository</name>
+        <url>http://oss.sonatype.org/content/repositories/jboss-snapshots/</url>
+        <releases>
+          <enabled>false</enabled>
+        </releases>
+        <snapshots>
+          <enabled>true</enabled>
+        </snapshots>
+      </repository>
    </repositories>
 
    <pluginRepositories>
@@ -48,10 +59,10 @@
    
    <properties>
       <jsr299.tck.version>1.0.0-SNAPSHOT</jsr299.tck.version>
-      <webbeans.version>1.0.0-SNAPSHOT</webbeans.version>
-      <webbeans.servlet.version>1.0.0-SNAPSHOT</webbeans.servlet.version>
-      <webbeans.se.version>1.0.0-SNAPSHOT</webbeans.se.version>
-      <webbeans.wicket.version>1.0.0-SNAPSHOT</webbeans.wicket.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>
       <jetty.version>6.1.21</jetty.version>
       <wicket.version>1.4.1</wicket.version>
@@ -294,69 +305,69 @@
          </dependency>
 
          <dependency>
-            <groupId>org.jboss.webbeans</groupId>
+            <groupId>org.jboss.weld</groupId>
             <artifactId>jsr299-api</artifactId>
-            <version>${webbeans.version}</version>
+            <version>${weld.version}</version>
          </dependency>
          
          <dependency>
-            <groupId>org.jboss.webbeans</groupId>
-            <artifactId>webbeans-api</artifactId>
-            <version>${webbeans.version}</version>
+            <groupId>org.jboss.weld</groupId>
+            <artifactId>weld-api</artifactId>
+            <version>${weld.version}</version>
          </dependency>
          
          <dependency>
-            <groupId>org.jboss.webbeans</groupId>
-            <artifactId>webbeans-core</artifactId>
-            <version>${webbeans.version}</version>
+            <groupId>org.jboss.weld</groupId>
+            <artifactId>weld-core</artifactId>
+            <version>${weld.version}</version>
          </dependency>
 
          <dependency>
-            <groupId>org.jboss.webbeans</groupId>
-            <artifactId>webbeans-spi</artifactId>
-            <version>${webbeans.version}</version>
+            <groupId>org.jboss.weld</groupId>
+            <artifactId>weld-spi</artifactId>
+            <version>${weld.version}</version>
          </dependency>
          
          <dependency>
-            <groupId>org.jboss.webbeans</groupId>
-            <artifactId>webbeans-porting-package</artifactId>
-            <version>${webbeans.version}</version>
+            <groupId>org.jboss.weld</groupId>
+            <artifactId>weld-porting-package</artifactId>
+            <version>${weld.version}</version>
          </dependency>
          
          <dependency>
-            <groupId>org.jboss.webbeans</groupId>
-            <artifactId>webbeans-logging</artifactId>
-            <version>${webbeans.version}</version>
+            <groupId>org.jboss.weld</groupId>
+            <artifactId>weld-logging</artifactId>
+            <version>${weld.version}</version>
          </dependency>
          
          <dependency>
-            <groupId>org.jboss.webbeans</groupId>
-            <artifactId>webbeans-core-test</artifactId>
-            <version>${webbeans.version}</version>
+            <groupId>org.jboss.weld</groupId>
+            <artifactId>weld-core-test</artifactId>
+            <version>${weld.version}</version>
          </dependency>
          
          <dependency>
-            <groupId>org.jboss.webbeans</groupId>
-            <artifactId>webbeans-se</artifactId>
-            <version>${webbeans.se.version}</version>
+            <groupId>org.jboss.weld</groupId>
+            <artifactId>weld-se</artifactId>
+            <version>${weld.se.version}</version>
          </dependency>
          
          <dependency>
-            <groupId>org.jboss.webbeans.servlet</groupId>
-            <artifactId>webbeans-servlet-int</artifactId>
-            <version>${webbeans.servlet.version}</version>
+            <groupId>org.jboss.weld.servlet</groupId>
+            <artifactId>weld-servlet-int</artifactId>
+            <version>${weld.servlet.version}</version>
          </dependency>
          
          <dependency>
-            <groupId>org.jboss.webbeans.servlet</groupId>
-            <artifactId>webbeans-servlet</artifactId>
-            <version>${webbeans.servlet.version}</version>
+            <groupId>org.jboss.weld.servlet</groupId>
+            <artifactId>weld-servlet</artifactId>
+            <version>${weld.servlet.version}</version>
          </dependency>
          
          <dependency>
-            <groupId>org.jboss.webbeans</groupId>
-            <artifactId>webbeans-wicket</artifactId>
-            <version>${webbeans.wicket.version}</version>
+            <groupId>org.jboss.weld</groupId>
+            <artifactId>weld-wicket</artifactId>
+            <version>${weld.wicket.version}</version>
          </dependency>
 
          <dependency>
@@ -621,21 +632,21 @@
 
    <distributionManagement>
       <repository>
-         <id>repository.jboss.org</id>
-          <name>JBoss Releases Repository</name>
-         <url>dav:https://svn.jboss.org/repos/repository.jboss.org/maven2</url>
+         <id>oss.sonatype.org</id>
+          <name>Sonatype Nexus Releases Repository</name>
+         <url>dav:http://oss.sonatype.org/content/repositories/jboss-releases/</url>
       </repository>
       <snapshotRepository>
-         <id>snapshots.jboss.org</id>
-         <name>JBoss Snapshot Repository</name>
-         <url>dav:https://snapshots.jboss.org/maven2</url>
+         <id>oss.sonatype.org</id>
+         <name>Sonatype Nexus Snapshots Repository</name>
+         <url>dav:https://oss.sonatype.org/content/repositories/jboss-snapshots/</url>
       </snapshotRepository>
    </distributionManagement>
    
    <scm>
-      <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/trunk/version-matrix</connection>
-      <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/trunk/version-matrix</developerConnection>
-      <url>http://fisheye.jboss.org/browse/WebBeans/ri</url>
+      <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/ri/trunk/version-matrix</connection>
+      <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/ri/trunk/version-matrix</developerConnection>
+      <url>http://fisheye.jboss.org/browse/Weld/ri</url>
    </scm>
 
 </project>



More information about the weld-commits mailing list