1:27 p.m.
Author: pete.muir(a)jboss.org
Date: 2009-03-28 14:27:43 -0400 (Sat, 28 Mar 2009)
New Revision: 2251
Added:
ri/trunk/dist/versions.properties
Modified:
ri/trunk/dist/build.xml
ri/trunk/dist/readme.txt
Log:
include webbeans-tomcat in the dist
Modified: ri/trunk/dist/build.xml
===================================================================
--- ri/trunk/dist/build.xml 2009-03-28 17:13:22 UTC (rev 2250)
+++ ri/trunk/dist/build.xml 2009-03-28 18:27:43 UTC (rev 2251)
@@ -13,9 +13,9 @@
<property name="dist.wb.lib.dir" value="${dist.dir}/lib/webbeans"
/>
<property name="dist.doc.dir" value="${dist.dir}/doc" />
<property name="dist.apidocs.dir" value="${dist.dir}/doc/apidocs"
/>
- <property name="dist.src.dir" value="${dist.dir}/src" />
- <property name="dist.src.doc.dir"
value="${dist.src.dir}/reference" />
+ <property file="versions.properties" />
+
<target name="dist" description="Build the distribution">
<fail unless="version" message="You must specify the version with
-Dversion=1.2.3" />
@@ -30,29 +30,6 @@
<delete dir="${wbri.dir}/impl/ObjectStore" />
<delete dir="${dist.dir}" failonerror="false"/>
<mkdir dir="${dist.dir}"/>
-
- <mkdir dir="${dist.src.dir}" />
-
- <copy todir="${dist.src.dir}">
- <fileset dir="${wbri.dir}">
- <include name="impl/**" />
- <include name="spi/**" />
- <include name="api/**" />
- <include name="pom.xml" />
- <exclude name="**/.settings/**" />
- <exclude name="**/.classpath" />
- <exclude name="**/.project" />
- </fileset>
- </copy>
-
- <copy todir="${dist.src.doc.dir}">
- <fileset dir="${refdoc.dir}">
- <exclude name="**/.settings/**" />
- <exclude name="**/.classpath" />
- <exclude name="**/.project" />
- <exclude name="**/*.pdf" />
- </fileset>
- </copy>
<copy todir="${dist.dir}">
<fileset dir="${wbri.dir}">
@@ -85,9 +62,12 @@
<maven target="clean" basedir="${refdoc.dir}" />
<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-core" version="${version}"/>
<dependency groupId="org.jboss.webbeans"
artifactId="webbeans-spi" version="${version}"/>
+ <dependency groupId="org.jboss.webbeans.tomcat"
artifactId="webbeans-tomcat"
version="${webbeans.tomcat.version}"/>
+ <dependency groupId="org.jboss.webbeans.tomcat"
artifactId="webbeans-tomcat-int"
version="${webbeans.tomcat.version}"/>
<dependency groupId="org.jboss.webbeans"
artifactId="jsr299-api" version="${version}"/>
<remoteRepository id="repository.jboss.org"
url="http://repository.jboss.org/maven2" />
</artifact:dependencies>
@@ -108,6 +88,7 @@
<unzip dest="${dist.apidocs.dir}">
<fileset dir="target">
<include name="jsr299-api-javadoc.jar"/>
+ <include name="webbeans-api-javadoc.jar"/>
</fileset>
</unzip>
@@ -116,8 +97,7 @@
<copy todir="${dist.wb.lib.dir}">
<fileset dir="target">
<include name="webbeans-*.jar" />
- <include name="jsr299-api.jar" />
- <include name="google-collections.jar" />
+ <include name="jsr299-api*.jar" />
</fileset>
</copy>
<delete dir="target" failonerror="false"/>
Modified: ri/trunk/dist/readme.txt
===================================================================
--- ri/trunk/dist/readme.txt 2009-03-28 17:13:22 UTC (rev 2250)
+++ ri/trunk/dist/readme.txt 2009-03-28 18:27:43 UTC (rev 2251)
@@ -5,18 +5,9 @@
dependency injection and contextual lifecycle management. Web Beans is the
reference implementation of JSR-299.
-This distribution, as a whole, is licensed under the terms of the FSF Lesser Gnu
-Public License (see lgpl.txt). Parts of it are licensed under the Apache Public
-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:
+This distribution, as a whole, is licensed under the terms of the Apache Public
+License (see apl.txt).
-* 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:
doc/
@@ -32,11 +23,7 @@
There are more details in the reference guide
lib/
- -- Libraries for building the examples
+ -- Libraries, for building the examples
lib/webbeans
- -- The Web Beans and API jars, for use outside of JBoss AS
-
-src/
- -- The sources of Web Beans, including src/api, src/impl and
- src/reference. To build the sources, just type mvn in the subdirectory.
+ -- Web Beans binary, source and javadoc jars
Added: ri/trunk/dist/versions.properties
===================================================================
--- ri/trunk/dist/versions.properties (rev 0)
+++ ri/trunk/dist/versions.properties 2009-03-28 18:27:43 UTC (rev 2251)
@@ -0,0 +1,2 @@
+webbeans.tomcat.version=1.0.0-SNAPSHOT
+webbeans.logger.version=1.0.0-SNAPSHOT