6:55 a.m.
Author: pete.muir(a)jboss.org
Date: 2009-03-06 07:55:02 -0500 (Fri, 06 Mar 2009)
New Revision: 1790
Removed:
ri/trunk/src/
Modified:
ri/trunk/api/pom.xml
ri/trunk/dist/build.xml
ri/trunk/dist/pom.xml
ri/trunk/dist/readme.txt
ri/trunk/dist/release-process.txt
ri/trunk/impl/pom.xml
ri/trunk/jboss-as/build.properties
ri/trunk/jboss-as/build.xml
ri/trunk/jboss-tck-runner/pom.xml
ri/trunk/pom.xml
ri/trunk/porting-package/pom.xml
ri/trunk/spi/pom.xml
Log:
rename modules
Modified: ri/trunk/api/pom.xml
===================================================================
--- ri/trunk/api/pom.xml 2009-03-06 12:43:10 UTC (rev 1789)
+++ ri/trunk/api/pom.xml 2009-03-06 12:55:02 UTC (rev 1790)
@@ -8,10 +8,10 @@
</parent>
<groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-api</artifactId>
+ <artifactId>jsr299-api</artifactId>
<packaging>jar</packaging>
<name>JSR-299 API</name>
<url>http://www.seamframework.org/WebBeans</url>
-</project>
\ No newline at end of file
+</project>
Modified: ri/trunk/dist/build.xml
===================================================================
--- ri/trunk/dist/build.xml 2009-03-06 12:43:10 UTC (rev 1789)
+++ ri/trunk/dist/build.xml 2009-03-06 12:55:02 UTC (rev 1790)
@@ -86,9 +86,9 @@
<maven target="javadoc:jar install" basedir="${wbri.dir}" />
<artifact:dependencies filesetId="webbeans.fileset"
versionsId="webbeans.versions"
sourcesfilesetid="webbeans.sources.fileset"
javadocfilesetid="webbeans.javadocs.fileset">
- <dependency groupId="org.jboss.webbeans"
artifactId="webbeans-ri" version="${version}"/>
- <dependency groupId="org.jboss.webbeans"
artifactId="webbeans-ri-spi" version="${version}"/>
- <dependency groupId="org.jboss.webbeans"
artifactId="webbeans-api" version="${version}"/>
+ <dependency groupId="org.jboss.webbeans"
artifactId="webbeans-core" version="${version}"/>
+ <dependency groupId="org.jboss.webbeans"
artifactId="webbeans-spi" version="${version}"/>
+ <dependency groupId="org.jboss.webbeans"
artifactId="jsr299-api" version="${version}"/>
<remoteRepository id="repository.jboss.org"
url="http://repository.jboss.org/maven2" />
</artifact:dependencies>
@@ -107,7 +107,7 @@
<mkdir dir="${dist.apidocs.dir}"/>
<unzip dest="${dist.apidocs.dir}">
<fileset dir="target">
- <include name="webbeans-api-javadoc.jar"/>
+ <include name="jsr299-api-javadoc.jar"/>
</fileset>
</unzip>
Modified: ri/trunk/dist/pom.xml
===================================================================
--- ri/trunk/dist/pom.xml 2009-03-06 12:43:10 UTC (rev 1789)
+++ ri/trunk/dist/pom.xml 2009-03-06 12:55:02 UTC (rev 1790)
@@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-ri-distribution</artifactId>
+ <artifactId>webbeans-distribution</artifactId>
<packaging>zip</packaging>
<name>Web Beans Distribution</name>
Modified: ri/trunk/dist/readme.txt
===================================================================
--- ri/trunk/dist/readme.txt 2009-03-06 12:43:10 UTC (rev 1789)
+++ ri/trunk/dist/readme.txt 2009-03-06 12:55:02 UTC (rev 1790)
@@ -10,12 +10,12 @@
License (see apl.txt). In particular, the API and the Web Beans runtime are
licensed under the APL. At least these parts are licensed under the APL:
-* src/webbeans-ri/main/**/*
-* src/webbeans-api/main/**/*
-* src/webbeans-ri-spi/main/**/*
-* lib/webbeans/webbeans-ri.jar
-* lib/webbeans/webbeans-api.jar
-* lib/webbeans/webbeans-ri-spi.jar
+* src/impl/main/**/*
+* src/api/main/**/*
+* src/spi/main/**/*
+* lib/webbeans/webbeans-core.jar
+* lib/webbeans/jsr299-api.jar
+* lib/webbeans/webbeans-spi.jar
This distribution consists of:
@@ -38,5 +38,5 @@
-- The Web Beans and API jars, for use outside of JBoss AS
src/
- -- The sources of Web Beans, including src/webbeans-api, src/webbeans-ri and
+ -- The sources of Web Beans, including src/api, src/impl and
src/reference. To build the sources, just type mvn in the subdirectory.
Modified: ri/trunk/dist/release-process.txt
===================================================================
--- ri/trunk/dist/release-process.txt 2009-03-06 12:43:10 UTC (rev 1789)
+++ ri/trunk/dist/release-process.txt 2009-03-06 12:55:02 UTC (rev 1790)
@@ -2,7 +2,7 @@
--------------------------------
* Run the testsuite and examples
-* Alter the RI POM to exclude the RI
+* Alter the core POM to exclude the core
* Tag using mvn release:prepare in the ri/trunk checkout
* Checkout the newly released APIs, and install them locally
* Tag docs using mvn release:prepare in the doc/trunk/reference checkout
Modified: ri/trunk/impl/pom.xml
===================================================================
--- ri/trunk/impl/pom.xml 2009-03-06 12:43:10 UTC (rev 1789)
+++ ri/trunk/impl/pom.xml 2009-03-06 12:55:02 UTC (rev 1790)
@@ -6,18 +6,18 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-ri</artifactId>
+ <artifactId>webbeans-core</artifactId>
<name>Web Beans Core</name>
<dependencies>
<dependency>
<groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-api</artifactId>
+ <artifactId>jsr299-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-ri-spi</artifactId>
+ <artifactId>webbeans-spi</artifactId>
</dependency>
<dependency>
Modified: ri/trunk/jboss-as/build.properties
===================================================================
--- ri/trunk/jboss-as/build.properties 2009-03-06 12:43:10 UTC (rev 1789)
+++ ri/trunk/jboss-as/build.properties 2009-03-06 12:55:02 UTC (rev 1790)
@@ -1,5 +1,5 @@
#jboss.home=/Applications/jboss-5.0.1.GA
java.opts=-Xms128m -Xmx256m -XX:MaxPermSize=128m -Dorg.jboss.resolver.warning=true
-Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000
webbeans-ri-int.version=5.2.0-SNAPSHOT
-webbeans-ri.version=1.0.0-SNAPSHOT
+webbeans.version=1.0.0-SNAPSHOT
jboss-ejb3.version=1.0.0
Modified: ri/trunk/jboss-as/build.xml
===================================================================
--- ri/trunk/jboss-as/build.xml 2009-03-06 12:43:10 UTC (rev 1789)
+++ ri/trunk/jboss-as/build.xml 2009-03-06 12:55:02 UTC (rev 1790)
@@ -24,7 +24,7 @@
<artifact:dependencies filesetId="webbeans.deployer.fileset"
versionsId="webbeans.deployer.versions">
<dependency groupId="org.jboss.webbeans.integration"
artifactId="webbeans-ri-int-deployer"
version="${webbeans-ri-int.version}" type="zip"/>
- <dependency groupId="org.jboss.webbeans"
artifactId="webbeans-ri" version="${webbeans-ri.version}" />
+ <dependency groupId="org.jboss.webbeans"
artifactId="webbeans-core" version="${webbeans.version}" />
<remoteRepository id="repository.jboss.org"
url="http://repository.jboss.org/maven2" />
<remoteRepository id="snapshots.jboss.org"
url="http://snapshots.jboss.org/maven2" />
</artifact:dependencies>
@@ -48,7 +48,7 @@
<copy
todir="${jboss.home}/server/default/deployers/webbeans.deployer/lib-int/"
overwrite="true">
<fileset dir="target">
- <include name="webbeans-ri.jar" />
+ <include name="webbeans-core.jar" />
</fileset>
</copy>
Modified: ri/trunk/jboss-tck-runner/pom.xml
===================================================================
--- ri/trunk/jboss-tck-runner/pom.xml 2009-03-06 12:43:10 UTC (rev 1789)
+++ ri/trunk/jboss-tck-runner/pom.xml 2009-03-06 12:55:02 UTC (rev 1790)
@@ -14,12 +14,12 @@
<dependency>
<groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-api</artifactId>
+ <artifactId>jsr299-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-ri</artifactId>
+ <artifactId>webbeans-core</artifactId>
</dependency>
<dependency>
Modified: ri/trunk/pom.xml
===================================================================
--- ri/trunk/pom.xml 2009-03-06 12:43:10 UTC (rev 1789)
+++ ri/trunk/pom.xml 2009-03-06 12:55:02 UTC (rev 1790)
@@ -236,19 +236,19 @@
<dependency>
<groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-api</artifactId>
+ <artifactId>jsr299-api</artifactId>
<version>${webbeans.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-ri</artifactId>
+ <artifactId>webbeans-core</artifactId>
<version>${webbeans.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-ri-spi</artifactId>
+ <artifactId>webbeans-spi</artifactId>
<version>${webbeans.version}</version>
</dependency>
Modified: ri/trunk/porting-package/pom.xml
===================================================================
--- ri/trunk/porting-package/pom.xml 2009-03-06 12:43:10 UTC (rev 1789)
+++ ri/trunk/porting-package/pom.xml 2009-03-06 12:55:02 UTC (rev 1790)
@@ -12,12 +12,12 @@
<dependency>
<groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-api</artifactId>
+ <artifactId>jsr299-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-ri</artifactId>
+ <artifactId>webbeans-core</artifactId>
</dependency>
<dependency>
Modified: ri/trunk/spi/pom.xml
===================================================================
--- ri/trunk/spi/pom.xml 2009-03-06 12:43:10 UTC (rev 1789)
+++ ri/trunk/spi/pom.xml 2009-03-06 12:55:02 UTC (rev 1790)
@@ -6,13 +6,13 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-ri-spi</artifactId>
+ <artifactId>webbeans-spi</artifactId>
<name>Web Beans Service Provider Interfaces</name>
<dependencies>
<dependency>
<groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-api</artifactId>
+ <artifactId>jsr299-api</artifactId>
</dependency>
<dependency>