October 2008 - seam-commits - Jboss List Archives

Seam SVN: r9426 - in trunk/seam-gen: icefaces/build-scripts and 1 other directory.

by seam-commits＠lists.jboss.org

Author: dan.j.allen Date: 2008-10-25 03:46:55 -0400 (Sat, 25 Oct 2008) New Revision: 9426 Modified: trunk/seam-gen/build-scripts/build.xml trunk/seam-gen/icefaces/build-scripts/build.xml Log: clean up whitespace Modified: trunk/seam-gen/build-scripts/build.xml =================================================================== --- trunk/seam-gen/build-scripts/build.xml 2008-10-25 07:19:58 UTC (rev 9425) +++ trunk/seam-gen/build-scripts/build.xml 2008-10-25 07:46:55 UTC (rev 9426) @@ -1,429 +1,426 @@ <?xml version="1.0"?> <project name="@projectName@" default="deploy" basedir="."> -  - <property file="${basedir}/build.properties" /> +  + <property file="${basedir}/build.properties"/> - <property name="profile" value="dev" /> - <property file="build-${profile}.properties" /> + <property name="profile" value="dev"/> + <property file="build-${profile}.properties"/> -  - <property name="project.name" value="@projectName@"/> - <property name="dist.dir" value="dist" /> - <property name="src.model.dir" value="src/main" /> - <property name="src.action.dir" value="src/hot" /> - <property name="src.test.dir" value="src/test" /> - <property name="lib.dir" value="lib" /> - <property name="endorsed.dir" value="${lib.dir}/endorsed" /> - <property name="ear.dir" value="exploded-archives/${project.name}.ear" /> - <property name="jar.dir" value="exploded-archives/${project.name}.jar" /> - <property name="war.dir" value="exploded-archives/${project.name}.war" /> - <property name="test.dir" value="test-build" /> - <property name="bootstrap.dir" value="${basedir}/bootstrap" /> - <property name="deploy.dir" value="${jboss.home}/server/default/deploy" /> - <property name="ear.deploy.dir" value="${deploy.dir}/${project.name}.ear" /> - <property name="jar.deploy.dir" value="${ear.deploy.dir}/${project.name}.jar" /> - <property name="war.deploy.dir" value="${ear.deploy.dir}/${project.name}.war" /> - <property name="testng.jar" value="${basedir}/lib/testng.jar" /> - <property name="javac.debug" value="true" /> - <property name="javac.deprecation" value="false" /> - <property name="debug" value="false" /> +  + <property name="project.name" value="@projectName@"/> + <property name="dist.dir" value="dist"/> + <property name="src.model.dir" value="src/main"/> + <property name="src.action.dir" value="src/hot"/> + <property name="src.test.dir" value="src/test"/> + <property name="lib.dir" value="lib"/> + <property name="endorsed.dir" value="${lib.dir}/endorsed"/> + <property name="ear.dir" value="exploded-archives/${project.name}.ear"/> + <property name="jar.dir" value="exploded-archives/${project.name}.jar"/> + <property name="war.dir" value="exploded-archives/${project.name}.war"/> + <property name="test.dir" value="test-build"/> + <property name="bootstrap.dir" value="${basedir}/bootstrap"/> + <property name="deploy.dir" value="${jboss.home}/server/default/deploy"/> + <property name="ear.deploy.dir" value="${deploy.dir}/${project.name}.ear"/> + <property name="jar.deploy.dir" value="${ear.deploy.dir}/${project.name}.jar"/> + <property name="war.deploy.dir" value="${ear.deploy.dir}/${project.name}.war"/> + <property name="testng.jar" value="${basedir}/lib/testng.jar"/> + <property name="javac.debug" value="true"/> + <property name="javac.deprecation" value="false"/> + <property name="debug" value="false"/> -  - <property name="validate.resources.dir" value="${basedir}/exploded-archives" /> - <property name="schema.dir" value="${basedir}/exploded-archives/schemas" /> - <property name="src.schema.dir" value="${schema.dir}/org/jboss/seam"/> - <property name="schema.version" value="@schemaVersion@" /> +  + <property name="validate.resources.dir" value="${basedir}/exploded-archives"/> + <property name="schema.dir" value="${basedir}/exploded-archives/schemas"/> + <property name="src.schema.dir" value="${schema.dir}/org/jboss/seam"/> + <property name="schema.version" value="@schemaVersion@"/> - <fileset id="lib" dir="${lib.dir}"> - <include name="*.jar" /> - </fileset> + <fileset id="lib" dir="${lib.dir}"> + <include name="*.jar"/> + </fileset> - <path id="build.classpath"> - <fileset refid="lib" /> - </path> + <path id="build.classpath"> + <fileset refid="lib"/> + </path> - <target name="init" description="Initialize the build"> - <taskdef name="groovyc" - classname ="org.codehaus.groovy.ant.Groovyc" - classpathref="build.classpath"/>  - <mkdir dir="${jar.dir}" /> - <mkdir dir="${ear.dir}" /> - <mkdir dir="${war.dir}" /> - <mkdir dir="${dist.dir}" /> -  - <available property="groovy.present" value="true" file="" searchparents="true"> + <target name="init" description="Initialize the build"> + <taskdef name="groovyc" + classname ="org.codehaus.groovy.ant.Groovyc" + classpathref="build.classpath"/>  + <mkdir dir="${jar.dir}"/> + <mkdir dir="${ear.dir}"/> + <mkdir dir="${war.dir}"/> + <mkdir dir="${dist.dir}"/> +  + <available property="groovy.present" value="true" file="" searchparents="true"> + <filepath> + <fileset dir="${src.action.dir}"> + <include name="**/*.groovy"/> + </fileset> + <fileset dir="${src.model.dir}"> + <include name="**/*.groovy"/> + </fileset> + </filepath> + </available> + <condition property="groovy.test.present" value="true"> + <or> + <isset property="groovy.present"/> + <available file="" searchparents="true"> <filepath> - <fileset dir="${src.action.dir}"> + <fileset dir="${src.test.dir}"> <include name="**/*.groovy"/> </fileset> - <fileset dir="${src.model.dir}"> - <include name="**/*.groovy"/> - </fileset> </filepath> </available> - <condition property="groovy.test.present" value="true"> - <or> - <isset property="groovy.present"/> - <available file="" searchparents="true"> - <filepath> - <fileset dir="${src.test.dir}"> - <include name="**/*.groovy"/> - </fileset> - </filepath> - </available> - </or> - </condition> -  - <condition property="groovy.dynamic" value="true"> - <and> - <isset property="groovy.present"/> - <istrue value="${debug}"/> - </and> - </condition> - <condition property="groovy.static" value="true"> - <and> - <isset property="groovy.present"/> - <isfalse value="${debug}"/> - </and> - </condition> - </target> + </or> + </condition> +  + <condition property="groovy.dynamic" value="true"> + <and> + <isset property="groovy.present"/> + <istrue value="${debug}"/> + </and> + </condition> + <condition property="groovy.static" value="true"> + <and> + <isset property="groovy.present"/> + <isfalse value="${debug}"/> + </and> + </condition> + </target> - <target name="groovy.compile" if="groovy.static"> - <groovyc classpathref="build.classpath" - destdir="${jar.dir}" - srcdir="${src.model.dir}" > - </groovyc> - <path id="groovy.action.classpath"> - <path refid="build.classpath"/> - <dirset dir="${jar.dir}"/> - </path> - <groovyc classpathref="groovy.action.classpath" - destdir="${jar.dir}" - srcdir="${src.action.dir}" > - </groovyc> - </target> + <target name="groovy.compile" if="groovy.static"> + <groovyc classpathref="build.classpath" + destdir="${jar.dir}" + srcdir="${src.model.dir}"> + </groovyc> + <path id="groovy.action.classpath"> + <path refid="build.classpath"/> + <dirset dir="${jar.dir}"/> + </path> + <groovyc classpathref="groovy.action.classpath" + destdir="${jar.dir}" + srcdir="${src.action.dir}"> + </groovyc> + </target> - <target name="groovy.copy" if="groovy.dynamic"> - <copy todir="${jar.dir}"> - <fileset dir="${src.action.dir}"> - <include name="**/*.groovy"/> - </fileset> - </copy> - </target> + <target name="groovy.copy" if="groovy.dynamic"> + <copy todir="${jar.dir}"> + <fileset dir="${src.action.dir}"> + <include name="**/*.groovy"/> + </fileset> + </copy> + </target> - <target name="compile" depends="init,groovy.compile,groovy.copy" - description="Compile the Java source code" - unless="eclipse.running"> - <javac classpathref="build.classpath" - destdir="${jar.dir}" - debug="${javac.debug}" - deprecation="${javac.deprecation}" - nowarn="on"> - <src path="${src.model.dir}" /> - <src path="${src.action.dir}" /> - </javac> - </target> + <target name="compile" depends="init,groovy.compile,groovy.copy" + description="Compile the Java source code" + unless="eclipse.running"> + <javac classpathref="build.classpath" + destdir="${jar.dir}" + debug="${javac.debug}" + deprecation="${javac.deprecation}" + nowarn="on"> + <src path="${src.model.dir}"/> + <src path="${src.action.dir}"/> + </javac> + </target> - <target name="copyclasses" depends="init" - description="Copy the classes that were compiled by eclipse" - if="eclipse.running"> - <copy todir="${jar.dir}"> - <fileset dir="classes/main"> - <include name="**/*.class"/> - </fileset> - <fileset dir="classes/hot"> - <include name="**/*.class"/> - </fileset> - </copy> - </target> + <target name="copyclasses" depends="init" + description="Copy the classes that were compiled by eclipse" + if="eclipse.running"> + <copy todir="${jar.dir}"> + <fileset dir="classes/main"> + <include name="**/*.class"/> + </fileset> + <fileset dir="classes/hot"> + <include name="**/*.class"/> + </fileset> + </copy> + </target> - <target name="jar" depends="compile,copyclasses" - description="Build the JAR structure in a staging directory"> - <copy todir="${jar.dir}"> - <fileset dir="${basedir}/resources"> - <include name="seam.properties" /> - <include name="*.drl" /> - </fileset> - </copy> - <copy todir="${jar.dir}/META-INF"> - <fileset dir="${basedir}/resources/META-INF"> - <include name="ejb-jar.xml" /> - <include name="orm.xml" /> - </fileset> - </copy> - <copy tofile="${jar.dir}/META-INF/persistence.xml" - file="${basedir}/resources/META-INF/persistence-${profile}.xml" - overwrite="true"/> - <copy tofile="${jar.dir}/import.sql" - file="${basedir}/resources/import-${profile}.sql" - overwrite="true"/> - </target> + <target name="jar" depends="compile,copyclasses" + description="Build the JAR structure in a staging directory"> + <copy todir="${jar.dir}"> + <fileset dir="${basedir}/resources"> + <include name="seam.properties"/> + <include name="*.drl"/> + </fileset> + </copy> + <copy todir="${jar.dir}/META-INF"> + <fileset dir="${basedir}/resources/META-INF"> + <include name="ejb-jar.xml"/> + <include name="orm.xml"/> + </fileset> + </copy> + <copy tofile="${jar.dir}/META-INF/persistence.xml" + file="${basedir}/resources/META-INF/persistence-${profile}.xml" + overwrite="true"/> + <copy tofile="${jar.dir}/import.sql" + file="${basedir}/resources/import-${profile}.sql" + overwrite="true"/> + </target> - <target name="war" depends="compile" - description="Build the WAR structure in a staging directory"> - <copy todir="${war.dir}"> - <fileset dir="${basedir}/view" /> - </copy> - <copy tofile="${war.dir}/WEB-INF/classes/components.properties" - file="${basedir}/resources/components-${profile}.properties" - overwrite="true"/> - <copy todir="${war.dir}/WEB-INF"> - <fileset dir="${basedir}/resources/WEB-INF"> - <include name="*.*"/> - <include name="classes/**/*.*"/> - <exclude name="classes/**/*.class"/> - </fileset> - </copy> - <copy todir="${war.dir}/WEB-INF"> - <fileset dir="${basedir}/resources/WEB-INF"> - <include name="lib/*.*"/> - <include name="classes/**/*.class"/> - </fileset> - </copy> - <copy todir="${war.dir}/WEB-INF/lib"> - <fileset dir="${lib.dir}"> - <includesfile name="deployed-jars-war.list" /> - <exclude name="jboss-seam-gen.jar" /> - </fileset> - </copy> - <copy todir="${war.dir}/WEB-INF/classes"> - <fileset dir="${basedir}/resources"> - <include name="**/*.xcss"/> - </fileset> - </copy> - <copy todir="${war.dir}/WEB-INF/classes"> - <fileset dir="${basedir}/resources"> - <include name="messages*.properties"/> - <include name="*.skin.properties"/> - <include name="*_theme.properties"/> - </fileset> - </copy> - </target> + <target name="war" depends="compile" + description="Build the WAR structure in a staging directory"> + <copy todir="${war.dir}"> + <fileset dir="${basedir}/view"/> + </copy> + <copy tofile="${war.dir}/WEB-INF/classes/components.properties" + file="${basedir}/resources/components-${profile}.properties" + overwrite="true"/> + <copy todir="${war.dir}/WEB-INF"> + <fileset dir="${basedir}/resources/WEB-INF"> + <include name="*.*"/> + <include name="classes/**/*.*"/> + <exclude name="classes/**/*.class"/> + </fileset> + </copy> + <copy todir="${war.dir}/WEB-INF"> + <fileset dir="${basedir}/resources/WEB-INF"> + <include name="lib/*.*"/> + <include name="classes/**/*.class"/> + </fileset> + </copy> + <copy todir="${war.dir}/WEB-INF/lib"> + <fileset dir="${lib.dir}"> + <includesfile name="deployed-jars-war.list"/> + <exclude name="jboss-seam-gen.jar"/> + </fileset> + </copy> + <copy todir="${war.dir}/WEB-INF/classes"> + <fileset dir="${basedir}/resources"> + <include name="**/*.xcss"/> + </fileset> + </copy> + <copy todir="${war.dir}/WEB-INF/classes"> + <fileset dir="${basedir}/resources"> + <include name="messages*.properties"/> + <include name="*.skin.properties"/> + <include name="*_theme.properties"/> + </fileset> + </copy> + </target> - <target name="ear" description="Build the EAR structure in a staging directory"> - <copy todir="${ear.dir}"> - <fileset dir="${basedir}/resources"> - <include name="*jpdl.xml" /> - <include name="*hibernate.cfg.xml" /> - <include name="jbpm.cfg.xml" /> - </fileset> - <fileset dir="${lib.dir}"> - <include name="jboss-seam.jar" /> - </fileset> - </copy> - <copy todir="${ear.dir}/lib"> - <fileset dir="${lib.dir}"> - <includesfile name="deployed-jars-ear.list" /> - </fileset> - </copy> - <copy todir="${ear.dir}/META-INF"> - <fileset dir="${basedir}/resources/META-INF"> - <include name="application.xml" /> - <include name="jboss-app.xml" /> - </fileset> - </copy> - </target> - - <target name="archive" depends="jar,war,ear" - description="Package the archives"> - <jar jarfile="${dist.dir}/${project.name}.jar" basedir="${jar.dir}"/> - <jar jarfile="${dist.dir}/${project.name}.war" basedir="${war.dir}"/> - <jar jarfile="${dist.dir}/${project.name}.ear"> - <fileset dir="${ear.dir}"/> - <fileset dir="${dist.dir}"> - <include name="${project.name}.jar"/> - <include name="${project.name}.war"/> - </fileset> - </jar> - </target> - - <target name="datasource"> - <fail unless="jboss.home">jboss.home not set</fail> - <copy todir="${deploy.dir}"> - <fileset dir="${basedir}/resources"> - <include name="${project.name}-${profile}-ds.xml" /> - </fileset> - </copy> - </target> - - <target name="explode" depends="jar,war,ear,datasource" - description="Deploy the exploded archive"> - <fail unless="jboss.home">jboss.home not set</fail> - - <mkdir dir="${jar.deploy.dir}"/> - <mkdir dir="${war.deploy.dir}"/> - - <copy todir="${jar.deploy.dir}"> - <fileset dir="${jar.dir}"/> - </copy> - <copy todir="${war.deploy.dir}"> - <fileset dir="${war.dir}"/> - </copy> - <copy todir="${ear.deploy.dir}"> - <fileset dir="${ear.dir}"/> - </copy> - </target> + <target name="ear" description="Build the EAR structure in a staging directory"> + <copy todir="${ear.dir}"> + <fileset dir="${basedir}/resources"> + <include name="*jpdl.xml"/> + <include name="*hibernate.cfg.xml"/> + <include name="jbpm.cfg.xml"/> + </fileset> + <fileset dir="${lib.dir}"> + <include name="jboss-seam.jar"/> + </fileset> + </copy> + <copy todir="${ear.dir}/lib"> + <fileset dir="${lib.dir}"> + <includesfile name="deployed-jars-ear.list"/> + </fileset> + </copy> + <copy todir="${ear.dir}/META-INF"> + <fileset dir="${basedir}/resources/META-INF"> + <include name="application.xml"/> + <include name="jboss-app.xml"/> + </fileset> + </copy> + </target> - <target name="unexplode" description="Undeploy the exploded archive"> - <delete failonerror="no"> - <fileset dir="${ear.deploy.dir}"> - <exclude name="**/*.jar"/> - </fileset> - </delete> - <delete file="${deploy.dir}/${project.name}-${profile}-ds.xml" failonerror="no"/> - <delete dir="${ear.deploy.dir}" failonerror="no"/> - </target> + <target name="archive" depends="jar,war,ear" + description="Package the archives"> + <jar jarfile="${dist.dir}/${project.name}.jar" basedir="${jar.dir}"/> + <jar jarfile="${dist.dir}/${project.name}.war" basedir="${war.dir}"/> + <jar jarfile="${dist.dir}/${project.name}.ear"> + <fileset dir="${ear.dir}"/> + <fileset dir="${dist.dir}"> + <include name="${project.name}.jar"/> + <include name="${project.name}.war"/> + </fileset> + </jar> + </target> - <target name="reexplode" depends="unexplode,clean,explode" - description="Undeploy the exploded archive, clean, then deploy the exploded archive"/> + <target name="datasource"> + <fail unless="jboss.home">jboss.home not set</fail> + <copy todir="${deploy.dir}"> + <fileset dir="${basedir}/resources"> + <include name="${project.name}-${profile}-ds.xml"/> + </fileset> + </copy> + </target> - <target name="check-deployed" description="Check to see if packaged archive is currently deployed"> - <fail unless="jboss.home">jboss.home not set</fail> - <condition property="archive.deployed" value="true"> - <available file="${ear.deploy.dir}" type="file"/> - </condition> - </target> - - <target name="restart-exploded" unless="archive.deployed" description="Deploy exploded archive if not deployed as packaged archive"> - <antcall target="explode"/> - <touch file="${ear.deploy.dir}/META-INF/application.xml"/> - </target> + <target name="explode" depends="jar,war,ear,datasource" + description="Deploy the exploded archive"> + <fail unless="jboss.home">jboss.home not set</fail> - <target name="restart-deployed" if="archive.deployed" description="Deploy packaged archive if deployed as packaged archive"> - <antcall target="deploy"/> - </target> - - <target name="restart" depends="check-deployed,restart-exploded,restart-deployed" description="Restart the exploded archive"/> + <mkdir dir="${jar.deploy.dir}"/> + <mkdir dir="${war.deploy.dir}"/> - <target name="deploy" depends="archive,datasource" description="Deploy the packaged archive"> - <fail unless="jboss.home">jboss.home not set</fail> - <copy todir="${deploy.dir}" file="${dist.dir}/${project.name}.ear" /> - </target> + <copy todir="${jar.deploy.dir}"> + <fileset dir="${jar.dir}"/> + </copy> + <copy todir="${war.deploy.dir}"> + <fileset dir="${war.dir}"/> + </copy> + <copy todir="${ear.deploy.dir}"> + <fileset dir="${ear.dir}"/> + </copy> + </target> - <target name="undeploy" description="Undeploy the packaged archive"> - <delete file="${deploy.dir}/${project.name}.ear" /> - <delete file="${deploy.dir}/${project.name}-dev-ds.xml" /> - <delete file="${deploy.dir}/${project.name}-prod-ds.xml" /> - </target> + <target name="unexplode" description="Undeploy the exploded archive"> + <delete failonerror="no"> + <fileset dir="${ear.deploy.dir}"> + <exclude name="**/*.jar"/> + </fileset> + </delete> + <delete file="${deploy.dir}/${project.name}-${profile}-ds.xml" failonerror="no"/> + <delete dir="${ear.deploy.dir}" failonerror="no"/> + </target> - <target name="redeploy" depends="undeploy,clean,deploy" - description="Undeploy the packaged archive, clean, then deploy the packaged archive"/> + <target name="reexplode" depends="unexplode,clean,explode" + description="Undeploy the exploded archive, clean, then deploy the exploded archive"/> - <target name="clean" description="Cleans up the staging directory"> - <delete dir="${dist.dir}"/> - <delete dir="${basedir}/exploded-archives"/> - <delete dir="${src.schema.dir}" failonerror="no"/> - <delete dir="${basedir}/test-report"/> - <delete dir="${basedir}/test-output"/> - <delete failonerror="no" includeemptydirs="true"> - <fileset dir="${test.dir}"> - <exclude name="**/*.class" if="eclipse.running"/> - </fileset> - </delete> - </target> + <target name="check-deployed" description="Check to see if packaged archive is currently deployed"> + <fail unless="jboss.home">jboss.home not set</fail> + <condition property="archive.deployed" value="true"> + <available file="${ear.deploy.dir}" type="file"/> + </condition> + </target> - <target name="compiletest" depends="groovy.compiletest" unless="eclipse.running" description="Compile the Java source code for the tests"> + <target name="restart-exploded" unless="archive.deployed" description="Deploy exploded archive if not deployed as packaged archive"> + <antcall target="explode"/> + <touch file="${ear.deploy.dir}/META-INF/application.xml"/> + </target> + + <target name="restart-deployed" if="archive.deployed" description="Deploy packaged archive if deployed as packaged archive"> + <antcall target="deploy"/> + </target> + + <target name="restart" depends="check-deployed,restart-exploded,restart-deployed" description="Restart the exploded archive"/> + + <target name="deploy" depends="archive,datasource" description="Deploy the packaged archive"> + <fail unless="jboss.home">jboss.home not set</fail> + <copy todir="${deploy.dir}" file="${dist.dir}/${project.name}.ear"/> + </target> + + <target name="undeploy" description="Undeploy the packaged archive"> + <delete file="${deploy.dir}/${project.name}.ear"/> + <delete file="${deploy.dir}/${project.name}-dev-ds.xml"/> + <delete file="${deploy.dir}/${project.name}-prod-ds.xml"/> + </target> + + <target name="redeploy" depends="undeploy,clean,deploy" + description="Undeploy the packaged archive, clean, then deploy the packaged archive"/> + + <target name="clean" description="Cleans up the staging directory"> + <delete dir="${dist.dir}"/> + <delete dir="${basedir}/exploded-archives"/> + <delete dir="${src.schema.dir}" failonerror="no"/> + <delete dir="${basedir}/test-report"/> + <delete dir="${basedir}/test-output"/> + <delete failonerror="no" includeemptydirs="true"> + <fileset dir="${test.dir}"> + <exclude name="**/*.class" if="eclipse.running"/> + </fileset> + </delete> + </target> + + <target name="compiletest" depends="groovy.compiletest" unless="eclipse.running" description="Compile the Java source code for the tests"> <mkdir dir="${test.dir}"/> <javac classpathref="build.classpath" - destdir="${test.dir}" - debug="${javac.debug}" - deprecation="${javac.deprecation}" - nowarn="on"> - <src path="${src.action.dir}" /> - <src path="${src.model.dir}" /> - <src path="${src.test.dir}" /> + destdir="${test.dir}" + debug="${javac.debug}" + deprecation="${javac.deprecation}" + nowarn="on"> + <src path="${src.action.dir}"/> + <src path="${src.model.dir}"/> + <src path="${src.test.dir}"/> </javac> - </target> + </target> - <target name="groovy.compiletest" if="groovy.test.present" description="Compile the Groovy source code for the tests"> - <mkdir dir="${test.dir}"/> - <groovyc classpathref="build.classpath" - destdir="${test.dir}"> - <src path="${src.action.dir}"/> - <src path="${src.model.dir}"/> - <src path="${src.test.dir}"/> - </groovyc> - </target> - - <target name="copytestclasses" if="eclipse.running" description="Copy classes compiled by eclipse to the test dir"> + <target name="groovy.compiletest" if="groovy.test.present" description="Compile the Groovy source code for the tests"> <mkdir dir="${test.dir}"/> - <copy todir="${test.dir}"> - <fileset dir="classes/main"> - <include name="**/*.class"/> - </fileset> - </copy> - <copy todir="${test.dir}"> - <fileset dir="classes/hot"> - <include name="**/*.class"/> - </fileset> - </copy> - <copy todir="${test.dir}"> - <fileset dir="classes/test"> - <include name="**/*.class"/> - </fileset> - </copy> - </target> - - <target name="buildtest" depends="init,compiletest,copytestclasses" description="Build the tests"> - <copy todir="${test.dir}"> - <fileset dir="${basedir}/resources"> - <exclude name="META-INF/persistence*.xml"/> - <exclude name="import*.sql"/> - <exclude name="${project.name}-*-ds.xml"/> - <exclude name="components-*.properties"/> - </fileset> - <fileset dir="${basedir}/view"/> - </copy> - <copy tofile="${test.dir}/META-INF/persistence.xml" - file="${basedir}/resources/META-INF/persistence-test.xml" - overwrite="true"/> - <copy tofile="${test.dir}/import.sql" - file="${basedir}/resources/import-test.sql" - overwrite="true"/> - <copy tofile="${test.dir}/components.properties" - file="${basedir}/resources/components-test.properties" - overwrite="true"/> - <copy todir="${test.dir}" flatten="true"> - <fileset dir="${src.test.dir}"> - <include name="**/*Test.xml" /> - </fileset> - </copy> - </target> + <groovyc classpathref="build.classpath" + destdir="${test.dir}"> + <src path="${src.action.dir}"/> + <src path="${src.model.dir}"/> + <src path="${src.test.dir}"/> + </groovyc> + </target> - <target name="test" depends="buildtest" description="Run the tests"> - <taskdef resource="testngtasks" classpath="${testng.jar}" /> - <path id="test.path"> - <path path="${test.dir}" /> - <fileset dir="${lib.dir}/test"> - <include name="*.jar"/> - </fileset> - <path path="${bootstrap.dir}" /> - <path refid="build.classpath" /> - </path> - <testng outputdir="${basedir}/test-report"> - <jvmarg line="-Djava.endorsed.dirs=${endorsed.dir}"/> - <jvmarg line="-Dsun.lang.ClassLoader.allowArraySyntax=true"/> - <classpath refid="test.path" /> - <xmlfileset dir="${test.dir}" includes="*Test.xml" /> - </testng> - </target> + <target name="copytestclasses" if="eclipse.running" description="Copy classes compiled by eclipse to the test dir"> + <mkdir dir="${test.dir}"/> + <copy todir="${test.dir}"> + <fileset dir="classes/main"> + <include name="**/*.class"/> + </fileset> + </copy> + <copy todir="${test.dir}"> + <fileset dir="classes/hot"> + <include name="**/*.class"/> + </fileset> + </copy> + <copy todir="${test.dir}"> + <fileset dir="classes/test"> + <include name="**/*.class"/> + </fileset> + </copy> + </target> + <target name="buildtest" depends="init,compiletest,copytestclasses" description="Build the tests"> + <copy todir="${test.dir}"> + <fileset dir="${basedir}/resources"> + <exclude name="META-INF/persistence*.xml"/> + <exclude name="import*.sql"/> + <exclude name="${project.name}-*-ds.xml"/> + <exclude name="components-*.properties"/> + </fileset> + <fileset dir="${basedir}/view"/> + </copy> + <copy tofile="${test.dir}/META-INF/persistence.xml" + file="${basedir}/resources/META-INF/persistence-test.xml" + overwrite="true"/> + <copy tofile="${test.dir}/import.sql" + file="${basedir}/resources/import-test.sql" + overwrite="true"/> + <copy tofile="${test.dir}/components.properties" + file="${basedir}/resources/components-test.properties" + overwrite="true"/> + <copy todir="${test.dir}" flatten="true"> + <fileset dir="${src.test.dir}"> + <include name="**/*Test.xml"/> + </fileset> + </copy> + </target> + + <target name="test" depends="buildtest" description="Run the tests"> + <taskdef resource="testngtasks" classpath="${testng.jar}"/> + <path id="test.path"> + <path path="${test.dir}"/> + <fileset dir="${lib.dir}/test"> + <include name="*.jar"/> + </fileset> + <path path="${bootstrap.dir}"/> + <path refid="build.classpath"/> + </path> + <testng outputdir="${basedir}/test-report"> + <jvmarg line="-Djava.endorsed.dirs=${endorsed.dir}"/> + <jvmarg line="-Dsun.lang.ClassLoader.allowArraySyntax=true"/> + <classpath refid="test.path"/> + <xmlfileset dir="${test.dir}" includes="*Test.xml"/> + </testng> + </target> + <target name="javadoc" depends="compile"> - <mkdir dir="${dist.dir}/apidoc" /> + <mkdir dir="${dist.dir}/apidoc"/> <javadoc classpathref="build.classpath" destdir="${dist.dir}/apidoc" use="true" protected="true" version="true" windowtitle="${project.name} API Documentation" doctitle="${project.name} API Documentation" link="http://java.sun.com/j2se/5.0/docs/api"> - <packageset dir="${src.action.dir}" defaultexcludes="yes"> - <include name="*/**" /> + <include name="*/**"/> </packageset> - <packageset dir="${src.model.dir}" defaultexcludes="yes"> - <include name="*/**" /> + <include name="*/**"/> </packageset> - </javadoc> </target> - + <target name="validateConfiguration" depends="war,ear,jar" description="Validate the xml configuration files"> <mkdir dir="${schema.dir}"/> <unjar src="${lib.dir}/jboss-seam.jar" dest="${schema.dir}"> @@ -432,7 +429,7 @@ <include name="org/jboss/seam/*.dtd"/> </patternset> </unjar> - <ant antfile="validate.xml" target="validateConfiguration" /> + <ant antfile="validate.xml" target="validateConfiguration"/> </target> - + </project> Modified: trunk/seam-gen/icefaces/build-scripts/build.xml =================================================================== --- trunk/seam-gen/icefaces/build-scripts/build.xml 2008-10-25 07:19:58 UTC (rev 9425) +++ trunk/seam-gen/icefaces/build-scripts/build.xml 2008-10-25 07:46:55 UTC (rev 9426) @@ -1,424 +1,421 @@ <?xml version="1.0"?> <project name="@projectName@" default="deploy" basedir="."> -  - <property file="${basedir}/build.properties" /> +  + <property file="${basedir}/build.properties"/> - <property name="profile" value="dev" /> - <property file="build-${profile}.properties" /> + <property name="profile" value="dev"/> + <property file="build-${profile}.properties"/> -  - <property name="project.name" value="@projectName@"/> - <property name="dist.dir" value="dist" /> - <property name="src.model.dir" value="src/main" /> - <property name="src.action.dir" value="src/hot" /> - <property name="src.test.dir" value="src/test" /> - <property name="lib.dir" value="lib" /> - <property name="endorsed.dir" value="${lib.dir}/endorsed" /> - <property name="ear.dir" value="exploded-archives/${project.name}.ear" /> - <property name="jar.dir" value="exploded-archives/${project.name}.jar" /> - <property name="war.dir" value="exploded-archives/${project.name}.war" /> - <property name="test.dir" value="test-build" /> - <property name="bootstrap.dir" value="${basedir}/bootstrap" /> - <property name="deploy.dir" value="${jboss.home}/server/default/deploy" /> - <property name="ear.deploy.dir" value="${deploy.dir}/${project.name}.ear" /> - <property name="jar.deploy.dir" value="${ear.deploy.dir}/${project.name}.jar" /> - <property name="war.deploy.dir" value="${ear.deploy.dir}/${project.name}.war" /> - <property name="testng.jar" value="${basedir}/lib/testng.jar" /> - <property name="javac.debug" value="true" /> - <property name="javac.deprecation" value="false" /> - <property name="debug" value="false" /> - -  - <property name="validate.resources.dir" value="${basedir}/exploded-archives" /> - <property name="schema.dir" value="${basedir}/exploded-archives/schemas" /> - <property name="src.schema.dir" value="${schema.dir}/org/jboss/seam"/> - <property name="schema.version" value="@schemaVersion@" /> - - <fileset id="lib" dir="${lib.dir}"> - <include name="*.jar" /> - </fileset> +  + <property name="project.name" value="@projectName@"/> + <property name="dist.dir" value="dist"/> + <property name="src.model.dir" value="src/main"/> + <property name="src.action.dir" value="src/hot"/> + <property name="src.test.dir" value="src/test"/> + <property name="lib.dir" value="lib"/> + <property name="endorsed.dir" value="${lib.dir}/endorsed"/> + <property name="ear.dir" value="exploded-archives/${project.name}.ear"/> + <property name="jar.dir" value="exploded-archives/${project.name}.jar"/> + <property name="war.dir" value="exploded-archives/${project.name}.war"/> + <property name="test.dir" value="test-build"/> + <property name="bootstrap.dir" value="${basedir}/bootstrap"/> + <property name="deploy.dir" value="${jboss.home}/server/default/deploy"/> + <property name="ear.deploy.dir" value="${deploy.dir}/${project.name}.ear"/> + <property name="jar.deploy.dir" value="${ear.deploy.dir}/${project.name}.jar"/> + <property name="war.deploy.dir" value="${ear.deploy.dir}/${project.name}.war"/> + <property name="testng.jar" value="${basedir}/lib/testng.jar"/> + <property name="javac.debug" value="true"/> + <property name="javac.deprecation" value="false"/> + <property name="debug" value="false"/> - <path id="build.classpath"> - <fileset refid="lib" /> - </path> +  + <property name="validate.resources.dir" value="${basedir}/exploded-archives"/> + <property name="schema.dir" value="${basedir}/exploded-archives/schemas"/> + <property name="src.schema.dir" value="${schema.dir}/org/jboss/seam"/> + <property name="schema.version" value="@schemaVersion@"/> - <target name="init" description="Initialize the build"> - <taskdef name="groovyc" - classname ="org.codehaus.groovy.ant.Groovyc" - classpathref="build.classpath"/>  - <mkdir dir="${jar.dir}" /> - <mkdir dir="${ear.dir}" /> - <mkdir dir="${war.dir}" /> - <mkdir dir="${dist.dir}" /> -  - <available property="groovy.present" value="true" file="" searchparents="true"> + <fileset id="lib" dir="${lib.dir}"> + <include name="*.jar"/> + </fileset> + + <path id="build.classpath"> + <fileset refid="lib"/> + </path> + + <target name="init" description="Initialize the build"> + <taskdef name="groovyc" + classname ="org.codehaus.groovy.ant.Groovyc" + classpathref="build.classpath"/>  + <mkdir dir="${jar.dir}"/> + <mkdir dir="${ear.dir}"/> + <mkdir dir="${war.dir}"/> + <mkdir dir="${dist.dir}"/> +  + <available property="groovy.present" value="true" file="" searchparents="true"> + <filepath> + <fileset dir="${src.action.dir}"> + <include name="**/*.groovy"/> + </fileset> + <fileset dir="${src.model.dir}"> + <include name="**/*.groovy"/> + </fileset> + </filepath> + </available> + <condition property="groovy.test.present" value="true"> + <or> + <isset property="groovy.present"/> + <available file="" searchparents="true"> <filepath> - <fileset dir="${src.action.dir}"> + <fileset dir="${src.test.dir}"> <include name="**/*.groovy"/> </fileset> - <fileset dir="${src.model.dir}"> - <include name="**/*.groovy"/> - </fileset> </filepath> </available> - <condition property="groovy.test.present" value="true"> - <or> - <isset property="groovy.present"/> - <available file="" searchparents="true"> - <filepath> - <fileset dir="${src.test.dir}"> - <include name="**/*.groovy"/> - </fileset> - </filepath> - </available> - </or> - </condition> -  - <condition property="groovy.dynamic" value="true"> - <and> - <isset property="groovy.present"/> - <istrue value="${debug}"/> - </and> - </condition> - <condition property="groovy.static" value="true"> - <and> - <isset property="groovy.present"/> - <isfalse value="${debug}"/> - </and> - </condition> - </target> + </or> + </condition> +  + <condition property="groovy.dynamic" value="true"> + <and> + <isset property="groovy.present"/> + <istrue value="${debug}"/> + </and> + </condition> + <condition property="groovy.static" value="true"> + <and> + <isset property="groovy.present"/> + <isfalse value="${debug}"/> + </and> + </condition> + </target> - <target name="groovy.compile" if="groovy.static"> - <groovyc classpathref="build.classpath" - destdir="${jar.dir}" - srcdir="${src.model.dir}" > - </groovyc> - <path id="groovy.action.classpath"> - <path refid="build.classpath"/> - <dirset dir="${jar.dir}"/> - </path> - <groovyc classpathref="groovy.action.classpath" - destdir="${jar.dir}" - srcdir="${src.action.dir}" > - </groovyc> - </target> + <target name="groovy.compile" if="groovy.static"> + <groovyc classpathref="build.classpath" + destdir="${jar.dir}" + srcdir="${src.model.dir}"> + </groovyc> + <path id="groovy.action.classpath"> + <path refid="build.classpath"/> + <dirset dir="${jar.dir}"/> + </path> + <groovyc classpathref="groovy.action.classpath" + destdir="${jar.dir}" + srcdir="${src.action.dir}"> + </groovyc> + </target> - <target name="groovy.copy" if="groovy.dynamic"> - <copy todir="${jar.dir}"> - <fileset dir="${src.action.dir}"> - <include name="**/*.groovy"/> - </fileset> - </copy> - </target> + <target name="groovy.copy" if="groovy.dynamic"> + <copy todir="${jar.dir}"> + <fileset dir="${src.action.dir}"> + <include name="**/*.groovy"/> + </fileset> + </copy> + </target> - <target name="compile" depends="init,groovy.compile,groovy.copy" - description="Compile the Java source code" - unless="eclipse.running"> - <javac classpathref="build.classpath" - destdir="${jar.dir}" - debug="${javac.debug}" - deprecation="${javac.deprecation}" - nowarn="on"> - <src path="${src.model.dir}" /> - <src path="${src.action.dir}" /> - </javac> - </target> + <target name="compile" depends="init,groovy.compile,groovy.copy" + description="Compile the Java source code" + unless="eclipse.running"> + <javac classpathref="build.classpath" + destdir="${jar.dir}" + debug="${javac.debug}" + deprecation="${javac.deprecation}" + nowarn="on"> + <src path="${src.model.dir}"/> + <src path="${src.action.dir}"/> + </javac> + </target> - <target name="copyclasses" depends="init" - description="Copy the classes that were compiled by eclipse" - if="eclipse.running"> - <copy todir="${jar.dir}"> - <fileset dir="classes/main"> - <include name="**/*.class"/> - </fileset> - <fileset dir="classes/hot"> - <include name="**/*.class"/> - </fileset> - </copy> - </target> + <target name="copyclasses" depends="init" + description="Copy the classes that were compiled by eclipse" + if="eclipse.running"> + <copy todir="${jar.dir}"> + <fileset dir="classes/main"> + <include name="**/*.class"/> + </fileset> + <fileset dir="classes/hot"> + <include name="**/*.class"/> + </fileset> + </copy> + </target> - <target name="jar" depends="compile,copyclasses" - description="Build the JAR structure in a staging directory"> - <copy todir="${jar.dir}"> - <fileset dir="${basedir}/resources"> - <include name="seam.properties" /> - <include name="*.drl" /> - </fileset> - </copy> - <copy todir="${jar.dir}/META-INF"> - <fileset dir="${basedir}/resources/META-INF"> - <include name="ejb-jar.xml" /> - <include name="orm.xml" /> - </fileset> - </copy> - <copy tofile="${jar.dir}/META-INF/persistence.xml" - file="${basedir}/resources/META-INF/persistence-${profile}.xml" - overwrite="true"/> - <copy tofile="${jar.dir}/import.sql" - file="${basedir}/resources/import-${profile}.sql" - overwrite="true"/> - </target> + <target name="jar" depends="compile,copyclasses" + description="Build the JAR structure in a staging directory"> + <copy todir="${jar.dir}"> + <fileset dir="${basedir}/resources"> + <include name="seam.properties"/> + <include name="*.drl"/> + </fileset> + </copy> + <copy todir="${jar.dir}/META-INF"> + <fileset dir="${basedir}/resources/META-INF"> + <include name="ejb-jar.xml"/> + <include name="orm.xml"/> + </fileset> + </copy> + <copy tofile="${jar.dir}/META-INF/persistence.xml" + file="${basedir}/resources/META-INF/persistence-${profile}.xml" + overwrite="true"/> + <copy tofile="${jar.dir}/import.sql" + file="${basedir}/resources/import-${profile}.sql" + overwrite="true"/> + </target> - <target name="war" depends="compile" - description="Build the WAR structure in a staging directory"> - <copy todir="${war.dir}"> - <fileset dir="${basedir}/view" /> - </copy> - <copy tofile="${war.dir}/WEB-INF/classes/components.properties" - file="${basedir}/resources/components-${profile}.properties" - overwrite="true"/> - <copy todir="${war.dir}/WEB-INF"> - <fileset dir="${basedir}/resources/WEB-INF"> - <include name="*.*"/> - <include name="classes/**/*.*"/> - <exclude name="classes/**/*.class"/> - </fileset> - </copy> - <copy todir="${war.dir}/WEB-INF"> - <fileset dir="${basedir}/resources/WEB-INF"> - <include name="lib/*.*"/> - <include name="classes/**/*.class"/> - </fileset> - </copy> - <copy todir="${war.dir}/WEB-INF/lib"> + <target name="war" depends="compile" + description="Build the WAR structure in a staging directory"> + <copy todir="${war.dir}"> + <fileset dir="${basedir}/view"/> + </copy> + <copy tofile="${war.dir}/WEB-INF/classes/components.properties" + file="${basedir}/resources/components-${profile}.properties" + overwrite="true"/> + <copy todir="${war.dir}/WEB-INF"> + <fileset dir="${basedir}/resources/WEB-INF"> + <include name="*.*"/> + <include name="classes/**/*.*"/> + <exclude name="classes/**/*.class"/> + </fileset> + </copy> + <copy todir="${war.dir}/WEB-INF"> + <fileset dir="${basedir}/resources/WEB-INF"> + <include name="lib/*.*"/> + <include name="classes/**/*.class"/> + </fileset> + </copy> + <copy todir="${war.dir}/WEB-INF/lib"> + <fileset dir="${lib.dir}"> + <includesfile name="deployed-jars-war.list"/> + <exclude name="jboss-seam-gen.jar"/> + </fileset> + </copy> + <copy todir="${war.dir}/WEB-INF/classes"> + <fileset dir="${basedir}/resources"> + <include name="messages*.properties"/> + <include name="*_theme.properties"/> + </fileset> + </copy> + </target> + + <target name="ear" description="Build the EAR structure in a staging directory"> + <copy todir="${ear.dir}"> + <fileset dir="${basedir}/resources"> + <include name="*jpdl.xml"/> + <include name="*hibernate.cfg.xml"/> + <include name="jbpm.cfg.xml"/> + </fileset> <fileset dir="${lib.dir}"> - <includesfile name="deployed-jars-war.list" /> - <exclude name="jboss-seam-gen.jar" /> + <include name="jboss-seam.jar"/> </fileset> </copy> - <copy todir="${war.dir}/WEB-INF/classes"> - <fileset dir="${basedir}/resources"> - <include name="messages*.properties"/> - <include name="*_theme.properties"/> - </fileset> - </copy> - </target> + <copy todir="${ear.dir}/lib"> + <fileset dir="${lib.dir}"> + <includesfile name="deployed-jars-ear.list"/> + <exclude name="icefaces-ahs.jar"/> + </fileset> + </copy> + <copy todir="${ear.dir}/META-INF"> + <fileset dir="${basedir}/resources/META-INF"> + <include name="application.xml"/> + <include name="jboss-app.xml"/> + </fileset> + </copy> + </target> - <target name="ear" description="Build the EAR structure in a staging directory"> - <copy todir="${ear.dir}"> - <fileset dir="${basedir}/resources"> - <include name="*jpdl.xml" /> - <include name="*hibernate.cfg.xml" /> - <include name="jbpm.cfg.xml" /> - </fileset> - <fileset dir="${lib.dir}"> - <include name="jboss-seam.jar" /> - </fileset> - </copy> - <copy todir="${ear.dir}/lib"> - <fileset dir="${lib.dir}"> - <includesfile name="deployed-jars-ear.list" /> - <exclude name="icefaces-ahs.jar"/> - </fileset> - </copy> - <copy todir="${ear.dir}/META-INF"> - <fileset dir="${basedir}/resources/META-INF"> - <include name="application.xml" /> - <include name="jboss-app.xml" /> - </fileset> - </copy> - </target> - - <target name="archive" depends="jar,war,ear" - description="Package the archives"> - <jar jarfile="${dist.dir}/${project.name}.jar" basedir="${jar.dir}"/> - <jar jarfile="${dist.dir}/${project.name}.war" basedir="${war.dir}"/> - <jar jarfile="${dist.dir}/${project.name}.ear"> - <fileset dir="${ear.dir}"/> - <fileset dir="${dist.dir}"> - <include name="${project.name}.jar"/> - <include name="${project.name}.war"/> - </fileset> - </jar> - </target> - - <target name="datasource"> - <fail unless="jboss.home">jboss.home not set</fail> - <copy todir="${deploy.dir}"> - <fileset dir="${basedir}/resources"> - <include name="${project.name}-${profile}-ds.xml" /> - </fileset> - </copy> - </target> - - <target name="explode" depends="jar,war,ear,datasource" - description="Deploy the exploded archive"> - <fail unless="jboss.home">jboss.home not set</fail> - - <mkdir dir="${jar.deploy.dir}"/> - <mkdir dir="${war.deploy.dir}"/> - - <copy todir="${jar.deploy.dir}"> - <fileset dir="${jar.dir}"/> - </copy> - <copy todir="${war.deploy.dir}"> - <fileset dir="${war.dir}"/> - </copy> - <copy todir="${ear.deploy.dir}"> - <fileset dir="${ear.dir}"/> - </copy> - </target> + <target name="archive" depends="jar,war,ear" + description="Package the archives"> + <jar jarfile="${dist.dir}/${project.name}.jar" basedir="${jar.dir}"/> + <jar jarfile="${dist.dir}/${project.name}.war" basedir="${war.dir}"/> + <jar jarfile="${dist.dir}/${project.name}.ear"> + <fileset dir="${ear.dir}"/> + <fileset dir="${dist.dir}"> + <include name="${project.name}.jar"/> + <include name="${project.name}.war"/> + </fileset> + </jar> + </target> - <target name="unexplode" description="Undeploy the exploded archive"> - <delete failonerror="no"> - <fileset dir="${ear.deploy.dir}"> - <exclude name="**/*.jar"/> - </fileset> - </delete> - <delete file="${deploy.dir}/${project.name}-${profile}-ds.xml" failonerror="no"/> - <delete dir="${ear.deploy.dir}" failonerror="no"/> - </target> + <target name="datasource"> + <fail unless="jboss.home">jboss.home not set</fail> + <copy todir="${deploy.dir}"> + <fileset dir="${basedir}/resources"> + <include name="${project.name}-${profile}-ds.xml"/> + </fileset> + </copy> + </target> - <target name="reexplode" depends="unexplode,clean,explode" - description="Undeploy the exploded archive, clean, then deploy the exploded archive"/> + <target name="explode" depends="jar,war,ear,datasource" + description="Deploy the exploded archive"> + <fail unless="jboss.home">jboss.home not set</fail> - <target name="check-deployed" description="Check to see if packaged archive is currently deployed"> - <fail unless="jboss.home">jboss.home not set</fail> - <condition property="archive.deployed" value="true"> - <available file="${ear.deploy.dir}" type="file"/> - </condition> - </target> - - <target name="restart-exploded" unless="archive.deployed" description="Deploy exploded archive if not deployed as packaged archive"> - <antcall target="explode"/> - <touch file="${ear.deploy.dir}/META-INF/application.xml"/> - </target> + <mkdir dir="${jar.deploy.dir}"/> + <mkdir dir="${war.deploy.dir}"/> - <target name="restart-deployed" if="archive.deployed" description="Deploy packaged archive if deployed as packaged archive"> - <antcall target="deploy"/> - </target> - - <target name="restart" depends="check-deployed,restart-exploded,restart-deployed" description="Restart the exploded archive"/> + <copy todir="${jar.deploy.dir}"> + <fileset dir="${jar.dir}"/> + </copy> + <copy todir="${war.deploy.dir}"> + <fileset dir="${war.dir}"/> + </copy> + <copy todir="${ear.deploy.dir}"> + <fileset dir="${ear.dir}"/> + </copy> + </target> - <target name="deploy" depends="archive,datasource" description="Deploy the packaged archive"> - <fail unless="jboss.home">jboss.home not set</fail> - <copy todir="${deploy.dir}" file="${dist.dir}/${project.name}.ear" /> - </target> + <target name="unexplode" description="Undeploy the exploded archive"> + <delete failonerror="no"> + <fileset dir="${ear.deploy.dir}"> + <exclude name="**/*.jar"/> + </fileset> + </delete> + <delete file="${deploy.dir}/${project.name}-${profile}-ds.xml" failonerror="no"/> + <delete dir="${ear.deploy.dir}" failonerror="no"/> + </target> - <target name="undeploy" description="Undeploy the packaged archive"> - <delete file="${deploy.dir}/${project.name}.ear" /> - <delete file="${deploy.dir}/${project.name}-dev-ds.xml" /> - <delete file="${deploy.dir}/${project.name}-prod-ds.xml" /> - </target> + <target name="reexplode" depends="unexplode,clean,explode" + description="Undeploy the exploded archive, clean, then deploy the exploded archive"/> - <target name="redeploy" depends="undeploy,clean,deploy" - description="Undeploy the packaged archive, clean, then deploy the packaged archive"/> + <target name="check-deployed" description="Check to see if packaged archive is currently deployed"> + <fail unless="jboss.home">jboss.home not set</fail> + <condition property="archive.deployed" value="true"> + <available file="${ear.deploy.dir}" type="file"/> + </condition> + </target> - <target name="clean" description="Cleans up the staging directory"> - <delete dir="${dist.dir}"/> - <delete dir="${basedir}/exploded-archives"/> - <delete dir="${src.schema.dir}" failonerror="no"/> - <delete dir="${basedir}/test-report"/> - <delete dir="${basedir}/test-output"/> - <delete failonerror="no" includeemptydirs="true"> - <fileset dir="${test.dir}"> - <exclude name="**/*.class" if="eclipse.running"/> - </fileset> - </delete> - </target> + <target name="restart-exploded" unless="archive.deployed" description="Deploy exploded archive if not deployed as packaged archive"> + <antcall target="explode"/> + <touch file="${ear.deploy.dir}/META-INF/application.xml"/> + </target> - <target name="compiletest" depends="groovy.compiletest" unless="eclipse.running" description="Compile the Java source code for the tests"> - <mkdir dir="${test.dir}"/> - <javac classpathref="build.classpath" - destdir="${test.dir}" - debug="${javac.debug}" - deprecation="${javac.deprecation}" - nowarn="on"> - <src path="${src.action.dir}" /> - <src path="${src.model.dir}" /> - <src path="${src.test.dir}" /> - </javac> - </target> + <target name="restart-deployed" if="archive.deployed" description="Deploy packaged archive if deployed as packaged archive"> + <antcall target="deploy"/> + </target> - <target name="groovy.compiletest" if="groovy.test.present" description="Compile the Groovy source code for the tests"> - <mkdir dir="${test.dir}"/> - <groovyc classpathref="build.classpath" - destdir="${test.dir}"> - <src path="${src.action.dir}"/> - <src path="${src.model.dir}"/> - <src path="${src.test.dir}"/> - </groovyc> - </target> - - <target name="copytestclasses" if="eclipse.running" description="Copy classes compiled by eclipse to the test dir"> + <target name="restart" depends="check-deployed,restart-exploded,restart-deployed" description="Restart the exploded archive"/> + + <target name="deploy" depends="archive,datasource" description="Deploy the packaged archive"> + <fail unless="jboss.home">jboss.home not set</fail> + <copy todir="${deploy.dir}" file="${dist.dir}/${project.name}.ear"/> + </target> + + <target name="undeploy" description="Undeploy the packaged archive"> + <delete file="${deploy.dir}/${project.name}.ear"/> + <delete file="${deploy.dir}/${project.name}-dev-ds.xml"/> + <delete file="${deploy.dir}/${project.name}-prod-ds.xml"/> + </target> + + <target name="redeploy" depends="undeploy,clean,deploy" + description="Undeploy the packaged archive, clean, then deploy the packaged archive"/> + + <target name="clean" description="Cleans up the staging directory"> + <delete dir="${dist.dir}"/> + <delete dir="${basedir}/exploded-archives"/> + <delete dir="${src.schema.dir}" failonerror="no"/> + <delete dir="${basedir}/test-report"/> + <delete dir="${basedir}/test-output"/> + <delete failonerror="no" includeemptydirs="true"> + <fileset dir="${test.dir}"> + <exclude name="**/*.class" if="eclipse.running"/> + </fileset> + </delete> + </target> + + <target name="compiletest" depends="groovy.compiletest" unless="eclipse.running" description="Compile the Java source code for the tests"> + <mkdir dir="${test.dir}"/> + <javac classpathref="build.classpath" + destdir="${test.dir}" + debug="${javac.debug}" + deprecation="${javac.deprecation}" + nowarn="on"> + <src path="${src.action.dir}"/> + <src path="${src.model.dir}"/> + <src path="${src.test.dir}"/> + </javac> + </target> + + <target name="groovy.compiletest" if="groovy.test.present" description="Compile the Groovy source code for the tests"> <mkdir dir="${test.dir}"/> - <copy todir="${test.dir}"> - <fileset dir="classes/main"> - <include name="**/*.class"/> - </fileset> - </copy> - <copy todir="${test.dir}"> - <fileset dir="classes/hot"> - <include name="**/*.class"/> - </fileset> - </copy> - <copy todir="${test.dir}"> - <fileset dir="classes/test"> - <include name="**/*.class"/> - </fileset> - </copy> - </target> - - <target name="buildtest" depends="init,compiletest,copytestclasses" description="Build the tests"> - <copy todir="${test.dir}"> - <fileset dir="${basedir}/resources"> - <exclude name="META-INF/persistence*.xml"/> - <exclude name="import*.sql"/> - <exclude name="${project.name}-*-ds.xml"/> - <exclude name="components-*.properties"/> - </fileset> - <fileset dir="${basedir}/view"/> - </copy> - <copy tofile="${test.dir}/META-INF/persistence.xml" - file="${basedir}/resources/META-INF/persistence-test.xml" - overwrite="true"/> - <copy tofile="${test.dir}/import.sql" - file="${basedir}/resources/import-test.sql" - overwrite="true"/> - <copy tofile="${test.dir}/components.properties" - file="${basedir}/resources/components-test.properties" - overwrite="true"/> - <copy todir="${test.dir}" flatten="true"> - <fileset dir="${src.test.dir}"> - <include name="**/*Test.xml" /> - </fileset> - </copy> - </target> + <groovyc classpathref="build.classpath" + destdir="${test.dir}"> + <src path="${src.action.dir}"/> + <src path="${src.model.dir}"/> + <src path="${src.test.dir}"/> + </groovyc> + </target> - <target name="test" depends="buildtest" description="Run the tests"> - <taskdef resource="testngtasks" classpath="${testng.jar}" /> - <path id="test.path"> - <path path="${test.dir}" /> - <fileset dir="${lib.dir}/test"> - <include name="*.jar"/> - </fileset> - <path path="${bootstrap.dir}" /> - <path refid="build.classpath" /> - </path> - <testng outputdir="${basedir}/test-report"> - <jvmarg line="-Djava.endorsed.dirs=${endorsed.dir}"/> - <jvmarg line="-Dsun.lang.ClassLoader.allowArraySyntax=true"/> - <classpath refid="test.path" /> - <xmlfileset dir="${test.dir}" includes="*Test.xml" /> - </testng> - </target> + <target name="copytestclasses" if="eclipse.running" description="Copy classes compiled by eclipse to the test dir"> + <mkdir dir="${test.dir}"/> + <copy todir="${test.dir}"> + <fileset dir="classes/main"> + <include name="**/*.class"/> + </fileset> + </copy> + <copy todir="${test.dir}"> + <fileset dir="classes/hot"> + <include name="**/*.class"/> + </fileset> + </copy> + <copy todir="${test.dir}"> + <fileset dir="classes/test"> + <include name="**/*.class"/> + </fileset> + </copy> + </target> + <target name="buildtest" depends="init,compiletest,copytestclasses" description="Build the tests"> + <copy todir="${test.dir}"> + <fileset dir="${basedir}/resources"> + <exclude name="META-INF/persistence*.xml"/> + <exclude name="import*.sql"/> + <exclude name="${project.name}-*-ds.xml"/> + <exclude name="components-*.properties"/> + </fileset> + <fileset dir="${basedir}/view"/> + </copy> + <copy tofile="${test.dir}/META-INF/persistence.xml" + file="${basedir}/resources/META-INF/persistence-test.xml" + overwrite="true"/> + <copy tofile="${test.dir}/import.sql" + file="${basedir}/resources/import-test.sql" + overwrite="true"/> + <copy tofile="${test.dir}/components.properties" + file="${basedir}/resources/components-test.properties" + overwrite="true"/> + <copy todir="${test.dir}" flatten="true"> + <fileset dir="${src.test.dir}"> + <include name="**/*Test.xml"/> + </fileset> + </copy> + </target> + + <target name="test" depends="buildtest" description="Run the tests"> + <taskdef resource="testngtasks" classpath="${testng.jar}"/> + <path id="test.path"> + <path path="${test.dir}"/> + <fileset dir="${lib.dir}/test"> + <include name="*.jar"/> + </fileset> + <path path="${bootstrap.dir}"/> + <path refid="build.classpath"/> + </path> + <testng outputdir="${basedir}/test-report"> + <jvmarg line="-Djava.endorsed.dirs=${endorsed.dir}"/> + <jvmarg line="-Dsun.lang.ClassLoader.allowArraySyntax=true"/> + <classpath refid="test.path"/> + <xmlfileset dir="${test.dir}" includes="*Test.xml"/> + </testng> + </target> + <target name="javadoc" depends="compile"> - <mkdir dir="${dist.dir}/apidoc" /> + <mkdir dir="${dist.dir}/apidoc"/> <javadoc classpathref="build.classpath" destdir="${dist.dir}/apidoc" use="true" protected="true" version="true" windowtitle="${project.name} API Documentation" doctitle="${project.name} API Documentation" link="http://java.sun.com/j2se/5.0/docs/api"> - <packageset dir="${src.action.dir}" defaultexcludes="yes"> - <include name="*/**" /> + <include name="*/**"/> </packageset> - <packageset dir="${src.model.dir}" defaultexcludes="yes"> - <include name="*/**" /> + <include name="*/**"/> </packageset> - </javadoc> </target> - + <target name="validateConfiguration" depends="war,ear,jar" description="Validate the xml configuration files"> <mkdir dir="${schema.dir}"/> <unjar src="${lib.dir}/jboss-seam.jar" dest="${schema.dir}"> @@ -427,27 +424,27 @@ <include name="org/jboss/seam/*.dtd"/> </patternset> </unjar> - <ant antfile="validate.xml" target="validateConfiguration" /> + <ant antfile="validate.xml" target="validateConfiguration"/> </target> - + <target name="freshen" description="grab fresh icefaces jars"> - <copy todir="${lib.dir}"> - <fileset dir="${icefaces.home}/lib"> - <include name="icefaces*.jar" /> - <include name="backport-util-concurrent.jar" /> - <include name="commons-fileupload.jar"/> - <include name="commons-digester.jar"/> - <exclude name="icefaces-ahs.jar"/> - </fileset> - </copy> + <copy todir="${lib.dir}"> + <fileset dir="${icefaces.home}/lib"> + <include name="icefaces*.jar"/> + <include name="backport-util-concurrent.jar"/> + <include name="commons-fileupload.jar"/> + <include name="commons-digester.jar"/> + <exclude name="icefaces-ahs.jar"/> + </fileset> + </copy> </target> - <target name="purge" depends="undeploy" description="clean out jboss deployments of crashing applications"> - <delete dir="${jboss.home}/server/default/tmp/deploy" /> - <mkdir dir="${jboss.home}/server/default/tmp/deploy/" /> - <delete dir="${jboss.home}/server/default/tmp/sessions" /> - <mkdir dir="${jboss.home}/server/default/tmp/sessions" /> - <delete dir="${jboss.home}/server/default/work/jboss.web/localhost/${project.name}" /> + <target name="purge" depends="undeploy" description="clean out jboss deployments of crashing applications"> + <delete dir="${jboss.home}/server/default/tmp/deploy"/> + <mkdir dir="${jboss.home}/server/default/tmp/deploy/"/> + <delete dir="${jboss.home}/server/default/tmp/sessions"/> + <mkdir dir="${jboss.home}/server/default/tmp/sessions"/> + <delete dir="${jboss.home}/server/default/work/jboss.web/localhost/${project.name}"/> </target> - + </project>

16 years, 2 months

1
0
0 / 0

Seam SVN: r9425 - trunk/seam-gen/ide-project-files/idea.

by seam-commits＠lists.jboss.org

Author: dan.j.allen Date: 2008-10-25 03:19:58 -0400 (Sat, 25 Oct 2008) New Revision: 9425 Modified: trunk/seam-gen/ide-project-files/idea/module.iml trunk/seam-gen/ide-project-files/idea/project.ipr Log: include support for local database connection Modified: trunk/seam-gen/ide-project-files/idea/module.iml =================================================================== --- trunk/seam-gen/ide-project-files/idea/module.iml 2008-10-24 21:42:54 UTC (rev 9424) +++ trunk/seam-gen/ide-project-files/idea/module.iml 2008-10-25 07:19:58 UTC (rev 9425) @@ -18,10 +18,7 @@ <setting name="EXPLODED_ENABLED" value="false" /> <setting name="JAR_URL" value="file://" /> <setting name="JAR_ENABLED" value="false" /> - <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" /> <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" /> - <setting name="RUN_JASPER_VALIDATION" value="true" /> - <setting name="BUILD_ONLY_WEB_RESOURCES" value="false" /> </building> <packaging> <containerElement type="module" name="@projectName@"> @@ -39,15 +36,13 @@ <setting name="validation-enabled" value="true" /> <setting name="provider-name" value="Hibernate" /> <datasource-mapping> - <factory-entry name="@projectName@"/> + <factory-entry name="@projectName@" value="86c824fb-f41b-4fd1-986c-be634e7b9cfc" /> </datasource-mapping> <deploymentDescriptor name="persistence.xml" url="file://$MODULE_DIR$/resources/META-INF/persistence-dev-war.xml" optional="false" version="1.0" /> </configuration> </facet> <facet type="Seam" name="Seam"> - <configuration> - <setting name="validation-enabled" value="true" /> - </configuration> + <configuration /> </facet> </component> <component name="NewModuleRootManager" inherit-compiler-output="false"> Modified: trunk/seam-gen/ide-project-files/idea/project.ipr =================================================================== --- trunk/seam-gen/ide-project-files/idea/project.ipr 2008-10-24 21:42:54 UTC (rev 9424) +++ trunk/seam-gen/ide-project-files/idea/project.ipr 2008-10-25 07:19:58 UTC (rev 9425) @@ -30,6 +30,24 @@ <entry name="?*.ftl" /> </wildcardResourcePatterns> </component> + <component name="DataSourceManagerImpl"> + <DataSource DataSourceSourceName="LOCAL"> + <option name="DRIVER_CLASS" value="@driverClass@" /> + <option name="DATABASE_URL" value="@jdbcUrl@" /> + <option name="DRIVER_PATH" /> + <option name="DATBASE_USERNAME" value="@username@" /> + <option name="ENCODED_DATABASE_PASSWORD" value="" /> + <option name="DEFAULT_SCHEMA_NAME" /> + <option name="TABLE_PATTERN" value="" /> + <option name="UUID" value="86c824fb-f41b-4fd1-986c-be634e7b9cfc" /> + <option name="NAME" value="@projectName@Datasource" /> + <libraries> + <library> + <url>jar://$PROJECT_DIR$/lib/@driverJar@!/</url> + </library> + </libraries> + </DataSource> + </component> <component name="DependenciesAnalyzeManager"> <option name="myForwardDirection" value="false" /> </component> @@ -229,7 +247,7 @@ <module fileurl="file://$PROJECT_DIR$/@projectName@.iml" filepath="$PROJECT_DIR$/@projectName@.iml" /> </modules> </component> - <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="JDK 6" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/classes" /> </component> <component name="RmicSettings">

16 years, 2 months

1
0
0 / 0

Seam SVN: r9424 - in branches/community/Seam_2_0/examples: wiki/src/main/org/jboss/seam/wiki/core/ui and 1 other directory.

by seam-commits＠lists.jboss.org

Author: danielc.roth Date: 2008-10-24 17:42:54 -0400 (Fri, 24 Oct 2008) New Revision: 9424 Modified: branches/community/Seam_2_0/examples/ui/src/org/jboss/seam/example/ui/FilmConverter.java branches/community/Seam_2_0/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/Converters.java Log: Conform test failing with JBSEAM-2402 restriction Modified: branches/community/Seam_2_0/examples/ui/src/org/jboss/seam/example/ui/FilmConverter.java =================================================================== --- branches/community/Seam_2_0/examples/ui/src/org/jboss/seam/example/ui/FilmConverter.java 2008-10-24 21:21:30 UTC (rev 9423) +++ branches/community/Seam_2_0/examples/ui/src/org/jboss/seam/example/ui/FilmConverter.java 2008-10-24 21:42:54 UTC (rev 9424) @@ -10,9 +10,12 @@ import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Transactional; +import org.jboss.seam.annotations.intercept.BypassInterceptors; + @Name("filmConverter") @org.jboss.seam.annotations.faces.Converter(forClass=Film.class) +@BypassInterceptors public class FilmConverter implements Converter, Serializable { Modified: branches/community/Seam_2_0/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/Converters.java =================================================================== --- branches/community/Seam_2_0/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/Converters.java 2008-10-24 21:21:30 UTC (rev 9423) +++ branches/community/Seam_2_0/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/Converters.java 2008-10-24 21:42:54 UTC (rev 9424) @@ -16,6 +16,7 @@ import org.jboss.seam.wiki.core.search.metamodel.SearchableEntity; import org.jboss.seam.wiki.core.upload.importers.metamodel.Importer; import org.jboss.seam.wiki.core.upload.importers.metamodel.ImporterRegistry; +import org.jboss.seam.annotations.intercept.BypassInterceptors; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; @@ -35,6 +36,7 @@ @Name("importerConverter") @org.jboss.seam.annotations.faces.Converter(forClass = Importer.class) + @BypassInterceptors public static class ImporterConverter implements Converter, Serializable { public Object getAsObject(FacesContext arg0, @@ -56,6 +58,7 @@ @Name("searchableEntityConverter") @org.jboss.seam.annotations.faces.Converter(forClass = SearchableEntity.class) + @BypassInterceptors public static class SearchableEntityConverter implements Converter, Serializable { public Object getAsObject(FacesContext arg0,

16 years, 2 months

1
0
0 / 0

Seam SVN: r9423 - in trunk/examples: wiki/src/main/org/jboss/seam/wiki/core/ui and 1 other directory.

by seam-commits＠lists.jboss.org

Author: danielc.roth Date: 2008-10-24 17:21:30 -0400 (Fri, 24 Oct 2008) New Revision: 9423 Modified: trunk/examples/ui/src/org/jboss/seam/example/ui/FilmConverter.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/Converters.java Log: Conform test failing with JBSEAM-2402 restriction Modified: trunk/examples/ui/src/org/jboss/seam/example/ui/FilmConverter.java =================================================================== --- trunk/examples/ui/src/org/jboss/seam/example/ui/FilmConverter.java 2008-10-24 15:20:59 UTC (rev 9422) +++ trunk/examples/ui/src/org/jboss/seam/example/ui/FilmConverter.java 2008-10-24 21:21:30 UTC (rev 9423) @@ -10,9 +10,11 @@ import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Transactional; +import org.jboss.seam.annotations.intercept.BypassInterceptors; @Name("filmConverter") @org.jboss.seam.annotations.faces.Converter(forClass=Film.class) +@BypassInterceptors public class FilmConverter implements Converter, Serializable { Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/Converters.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/Converters.java 2008-10-24 15:20:59 UTC (rev 9422) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/Converters.java 2008-10-24 21:21:30 UTC (rev 9423) @@ -10,6 +10,7 @@ import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; +import org.jboss.seam.annotations.intercept.BypassInterceptors; import org.jboss.seam.wiki.core.model.Role; import org.jboss.seam.wiki.core.search.metamodel.SearchRegistry; import org.jboss.seam.wiki.core.search.metamodel.SearchableEntity; @@ -23,7 +24,6 @@ @Name("converters") @Scope(ScopeType.APPLICATION) - public class Converters { public String[] getMonthNames() { @@ -32,6 +32,7 @@ @Name("searchableEntityConverter") @org.jboss.seam.annotations.faces.Converter(forClass = SearchableEntity.class) + @BypassInterceptors public static class SearchableEntityConverter implements Converter, Serializable { public Object getAsObject(FacesContext arg0, @@ -53,6 +54,7 @@ @Name("accessLevelConverter") @org.jboss.seam.annotations.faces.Converter(forClass = Role.AccessLevel.class) + @BypassInterceptors public static class AccessLevelConverter implements Converter, Serializable { public Object getAsObject(FacesContext arg0,

16 years, 2 months

1
0
0 / 0

Seam SVN: r9422 - trunk/src/main/org/jboss/seam.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-10-24 11:20:59 -0400 (Fri, 24 Oct 2008) New Revision: 9422 Modified: trunk/src/main/org/jboss/seam/Component.java Log: JBSEAM-3618 Modified: trunk/src/main/org/jboss/seam/Component.java =================================================================== --- trunk/src/main/org/jboss/seam/Component.java 2008-10-24 12:32:22 UTC (rev 9421) +++ trunk/src/main/org/jboss/seam/Component.java 2008-10-24 15:20:59 UTC (rev 9422) @@ -954,35 +954,40 @@ if ( log.isDebugEnabled() ) log.debug("interceptor stack: " + interceptors); } - public void addInterceptor(Interceptor interceptor) + public void addInterceptor(Object interceptorInstance) { try { - if (interceptor.isInterceptorEnabled()) - { - if (interceptor.getType()==InterceptorType.SERVER) - { - interceptors.add(interceptor); - } - else - { - clientSideInterceptors.add(interceptor); - } - } + addInterceptor(new Interceptor(interceptorInstance, this)); } catch (NoClassDefFoundError e) { - log.debug("Unable to load interceptor " + interceptor, e); + log.debug("Unable to load interceptor " + interceptorInstance.getClass(), e); } catch (TypeNotPresentException e) { - log.debug("Unable to load interceptor " + interceptor, e); + log.debug("Unable to load interceptor " + interceptorInstance.getClass(), e); } catch (Exception e) { - throw new IllegalArgumentException("Unable to load interceptor " + interceptor, e); + throw new IllegalArgumentException("Unable to load interceptor " + interceptorInstance.getClass(), e); } } + + public void addInterceptor(Interceptor interceptor) + { + if (interceptor.isInterceptorEnabled()) + { + if (interceptor.getType()==InterceptorType.SERVER) + { + interceptors.add(interceptor); + } + else + { + clientSideInterceptors.add(interceptor); + } + } + } private List<Interceptor> newSort(List<Interceptor> list) { @@ -1059,7 +1064,7 @@ { throw new IllegalArgumentException("Unable to load interceptor " + interceptorName, e); } - addInterceptor(new Interceptor(interceptorInstance, this)); + addInterceptor(interceptorInstance); } }

16 years, 2 months

1
0
0 / 0

Seam SVN: r9421 - trunk/src/main/org/jboss/seam.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-10-24 08:32:22 -0400 (Fri, 24 Oct 2008) New Revision: 9421 Modified: trunk/src/main/org/jboss/seam/Component.java Log: JBSEAM-3618 Modified: trunk/src/main/org/jboss/seam/Component.java =================================================================== --- trunk/src/main/org/jboss/seam/Component.java 2008-10-24 12:23:01 UTC (rev 9420) +++ trunk/src/main/org/jboss/seam/Component.java 2008-10-24 12:32:22 UTC (rev 9421) @@ -956,17 +956,32 @@ public void addInterceptor(Interceptor interceptor) { - if (interceptor.isInterceptorEnabled()) + try { - if (interceptor.getType()==InterceptorType.SERVER) + if (interceptor.isInterceptorEnabled()) { - interceptors.add(interceptor); + if (interceptor.getType()==InterceptorType.SERVER) + { + interceptors.add(interceptor); + } + else + { + clientSideInterceptors.add(interceptor); + } } - else - { - clientSideInterceptors.add(interceptor); - } } + catch (NoClassDefFoundError e) + { + log.debug("Unable to load interceptor " + interceptor, e); + } + catch (TypeNotPresentException e) + { + log.debug("Unable to load interceptor " + interceptor, e); + } + catch (Exception e) + { + throw new IllegalArgumentException("Unable to load interceptor " + interceptor, e); + } } private List<Interceptor> newSort(List<Interceptor> list) @@ -1030,12 +1045,22 @@ { Class<?> clazz = Reflections.classForName(interceptorName); interceptorInstance = clazz.newInstance(); + } + catch (NoClassDefFoundError e) + { + log.debug("Unable to load interceptor " + interceptorName, e); + } + catch (TypeNotPresentException e) + { + log.debug("Unable to load interceptor " + interceptorName, e); + } catch (Exception e) { throw new IllegalArgumentException("Unable to load interceptor " + interceptorName, e); } addInterceptor(new Interceptor(interceptorInstance, this)); + } }

16 years, 2 months

1
0
0 / 0

Seam SVN: r9420 - trunk/src/main/org/jboss/seam/faces.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2008-10-24 08:23:01 -0400 (Fri, 24 Oct 2008) New Revision: 9420 Modified: trunk/src/main/org/jboss/seam/faces/Redirect.java Log: fixed NPE Modified: trunk/src/main/org/jboss/seam/faces/Redirect.java =================================================================== --- trunk/src/main/org/jboss/seam/faces/Redirect.java 2008-10-24 11:31:17 UTC (rev 9419) +++ trunk/src/main/org/jboss/seam/faces/Redirect.java 2008-10-24 12:23:01 UTC (rev 9420) @@ -104,6 +104,10 @@ public void captureCurrentView() { FacesContext context = FacesContext.getCurrentInstance(); + + // If this isn't a faces request then just return + if (context == null) return; + parameters = Pages.instance().getStringValuesFromPageContext(context); if (context.getExternalContext().getRequestParameterMap().containsKey("actionMethod"))

16 years, 2 months

1
0
0 / 0

Seam SVN: r9419 - branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/util.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2008-10-24 07:31:17 -0400 (Fri, 24 Oct 2008) New Revision: 9419 Modified: branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/util/Reflections.java Log: JBPAPP-1302 Modified: branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/util/Reflections.java =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/util/Reflections.java 2008-10-24 11:18:52 UTC (rev 9418) +++ branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/util/Reflections.java 2008-10-24 11:31:17 UTC (rev 9419) @@ -242,12 +242,22 @@ for (Method method: methods) { String methodName = method.getName(); - if ( methodName.matches("^(get|is).*") && method.getParameterTypes().length==0 ) + if ( method.getParameterTypes().length==0 ) { - if ( Introspector.decapitalize( methodName.substring(3) ).equals(name) ) + if ( methodName.startsWith("get") ) { - return method; + if ( Introspector.decapitalize( methodName.substring(3) ).equals(name) ) + { + return method; + } } + else if ( methodName.startsWith("is") ) + { + if ( Introspector.decapitalize( methodName.substring(2) ).equals(name) ) + { + return method; + } + } } } throw new IllegalArgumentException("no such getter method: " + clazz.getName() + '.' + name);

16 years, 2 months

1
0
0 / 0

Seam SVN: r9418 - branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/async.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2008-10-24 07:18:52 -0400 (Fri, 24 Oct 2008) New Revision: 9418 Modified: branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/async/Asynchronous.java Log: JBPAPP-1297 Modified: branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/async/Asynchronous.java =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/async/Asynchronous.java 2008-10-24 11:08:18 UTC (rev 9417) +++ branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/async/Asynchronous.java 2008-10-24 11:18:52 UTC (rev 9418) @@ -19,7 +19,7 @@ */ public abstract class Asynchronous implements Serializable { - private static final LogProvider log = Logging.getLogProvider(Asynchronous.class); + private static transient final LogProvider log = Logging.getLogProvider(Asynchronous.class); static final long serialVersionUID = -551286304424595765L; private Long processId;

16 years, 2 months

1
0
0 / 0

Seam SVN: r9417 - trunk/examples.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-10-24 07:08:18 -0400 (Fri, 24 Oct 2008) New Revision: 9417 Modified: trunk/examples/build.xml Log: Don't deploy .gpd files Modified: trunk/examples/build.xml =================================================================== --- trunk/examples/build.xml 2008-10-24 11:03:10 UTC (rev 9416) +++ trunk/examples/build.xml 2008-10-24 11:08:18 UTC (rev 9417) @@ -413,6 +413,7 @@ <include name="META-INF/security-rules.drl" /> <include name="META-INF/standard-jaxws-endpoint-config.xml" /> <include name="*.jpdl.xml" /> + <exclude name=".gpd*" /> </fileset>

16 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits October 2008