Author: dan.j.allen Date: 2009-05-24 23:27:14 -0400 (Sun, 24 May 2009) New Revision: 10960 Added: branches/community/Seam_2_1/examples/metawidget/booking/resources/META-INF/jboss-app.xml branches/community/Seam_2_1/examples/metawidget/dvdstore/resources/META-INF/jboss-app.xml branches/community/Seam_2_1/examples/metawidget/groovybooking/resources/WEB-INF/jboss-web.xml Modified: branches/community/Seam_2_1/examples/metawidget/booking/build.xml branches/community/Seam_2_1/examples/metawidget/booking/resources/META-INF/application.xml branches/community/Seam_2_1/examples/metawidget/dvdstore/build.xml branches/community/Seam_2_1/examples/metawidget/dvdstore/resources/META-INF/application.xml branches/community/Seam_2_1/examples/metawidget/groovybooking/build.xml Log: introduce jboss-*.xml files so classloaders don't conflict with those from original examples fix Groovy compilation problem on explode in metawidget-groovybooking rename ds files Modified: branches/community/Seam_2_1/examples/metawidget/booking/build.xml =================================================================== --- branches/community/Seam_2_1/examples/metawidget/booking/build.xml 2009-05-25 02:34:03 UTC (rev 10959) +++ branches/community/Seam_2_1/examples/metawidget/booking/build.xml 2009-05-25 03:27:14 UTC (rev 10960) @@ -3,7 +3,7 @@ <!-- Naming --> <property name="Name" value="Seam Metawidget Booking Example"/> - <property name="example.name" value="jboss-seam-metawidget-booking"/> + <property name="example.name" value="seam-metawidget-booking"/> <property file="${basedir}/build.properties" /> @@ -23,7 +23,7 @@ <property name="metawidget-ear.lib" value="yes"/> <!-- Datasource --> - <property name="example.ds" value="jboss-seam-metawidget-booking-ds.xml"/> + <property name="example.ds" value="seam-metawidget-booking-ds.xml"/> <target name="init" depends="stage"> <antcall target="SeamExample.init"/> Modified: branches/community/Seam_2_1/examples/metawidget/booking/resources/META-INF/application.xml =================================================================== --- branches/community/Seam_2_1/examples/metawidget/booking/resources/META-INF/application.xml 2009-05-25 02:34:03 UTC (rev 10959) +++ branches/community/Seam_2_1/examples/metawidget/booking/resources/META-INF/application.xml 2009-05-25 03:27:14 UTC (rev 10960) @@ -8,13 +8,13 @@ <module> <web> - <web-uri>jboss-seam-metawidget-booking.war</web-uri> + <web-uri>seam-metawidget-booking.war</web-uri> <context-root>/seam-metawidget-booking</context-root> </web> </module> <module> - <ejb>jboss-seam-metawidget-booking.jar</ejb> + <ejb>seam-metawidget-booking.jar</ejb> </module> <module> Added: branches/community/Seam_2_1/examples/metawidget/booking/resources/META-INF/jboss-app.xml =================================================================== --- branches/community/Seam_2_1/examples/metawidget/booking/resources/META-INF/jboss-app.xml (rev 0) +++ branches/community/Seam_2_1/examples/metawidget/booking/resources/META-INF/jboss-app.xml 2009-05-25 03:27:14 UTC (rev 10960) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE jboss-app PUBLIC "-//JBoss//DTD J2EE Application 4.2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-app_4_2.dtd"> +<jboss-app> + <loader-repository> + seam.jboss.org:loader=seam-metawidget-booking + </loader-repository> +</jboss-app> Modified: branches/community/Seam_2_1/examples/metawidget/dvdstore/build.xml =================================================================== --- branches/community/Seam_2_1/examples/metawidget/dvdstore/build.xml 2009-05-25 02:34:03 UTC (rev 10959) +++ branches/community/Seam_2_1/examples/metawidget/dvdstore/build.xml 2009-05-25 03:27:14 UTC (rev 10960) @@ -3,7 +3,7 @@ <!-- Naming --> <property name="Name" value="Seam DVD Store Example"/> - <property name="example.name" value="jboss-seam-metawidget-dvdstore"/> + <property name="example.name" value="seam-metawidget-dvdstore"/> <property file="${basedir}/build.properties" /> @@ -25,7 +25,7 @@ <property name="metawidget-ear.lib" value="yes"/> <!-- Datasource --> - <property name="example.ds" value="jboss-seam-metawidget-dvdstore-ds.xml"/> + <property name="example.ds" value="seam-metawidget-dvdstore-ds.xml"/> <target name="init" depends="stage"> <antcall target="SeamExample.init"/> Modified: branches/community/Seam_2_1/examples/metawidget/dvdstore/resources/META-INF/application.xml =================================================================== --- branches/community/Seam_2_1/examples/metawidget/dvdstore/resources/META-INF/application.xml 2009-05-25 02:34:03 UTC (rev 10959) +++ branches/community/Seam_2_1/examples/metawidget/dvdstore/resources/META-INF/application.xml 2009-05-25 03:27:14 UTC (rev 10960) @@ -7,17 +7,17 @@ <display-name>Metawidget DVD Store</display-name> <module> - <ejb>jboss-seam-metawidget-dvdstore.jar</ejb> - </module> - - <module> <web> - <web-uri>jboss-seam-metawidget-dvdstore.war</web-uri> + <web-uri>seam-metawidget-dvdstore.war</web-uri> <context-root>/seam-metawidget-dvdstore</context-root> </web> </module> <module> + <ejb>seam-metawidget-dvdstore.jar</ejb> + </module> + + <module> <ejb>jboss-seam.jar</ejb> </module> Added: branches/community/Seam_2_1/examples/metawidget/dvdstore/resources/META-INF/jboss-app.xml =================================================================== --- branches/community/Seam_2_1/examples/metawidget/dvdstore/resources/META-INF/jboss-app.xml (rev 0) +++ branches/community/Seam_2_1/examples/metawidget/dvdstore/resources/META-INF/jboss-app.xml 2009-05-25 03:27:14 UTC (rev 10960) @@ -0,0 +1,7 @@ +<!DOCTYPE jboss-app PUBLIC "-//JBoss//DTD J2EE Application 4.2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-app_4_2.dtd"> +<jboss-app> + <loader-repository> + seam.jboss.org:loader=seam-metawidget-dvdstore + </loader-repository> +</jboss-app> Modified: branches/community/Seam_2_1/examples/metawidget/groovybooking/build.xml =================================================================== --- branches/community/Seam_2_1/examples/metawidget/groovybooking/build.xml 2009-05-25 02:34:03 UTC (rev 10959) +++ branches/community/Seam_2_1/examples/metawidget/groovybooking/build.xml 2009-05-25 03:27:14 UTC (rev 10960) @@ -3,7 +3,7 @@ <!-- Naming --> <property name="Name" value="Seam Metawidget Groovy Booking Example"/> - <property name="example.name" value="jboss-seam-metawidget-groovybooking"/> + <property name="example.name" value="seam-metawidget-groovybooking"/> <property file="${basedir}/build.properties" /> @@ -115,6 +115,12 @@ </target> <target name="compilemodel" depends="groovy.init"> + <!-- We have to delete, otherwise Groovy fails to compile for some reason when files already exist in destination --> + <delete> + <fileset dir="${classes.model.dir}"> + <include name="**/*.class"/> + </fileset> + </delete> <groovyc classpathref="build.classpath" destdir="${classes.model.dir}" srcdir="${src.model.dir}" /> </target> Added: branches/community/Seam_2_1/examples/metawidget/groovybooking/resources/WEB-INF/jboss-web.xml =================================================================== --- branches/community/Seam_2_1/examples/metawidget/groovybooking/resources/WEB-INF/jboss-web.xml (rev 0) +++ branches/community/Seam_2_1/examples/metawidget/groovybooking/resources/WEB-INF/jboss-web.xml 2009-05-25 03:27:14 UTC (rev 10960) @@ -0,0 +1,10 @@ +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 4.2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> +<jboss-web> + <class-loading java2ClassLoadingCompliance="false"> + <loader-repository> + seam.jboss.org:loader=seam-metawidget-groovybooking + <loader-repository-config>java2ParentDelegation=false</loader-repository-config> + </loader-repository> + </class-loading> +</jboss-web>