Author: manaRH Date: 2008-08-21 03:06:34 -0400 (Thu, 21 Aug 2008) New Revision: 8755 Modified: branches/Seam_2_0_FP/seam-gen/build.xml Log: JBPAPP-1109 Modified: branches/Seam_2_0_FP/seam-gen/build.xml =================================================================== --- branches/Seam_2_0_FP/seam-gen/build.xml 2008-08-20 18:50:48 UTC (rev 8754) +++ branches/Seam_2_0_FP/seam-gen/build.xml 2008-08-21 07:06:34 UTC (rev 8755) @@ -90,29 +90,7 @@ <condition property="base.dir" value="icefaces-staging" else="."> <equals arg1="${icefaces}" arg2="y"/> </condition> - - <condition property="icefaces.lib" value="${icefaces.home}/lib" else="../lib"> - <and> - <equals arg1="${icefaces}" arg2="y"/> - <not> - <equals arg1="${icefaces.home}" arg2=""/> - </not> - </and> - </condition> - - <condition property="icefaces.property"> - <equals arg1="${icefaces}" arg2="y"/> - </condition> - - <condition property="icefaces.lib.property"> - <and> - <equals arg1="${icefaces}" arg2="y"/> - <not> - <equals arg1="${icefaces.home}" arg2=""/> - </not> - </and> - </condition> - + <filterset id="jdbc"> <filter token="jdbcUrl" value="${hibernate.connection.url}"/> <filter token="driverClass" value="${hibernate.connection.driver_class}"/> @@ -128,7 +106,6 @@ <filterset id="project"> <filter token="projectName" value="${project.name}" /> <filter token="jbossHome" value="${jboss.home}" /> - <filter token="iceHome" value="${icefaces.home}" /> <filter token="hbm2ddl" value="${hibernate.hbm2ddl.auto}"/> <filter token="driverJar" value="${driver.file}"/> <filter token="skin" value="${richfaces.skin}" /> @@ -181,27 +158,8 @@ message="Enter the project name [${old.project.name}]" defaultvalue="${old.project.name}"/> <normalizeProjectName property="project.name.new" /> - <echo message="Accepted project name as: ${project.name.new}" /> - - <property name="old.icefaces" value="n"/> - <input addproperty="icefaces.new" - message="Do you want to use ICEFaces instead of RichFaces [${old.icefaces}]" - validargs="y,n" - defaultvalue="${old.icefaces}" /> - - <condition property="icefaces.home.new" value=""> - <equals arg1="${icefaces.new}" arg2="n"/> - </condition> - - <property name="old.icefaces.home" value="" /> - <input addproperty="icefaces.home.new" - message="By default, seam-gen will download the recommended ICEFaces. If you want to use a specific version of ICEFaces, enter the path to icefaces here [${old.icefaces.home}]" - defaultvalue="${old.icefaces.home}" /> - - <condition property="richfaces.skin.new" value=""> - <equals arg1="${icefaces.new}" arg2="y"/> - </condition> - + <echo message="Accepted project name as: ${project.name.new}" /> + <property name="old.richfaces.skin" value="blueSky"/> <input addproperty="richfaces.skin.new" message="Select a RichFaces skin [${old.richfaces.skin}]" @@ -444,8 +402,6 @@ <entry key="richfaces.skin" value="${richfaces.skin.new}"/> <entry key="project.type" value="${project.type.new}"/> <entry key="jboss.home" value="${jboss.home.new}"/> - <entry key="icefaces" value="${icefaces.new}"/> - <entry key="icefaces.home" value="${icefaces.home.new}"/> <entry key="action.package" value="${action.package.new}"/> <entry key="model.package" value="${model.package.new}"/> <entry key="test.package" value="${test.package.new}"/> @@ -470,32 +426,6 @@ <echo message="Type 'seam create-project' to create the new project"/> </target> - - <target name="icefaces-staging-copy" if="icefaces.property"> - <echo message="Set up the icefaces directory"/> - <copy todir="icefaces-staging"> - <fileset dir="."> - <include name="build-scripts/**"/> - <include name="hibernatetools/**"/> - <include name="lib/**"/> - <include name="resources/**"/> - <include name="pojo/**"/> - <include name="src/**"/> - <include name="test/**"/> - <include name="view/**"/> - <include name="nbproject/**"/> - <include name="util/**"/> - </fileset> - </copy> - <copy todir="icefaces-staging" overwrite="true"> - <fileset dir="icefaces"> - <include name="build-scripts/**"/> - <include name="resources/**"/> - <include name="src/**"/> - <include name="view/**"/> - </fileset> - </copy> - </target> <target name="action-input" depends="init"> @@ -601,14 +531,11 @@ - <target name="copy-lib" depends="copyseam, copyseamdependencies, copyjbossembedded, copy-icefaces-home, copy-icefaces-maven"> + <target name="copy-lib" depends="copyseam, copyseamdependencies, copyjbossembedded"> <echo message="Copying Seam and depdencies to the ${project.home}/lib directory..." /> <copy todir="${project.home}/lib" overwrite="true"> <fileset dir="../lib"> - <exclude name="jsf-facelets.jar" if="icefaces.property"/> - <exclude name="ajax4jsf*.jar" if="icefaces.property"/> - <exclude name="richfaces*.jar" if="icefaces.property"/> <exclude name="jboss-container.jar" /> <exclude name="test/jboss-deplyers.jar" /> <exclude name="test/jboss-embedded-api.jar" /> @@ -623,38 +550,8 @@ <fileset dir="../bootstrap" /> </copy> - </target> + </target> - <target name="copy-icefaces-maven" if="icefaces.property" unless="icefaces.lib.property"> - <artifact:dependencies filesetId="icefaces.fileset" versionsId="icefaces.versions"> - <dependency groupId="org.icefaces" artifactId="icefaces" version="1.7.0"> - <exclusion groupId="javax.el" artifactId="el-api" /> - </dependency> - <dependency groupId="org.icefaces" artifactId="icefaces-comps" version="1.7.0"> - <exclusion groupId="javax.el" artifactId="el-api" /> - </dependency> - <dependency groupId="org.icefaces" artifactId="icefaces-facelets" version="1.7.0"> - <exclusion groupId="javax.el" artifactId="el-api" /> - </dependency> - <remoteRepository refId="repository.jboss.org" /> - </artifact:dependencies> - <copy todir="${project.home}/lib" overwrite="true"> - <fileset refid="icefaces.fileset" /> - <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${icefaces.versions}" to="flatten" /> - </copy> - </target> - - <target name="copy-icefaces-home" if="icefaces.lib.property"> - <copy todir="${project.home}/lib" overwrite="true"> - <fileset dir="${icefaces.lib}" > - <include name="icefaces*.jar"/> - <include name="backport-util-concurrent.jar"/> - <include name="commons-fileupload.jar"/> - <include name="commons-digester.jar"/> - </fileset> - </copy> - </target> - <target name="file-copy-war" if="project.war"> <echo message="Copying resources needed for WAR deployment to the ${project.home}/resources directory..." /> @@ -813,7 +710,6 @@ <copy todir="${project.home}/src/${action.dir}"> <fileset dir="${base.dir}/src/"> <include name="Authenticator.java"/> - <include name="Timer*.java" if="icefaces.property"/> </fileset> <filterset refid="filters"/> </copy> @@ -881,7 +777,7 @@ <!-- Do not remove new-project, netbeans depends on it --> <target name="new-project" depends="create-project" /> - <target name="create-project" depends="validate-project,icefaces-staging-copy,copy-lib,file-copy" + <target name="create-project" depends="validate-project,copy-lib,file-copy" description="Create a new project"> <echo message="A new Seam project named '${project.name}' was created in the ${workspace.home} directory"/> <echo message="Type 'seam explode' and go to http://localhost:8080/${project.name}"/> @@ -1246,7 +1142,6 @@ description="Print the settings"> <echo message="Java project workspace: ${workspace.home}"/> <echo message="JBoss home: ${jboss.home}"/> - <echo message="IceFaces: ${icefaces}"/> <echo message="Project name: ${project.name}"/> <echo message="Project type: ${project.type}"/> <echo message="Hibernate dialect: ${hibernate.dialect}"/>