[webbeans-commits] Webbeans SVN: r716 - ri/trunk/dist.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-24 12:44:08 -0500 (Wed, 24 Dec 2008)
New Revision: 716
Modified:
ri/trunk/dist/build.xml
ri/trunk/dist/release-process.txt
Log:
fix release process
Modified: ri/trunk/dist/build.xml
===================================================================
--- ri/trunk/dist/build.xml 2008-12-24 17:41:32 UTC (rev 715)
+++ ri/trunk/dist/build.xml 2008-12-24 17:44:08 UTC (rev 716)
@@ -58,6 +58,9 @@
<include name="lib/**"/>
<include name="readme.txt"/>
</fileset>
+ <fileset dir="${basedir}">
+ <include name="readme.txt"/>
+ </fileset>
<fileset dir="${examples.dir}" />
</copy>
Modified: ri/trunk/dist/release-process.txt
===================================================================
--- ri/trunk/dist/release-process.txt 2008-12-24 17:41:32 UTC (rev 715)
+++ ri/trunk/dist/release-process.txt 2008-12-24 17:44:08 UTC (rev 716)
@@ -4,8 +4,9 @@
* Run the testsuite and examples
* Tag using mvn release:prepare in the ri/trunk checkout
* Tag docs using mvn release:prepare in the doc/trunk/reference checkout
-* Check the tag
-* Build the maven artifacts using release:perform in both locations
+* Tag examples using mvn release:prepare in the examples/trunk checkout
+* Check the tags
+* Build the maven artifacts using release:perform in all locations
* Verify the checkout of the tag
* Release the webbeans-ri-int for jbossas if necessary
* Edit the checkout of the tag, and alter the versions in jboss-as/build.properties to released versions
15 years, 3 months
[webbeans-commits] Webbeans SVN: r715 - ri/trunk/dist.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-24 12:41:32 -0500 (Wed, 24 Dec 2008)
New Revision: 715
Modified:
ri/trunk/dist/build.xml
Log:
small fix to dist script
Modified: ri/trunk/dist/build.xml
===================================================================
--- ri/trunk/dist/build.xml 2008-12-24 17:35:02 UTC (rev 714)
+++ ri/trunk/dist/build.xml 2008-12-24 17:41:32 UTC (rev 715)
@@ -61,7 +61,9 @@
<fileset dir="${examples.dir}" />
</copy>
- <maven target="package" basedir="${refdoc.dir}" />
+ <maven target="package" basedir="${refdoc.dir}">
+ <arg line="-Dbuild.translations" />
+ </maven>
<mkdir dir="${dist.doc.dir}" />
<copy todir="${dist.doc.dir}">
<fileset dir="${refdoc.dir}/target/docbook/publish" />
15 years, 3 months
[webbeans-commits] Webbeans SVN: r714 - in ri/trunk: dist and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-24 12:35:02 -0500 (Wed, 24 Dec 2008)
New Revision: 714
Added:
ri/trunk/dist/readme.txt
Removed:
ri/trunk/examples/
ri/trunk/readme.txt
Modified:
ri/trunk/dist/build.xml
Log:
adapt for moving examples
Modified: ri/trunk/dist/build.xml
===================================================================
--- ri/trunk/dist/build.xml 2008-12-24 17:28:58 UTC (rev 713)
+++ ri/trunk/dist/build.xml 2008-12-24 17:35:02 UTC (rev 714)
@@ -15,11 +15,11 @@
<property name="dist.src.dir" value="${dist.dir}/src" />
<property name="dist.src.doc.dir" value="${dist.src.dir}/reference" />
- <property name="refdoc.dir" value="${wbri.dir}/reference-guide" />
-
<target name="dist" description="Build the distribution">
<fail unless="version" message="You must specify the version with -Dversion=1.2.3" />
+ <fail unless="refdoc.dir" message="You must specify the reference docs directory with -Drefdoc.dir=~/workspace/wb/reference" />
+ <fail unless="examples.dir" message="You must specify the examples directory with -Dexmaples.dir=~/workspace/wb/examples" />
<maven target="clean" basedir="${wbri.dir}" />
<maven target="clean" basedir="${refdoc.dir}" />
@@ -54,11 +54,11 @@
<copy todir="${dist.dir}">
<fileset dir="${wbri.dir}">
- <include name="examples/**"/>
<include name="jboss-as/**"/>
<include name="lib/**"/>
<include name="readme.txt"/>
</fileset>
+ <fileset dir="${examples.dir}" />
</copy>
<maven target="package" basedir="${refdoc.dir}" />
Copied: ri/trunk/dist/readme.txt (from rev 713, ri/trunk/readme.txt)
===================================================================
--- ri/trunk/dist/readme.txt (rev 0)
+++ ri/trunk/dist/readme.txt 2008-12-24 17:35:02 UTC (rev 714)
@@ -0,0 +1,27 @@
+Web Beans RI
+------------
+
+This distribution consists of:
+
+doc/
+ -- The Web Beans Reference guide, take a look at doc/en/html/index.html for
+ getting started using Web Beans and the Web Beans RI
+
+examples/
+ -- The Web Beans RI examples, the examples are described in more detail in
+ the reference guide
+
+jboss-as/
+ -- Installer for JBoss AS, change into this directory, and run ant update
+ There are more details in the reference guide
+
+lib/
+ -- Libraries for building the examples
+
+lib/webbeans
+ -- The Web Beans RI and API jars, for use outside of JBoss AS
+
+src/
+ -- The sources of the Web Beans RI, including src/webbeans-api,
+ src/webbeans-ri and src/reference. To build the sources, just type mvn in
+ the subdirectory.
Deleted: ri/trunk/readme.txt
===================================================================
--- ri/trunk/readme.txt 2008-12-24 17:28:58 UTC (rev 713)
+++ ri/trunk/readme.txt 2008-12-24 17:35:02 UTC (rev 714)
@@ -1,27 +0,0 @@
-Web Beans RI
-------------
-
-This distribution consists of:
-
-doc/
- -- The Web Beans Reference guide, take a look at doc/en/html/index.html for
- getting started using Web Beans and the Web Beans RI
-
-examples/
- -- The Web Beans RI examples, the examples are described in more detail in
- the reference guide
-
-jboss-as/
- -- Installer for JBoss AS, change into this directory, and run ant update
- There are more details in the reference guide
-
-lib/
- -- Libraries for building the examples
-
-lib/webbeans
- -- The Web Beans RI and API jars, for use outside of JBoss AS
-
-src/
- -- The sources of the Web Beans RI, including src/webbeans-api,
- src/webbeans-ri and src/reference. To build the sources, just type mvn in
- the subdirectory.
15 years, 3 months
[webbeans-commits] Webbeans SVN: r713 - ri/trunk/examples and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-24 12:28:58 -0500 (Wed, 24 Dec 2008)
New Revision: 713
Added:
examples/trunk/readme.txt
Removed:
ri/trunk/examples/readme.txt
Log:
Move examples to examples project
Copied: examples/trunk/readme.txt (from rev 712, ri/trunk/examples/readme.txt)
===================================================================
--- examples/trunk/readme.txt (rev 0)
+++ examples/trunk/readme.txt 2008-12-24 17:28:58 UTC (rev 713)
@@ -0,0 +1,6 @@
+The Web Beans RI currently comes with a two examples, webbeans-numberguess (a
+war example) and webbeans-translator (an EJB example). Before running the
+examples, you'll need to ensure your server supports Web Beans.
+
+The examples and RI are explained in detail in the reference guide, including
+how to add Web Beans support to JBoss 5.
Deleted: ri/trunk/examples/readme.txt
===================================================================
--- ri/trunk/examples/readme.txt 2008-12-24 17:28:52 UTC (rev 712)
+++ ri/trunk/examples/readme.txt 2008-12-24 17:28:58 UTC (rev 713)
@@ -1,6 +0,0 @@
-The Web Beans RI currently comes with a two examples, webbeans-numberguess (a
-war example) and webbeans-translator (an EJB example). Before running the
-examples, you'll need to ensure your server supports Web Beans.
-
-The examples and RI are explained in detail in the reference guide, including
-how to add Web Beans support to JBoss 5.
15 years, 3 months
[webbeans-commits] Webbeans SVN: r712 - ri/trunk/examples and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-24 12:28:52 -0500 (Wed, 24 Dec 2008)
New Revision: 712
Added:
examples/trunk/pom.xml
Removed:
ri/trunk/examples/pom.xml
Log:
Move examples to examples project
Copied: examples/trunk/pom.xml (from rev 711, ri/trunk/examples/pom.xml)
===================================================================
--- examples/trunk/pom.xml (rev 0)
+++ examples/trunk/pom.xml 2008-12-24 17:28:52 UTC (rev 712)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.webbeans.examples</groupId>
+ <artifactId>parent</artifactId>
+ <packaging>pom</packaging>
+ <name>Web Beans Examples</name>
+
+ <description>
+ Examples for the reference implementation of JSR 299: Web Beans
+ </description>
+
+ <modules>
+ <module>numberguess</module>
+ <module>translator</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <warSourceDirectory>${basedir}/WebContent</warSourceDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <configuration>
+ <ejbVersion>3.0</ejbVersion>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </pluginManagement>
+ </build>
+
+</project>
+
Deleted: ri/trunk/examples/pom.xml
===================================================================
--- ri/trunk/examples/pom.xml 2008-12-24 17:28:46 UTC (rev 711)
+++ ri/trunk/examples/pom.xml 2008-12-24 17:28:52 UTC (rev 712)
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
- <groupId>org.jboss.webbeans.examples</groupId>
- <artifactId>parent</artifactId>
- <packaging>pom</packaging>
- <name>Web Beans Examples</name>
-
- <description>
- Examples for the reference implementation of JSR 299: Web Beans
- </description>
-
- <modules>
- <module>numberguess</module>
- <module>translator</module>
- </modules>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <warSourceDirectory>${basedir}/WebContent</warSourceDirectory>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- <configuration>
- <ejbVersion>3.0</ejbVersion>
- </configuration>
- </plugin>
- </plugins>
-
- </pluginManagement>
- </build>
-
-</project>
-
15 years, 3 months
[webbeans-commits] Webbeans SVN: r711 - ri/trunk/examples and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-24 12:28:46 -0500 (Wed, 24 Dec 2008)
New Revision: 711
Added:
examples/trunk/build.xml
Removed:
ri/trunk/examples/build.xml
Log:
Move examples to examples project
Copied: examples/trunk/build.xml (from rev 710, ri/trunk/examples/build.xml)
===================================================================
--- examples/trunk/build.xml (rev 0)
+++ examples/trunk/build.xml 2008-12-24 17:28:46 UTC (rev 711)
@@ -0,0 +1,88 @@
+<project basedir="." name="example.build.script" default="restart">
+
+ <dirname property="wbri.dir" file="${ant.file.example.build.script}/../" />
+
+ <property name="maven.dir" location="${wbri.dir}/lib/maven" />
+
+ <property file="${wbri.dir}/jboss-as/build.properties"/>
+
+ <property name="final.url" value="http://localhost:8080/${example.name}" />
+
+ <property name="type" value="war" />
+
+ <condition property="war">
+ <equals arg1="${type}" arg2="war"/>
+ </condition>
+ <condition property="ear">
+ <equals arg1="${type}" arg2="ear"/>
+ </condition>
+
+ <condition property="artifact.target.dir" value="${basedir}/target">
+ <equals arg1="${type}" arg2="war"/>
+ </condition>
+ <condition property="artifact.target.dir" value="${basedir}/${example.name}-ear/target">
+ <equals arg1="${type}" arg2="ear"/>
+ </condition>
+
+ <property name="artifact.dir" value="${artifact.target.dir}/${example.name}" />
+
+ <target name="package">
+ <maven target="package" basedir="${basedir}"/>
+ </target>
+
+ <target name="explode" depends="package">
+ <mkdir dir="${jboss.home}/server/default/deploy/${example.name}.${type}"/>
+ <copy todir="${jboss.home}/server/default/deploy/${example.name}.${type}">
+ <fileset dir="${artifact.dir}" />
+ </copy>
+ </target>
+
+ <target name="deploy" depends="package">
+ <copy todir="${jboss.home}/server/default/deploy/" file="${artifact.target.dir}/${example.name}.${type}"/>
+ <echo message="The app can be accessed at ${final.url}" />
+ </target>
+
+ <target name="clean">
+ <maven target="clean" basedir="${basedir}"/>
+ </target>
+
+ <target name="restart.war" depends="explode" if="war">
+ <touch file="${jboss.home}/server/default/deploy/${example.name}.war/WEB-INF/web.xml" />
+ </target>
+
+ <target name="restart.ear" depends="explode" if="ear">
+ <touch file="${jboss.home}/server/default/deploy/${example.name}.ear/META-INF/application.xml" />
+ </target>
+
+ <target name="restart" depends="restart.war, restart.ear">
+ <echo message="The app can be accessed at ${final.url}" />
+ </target>
+
+ <target name="undeploy">
+ <delete dir="${jboss.home}/server/default/deploy/${example.name}.${type}" failonerror="false" />
+ <delete file="${jboss.home}/server/default/deploy/${example.name}.${type}" failonerror="false" />
+ </target>
+
+ <macrodef name="maven">
+ <attribute name="target" />
+ <attribute name="basedir" />
+ <element name="args" implicit="true" optional="true" />
+ <sequential>
+ <java classname="org.codehaus.classworlds.Launcher" fork="true" dir="@{basedir}" failonerror="true">
+ <classpath>
+ <fileset dir="${maven.dir}/boot">
+ <include name="*.jar" />
+ </fileset>
+ <fileset dir="${maven.dir}/bin">
+ <include name="*.*" />
+ </fileset>
+ </classpath>
+ <sysproperty key="classworlds.conf" value="${maven.dir}/bin/m2.conf" />
+ <sysproperty key="maven.home" value="${maven.dir}" />
+ <args />
+ <arg line="@{target}" />
+ </java>
+ </sequential>
+ </macrodef>
+
+</project>
Deleted: ri/trunk/examples/build.xml
===================================================================
--- ri/trunk/examples/build.xml 2008-12-24 17:28:40 UTC (rev 710)
+++ ri/trunk/examples/build.xml 2008-12-24 17:28:46 UTC (rev 711)
@@ -1,88 +0,0 @@
-<project basedir="." name="example.build.script" default="restart">
-
- <dirname property="wbri.dir" file="${ant.file.example.build.script}/../" />
-
- <property name="maven.dir" location="${wbri.dir}/lib/maven" />
-
- <property file="${wbri.dir}/jboss-as/build.properties"/>
-
- <property name="final.url" value="http://localhost:8080/${example.name}" />
-
- <property name="type" value="war" />
-
- <condition property="war">
- <equals arg1="${type}" arg2="war"/>
- </condition>
- <condition property="ear">
- <equals arg1="${type}" arg2="ear"/>
- </condition>
-
- <condition property="artifact.target.dir" value="${basedir}/target">
- <equals arg1="${type}" arg2="war"/>
- </condition>
- <condition property="artifact.target.dir" value="${basedir}/${example.name}-ear/target">
- <equals arg1="${type}" arg2="ear"/>
- </condition>
-
- <property name="artifact.dir" value="${artifact.target.dir}/${example.name}" />
-
- <target name="package">
- <maven target="package" basedir="${basedir}"/>
- </target>
-
- <target name="explode" depends="package">
- <mkdir dir="${jboss.home}/server/default/deploy/${example.name}.${type}"/>
- <copy todir="${jboss.home}/server/default/deploy/${example.name}.${type}">
- <fileset dir="${artifact.dir}" />
- </copy>
- </target>
-
- <target name="deploy" depends="package">
- <copy todir="${jboss.home}/server/default/deploy/" file="${artifact.target.dir}/${example.name}.${type}"/>
- <echo message="The app can be accessed at ${final.url}" />
- </target>
-
- <target name="clean">
- <maven target="clean" basedir="${basedir}"/>
- </target>
-
- <target name="restart.war" depends="explode" if="war">
- <touch file="${jboss.home}/server/default/deploy/${example.name}.war/WEB-INF/web.xml" />
- </target>
-
- <target name="restart.ear" depends="explode" if="ear">
- <touch file="${jboss.home}/server/default/deploy/${example.name}.ear/META-INF/application.xml" />
- </target>
-
- <target name="restart" depends="restart.war, restart.ear">
- <echo message="The app can be accessed at ${final.url}" />
- </target>
-
- <target name="undeploy">
- <delete dir="${jboss.home}/server/default/deploy/${example.name}.${type}" failonerror="false" />
- <delete file="${jboss.home}/server/default/deploy/${example.name}.${type}" failonerror="false" />
- </target>
-
- <macrodef name="maven">
- <attribute name="target" />
- <attribute name="basedir" />
- <element name="args" implicit="true" optional="true" />
- <sequential>
- <java classname="org.codehaus.classworlds.Launcher" fork="true" dir="@{basedir}" failonerror="true">
- <classpath>
- <fileset dir="${maven.dir}/boot">
- <include name="*.jar" />
- </fileset>
- <fileset dir="${maven.dir}/bin">
- <include name="*.*" />
- </fileset>
- </classpath>
- <sysproperty key="classworlds.conf" value="${maven.dir}/bin/m2.conf" />
- <sysproperty key="maven.home" value="${maven.dir}" />
- <args />
- <arg line="@{target}" />
- </java>
- </sequential>
- </macrodef>
-
-</project>
15 years, 3 months
[webbeans-commits] Webbeans SVN: r710 - ri/trunk/examples and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-24 12:28:40 -0500 (Wed, 24 Dec 2008)
New Revision: 710
Added:
examples/trunk/translator/
Removed:
ri/trunk/examples/translator/
Log:
Move examples to examples project
Copied: examples/trunk/translator (from rev 709, ri/trunk/examples/translator)
15 years, 3 months
[webbeans-commits] Webbeans SVN: r709 - ri/trunk/examples and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-24 12:28:35 -0500 (Wed, 24 Dec 2008)
New Revision: 709
Added:
examples/trunk/numberguess/
Removed:
ri/trunk/examples/numberguess/
Log:
Move examples to examples project
Copied: examples/trunk/numberguess (from rev 708, ri/trunk/examples/numberguess)
15 years, 3 months