[seam-commits] Seam SVN: r10229 - in trunk/examples: metawidget and 3 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Sun Mar 29 17:14:00 EDT 2009
Author: dan.j.allen
Date: 2009-03-29 17:13:59 -0400 (Sun, 29 Mar 2009)
New Revision: 10229
Removed:
trunk/examples/metawidget/metawidget-backend.jar
trunk/examples/metawidget/metawidget-frontend.jar
trunk/examples/metawidget/metawidget.jar
Modified:
trunk/examples/build.xml
trunk/examples/metawidget/booking/build.xml
trunk/examples/metawidget/booking/readme.txt
trunk/examples/metawidget/dvdstore/build.xml
trunk/examples/metawidget/dvdstore/readme.txt
trunk/examples/metawidget/groovybooking/build.xml
trunk/examples/metawidget/groovybooking/readme.txt
Log:
fetch metawidget JAR files from JBoss Maven 2 repository
automatically call the stage target on each build (merges overrides with original source)
Modified: trunk/examples/build.xml
===================================================================
--- trunk/examples/build.xml 2009-03-29 19:33:08 UTC (rev 10228)
+++ trunk/examples/build.xml 2009-03-29 21:13:59 UTC (rev 10229)
@@ -377,7 +377,21 @@
<fileset id="trinidad-impl.jar" dir="${lib.dir}">
<include name="trinidad-impl.jar" if="trinidad.lib" />
</fileset>
+
+ <!-- Dependencies for Metawidget -->
+ <fileset id="metawidget.jar" dir="${lib.dir}">
+ <include name="metawidget.jar" if="metawidget-war.lib" />
+ </fileset>
+
+ <fileset id="metawidget-frontend.jar" dir="${lib.dir}">
+ <include name="metawidget-frontend.jar" if="metawidget-ear.lib" />
+ </fileset>
+
+ <fileset id="metawidget-backend.jar" dir="${lib.dir}">
+ <include name="metawidget-backend.jar" if="metawidget-ear.lib" />
+ </fileset>
+
<!-- Dependencies if el-ri is needed -->
<fileset id="el-ri.jar" dir="${lib.dir}">
@@ -560,7 +574,22 @@
<mkdir dir="${dist.dir}" />
</target>
- <target name="copyextradependencies" depends="gettrinidad, getelri"/>
+ <target name="copyextradependencies" depends="gettrinidad, getmetawidget, getelri"/>
+
+ <target name="getmetawidget" depends="getmetawidget-war,getmetawidget-ear"/>
+
+ <target name="getmetawidget-war" if="metawidget-war.lib">
+ <copyInlineDependencies id="metawidget" scope="runtime" todir="${lib.dir}">
+ <dependency groupId="org.metawidget" artifactId="metawidget" version="0.7"/>
+ </copyInlineDependencies>
+ </target>
+
+ <target name="getmetawidget-ear" if="metawidget-ear.lib">
+ <copyInlineDependencies id="metawidget" scope="runtime" todir="${lib.dir}">
+ <dependency groupId="org.metawidget" artifactId="metawidget-frontend" version="0.7"/>
+ <dependency groupId="org.metawidget" artifactId="metawidget-backend" version="0.7"/>
+ </copyInlineDependencies>
+ </target>
<target name="gettrinidad" if="trinidad.lib">
<copyInlineDependencies id="trinidad" scope="runtime" todir="${lib.dir}">
@@ -640,6 +669,7 @@
<fileset refid="urlrewrite.jar" />
<fileset refid="richfaces-impl.jar" />
<fileset refid="trinidad-impl.jar" />
+ <fileset refid="metawidget-frontend.jar" />
<fileset refid="jboss-common-core.jar" />
<fileset refid="war.lib.extras" />
<fileset refid="tomcat-standard-tag.jar" />
@@ -721,6 +751,7 @@
<fileset refid="seam.remoting.jar" />
<fileset refid="el-ri.jar" />
<fileset refid="trinidad-api.jar" />
+ <fileset refid="metawidget-backend.jar" />
<fileset refid="jboss-common-core.jar" />
<fileset refid="openid.jar" />
<mapper type="flatten" />
@@ -972,6 +1003,7 @@
<fileset refid="seam.wicket.jar" />
<fileset refid="seam.resteasy.jar" />
<fileset refid="trinidad-api.jar" />
+ <fileset refid="metawidget.jar" />
<fileset refid="el-ri.jar"/>
<mapper type="flatten" />
</copy>
Modified: trunk/examples/metawidget/booking/build.xml
===================================================================
--- trunk/examples/metawidget/booking/build.xml 2009-03-29 19:33:08 UTC (rev 10228)
+++ trunk/examples/metawidget/booking/build.xml 2009-03-29 21:13:59 UTC (rev 10229)
@@ -20,13 +20,17 @@
<property name="seam.debug.lib" value="yes"/>
<property name="facelets.lib" value="yes"/>
<property name="richfaces.lib" value="yes"/>
- <!--<property name="metawidget-ear.lib" value="yes"/>-->
+ <property name="metawidget-ear.lib" value="yes"/>
<!-- Datasource -->
<property name="example.ds" value="jboss-seam-metawidget-booking-ds.xml"/>
- <target name="build">
+ <target name="init" depends="stage">
+ <antcall target="SeamExample.init"/>
+ </target>
+ <target name="stage">
+
<!-- Copy the original Seam booking example -->
<copy todir="${staging.dir}">
<fileset dir="${seam.dir}/examples/booking">
@@ -50,6 +54,9 @@
<import file="${basedir}/../../build.xml"/>
+ <!-- Enable the following overrides if you want to use your own JAR metawidget JAR files -->
+ <!-- Don't forget to set <property name="metawidget-ear.lib" value="no" above -->
+ <!--
<path id="build.classpath.extras">
<fileset dir="${basedir}/..">
<include name="metawidget.jar"/>
@@ -63,5 +70,6 @@
<fileset id="war.lib.extras" dir="${basedir}/..">
<include name="metawidget-frontend.jar"/>
</fileset>
+ -->
</project>
Modified: trunk/examples/metawidget/booking/readme.txt
===================================================================
--- trunk/examples/metawidget/booking/readme.txt 2009-03-29 19:33:08 UTC (rev 10228)
+++ trunk/examples/metawidget/booking/readme.txt 2009-03-29 21:13:59 UTC (rev 10229)
@@ -6,11 +6,11 @@
Forms are layed out using Metawidget.
The source files in this example are just the overrides needed to utilize
-metawidget. Before you can deploy the example, you have to merge these
-overrides with the original groovybooking source code in a staging directory.
-That is done using the following command:
+metawidget. Before the example is built, these overrides are merged with the
+original booking source code in a staging directory. This step is performed
+by following command, which is automatically called on any Ant build:
- ant build
+ ant stage
This example runs on JBoss AS as an EAR or Tomcat with JBoss Embedded as a WAR.
Modified: trunk/examples/metawidget/dvdstore/build.xml
===================================================================
--- trunk/examples/metawidget/dvdstore/build.xml 2009-03-29 19:33:08 UTC (rev 10228)
+++ trunk/examples/metawidget/dvdstore/build.xml 2009-03-29 21:13:59 UTC (rev 10229)
@@ -22,13 +22,17 @@
<property name="jbpm.lib" value="yes"/>
<property name="search.lib" value="yes"/>
<property name="urlrewrite.lib" value="yes"/>
- <!--<property name="metawidget-ear.lib" value="yes"/>-->
+ <property name="metawidget-ear.lib" value="yes"/>
<!-- Datasource -->
<property name="example.ds" value="jboss-seam-metawidget-dvdstore-ds.xml"/>
- <target name="build">
+ <target name="init" depends="stage">
+ <antcall target="SeamExample.init"/>
+ </target>
+ <target name="stage">
+
<!-- Copy the original Seam booking example -->
<copy todir="${staging.dir}">
<fileset dir="${seam.dir}/examples/dvdstore">
@@ -52,6 +56,9 @@
<import file="${basedir}/../../build.xml"/>
+ <!-- Enable the following overrides if you want to use your own JAR metawidget JAR files -->
+ <!-- Don't forget to set <property name="metawidget-ear.lib" value="no" above -->
+ <!--
<path id="build.classpath.extras">
<fileset dir="${basedir}/..">
<include name="metawidget.jar"/>
@@ -65,5 +72,6 @@
<fileset id="war.lib.extras" dir="${basedir}/..">
<include name="metawidget-frontend.jar"/>
</fileset>
+ -->
</project>
Modified: trunk/examples/metawidget/dvdstore/readme.txt
===================================================================
--- trunk/examples/metawidget/dvdstore/readme.txt 2009-03-29 19:33:08 UTC (rev 10228)
+++ trunk/examples/metawidget/dvdstore/readme.txt 2009-03-29 21:13:59 UTC (rev 10229)
@@ -8,8 +8,8 @@
example.name=dvdstore
The source files in this example are just the overrides needed to utilize
-metawidget. Before you can deploy the example, you have to merge these
-overrides with the original groovybooking source code in a staging directory.
-That is done using the following command:
+metawidget. Before the example is built, these overrides are merged with the
+original dvdstore source code in a staging directory. This step is performed
+by following command, which is automatically called on any Ant build:
- ant build
+ ant stage
Modified: trunk/examples/metawidget/groovybooking/build.xml
===================================================================
--- trunk/examples/metawidget/groovybooking/build.xml 2009-03-29 19:33:08 UTC (rev 10228)
+++ trunk/examples/metawidget/groovybooking/build.xml 2009-03-29 21:13:59 UTC (rev 10229)
@@ -22,16 +22,20 @@
<property name="seam.debug.lib" value="yes"/>
<property name="facelets.lib" value="yes"/>
<property name="richfaces.lib" value="yes"/>
- <property name="groovy.lib" value="yes" />
- <!--<property name="metawidget-war.lib" value="yes" />-->
+ <property name="groovy.lib" value="yes"/>
+ <property name="metawidget-war.lib" value="yes"/>
<property name="profile" value="dev" />
<!-- Datasource -->
<property name="example.ds" value="metawidget-groovybooking-${profile}-ds.xml"/>
- <target name="build">
+ <target name="init" depends="stage">
+ <antcall target="SeamExample.init"/>
+ </target>
+ <target name="stage">
+
<!-- Copy the original Seam booking example -->
<copy todir="${staging.dir}">
<fileset dir="${seam.dir}/examples/groovybooking">
@@ -56,6 +60,9 @@
<import file="${basedir}/../../build.xml"/>
+ <!-- Enable the following overrides if you want to use your own JAR metawidget JAR files -->
+ <!-- Don't forget to set <property name="metawidget-war.lib" value="no" above -->
+ <!--
<path id="build.classpath.extras">
<fileset dir="${basedir}/..">
<include name="metawidget.jar"/>
@@ -65,6 +72,7 @@
<fileset id="war.lib.extras" dir="${basedir}/..">
<include name="metawidget.jar"/>
</fileset>
+ -->
<!-- remaining configuration copied from ../../groovybooking/build.xml -->
<target name="explode">
Modified: trunk/examples/metawidget/groovybooking/readme.txt
===================================================================
--- trunk/examples/metawidget/groovybooking/readme.txt 2009-03-29 19:33:08 UTC (rev 10228)
+++ trunk/examples/metawidget/groovybooking/readme.txt 2009-03-29 21:13:59 UTC (rev 10229)
@@ -11,11 +11,11 @@
in build.properties when deploying to JBoss AS 5.
The source files in this example are just the overrides needed to utilize
-metawidget. Before you can deploy the example, you have to merge these
-overrides with the original groovybooking source code in a staging directory.
-That is done using the following command:
+metawidget. Before the example is built, these overrides are merged with the
+original groovybooking source code in a staging directory. This step is performed
+by following command, which is automatically called on any Ant build:
- ant build
+ ant stage
When editing Groovy files from the src/action directory, you can run "ant
build jbosswar.explode" to see your changes take effect. When editing Groovy files
Deleted: trunk/examples/metawidget/metawidget-backend.jar
===================================================================
(Binary files differ)
Deleted: trunk/examples/metawidget/metawidget-frontend.jar
===================================================================
(Binary files differ)
Deleted: trunk/examples/metawidget/metawidget.jar
===================================================================
(Binary files differ)
More information about the seam-commits
mailing list