[jboss-cvs] jboss-seam/seam-gen ...

[Peter Muir]

  User: pmuir   
  Date: 08/01/04 16:57:17

  Modified:    seam-gen  build.xml
  Log:
  JBSEAM-1475
  
  Revision  Changes    Path
  1.128     +35 -32    jboss-seam/seam-gen/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/seam-gen/build.xml,v
  retrieving revision 1.127
  retrieving revision 1.128
  diff -u -b -r1.127 -r1.128
  --- build.xml	1 Dec 2007 18:16:57 -0000	1.127
  +++ build.xml	4 Jan 2008 21:57:17 -0000	1.128
  @@ -86,27 +86,17 @@
   		</condition>
           
           <condition property="base.dir" value="icefaces-staging" else=".">
  -             <and>
  -                 <isset property="icefaces.home"/>
  -                 <not><equals arg1="${icefaces.home}" arg2=""/></not>
  -             </and>
  +            <equals arg1="${icefaces}" arg2="y"/>
           </condition>
   
           <condition property="icefaces.lib" value="${icefaces.home}/lib" else="../lib">
  -             <and>
  -                 <isset property="icefaces.home"/>
  -                 <not><equals arg1="${icefaces.home}" arg2=""/></not>
  -             </and>
  +            <equals arg1="${icefaces}" arg2="y"/>
            </condition>
   
            <condition property="icefaces.property">
  -             <and>
  -                 <isset property="icefaces.home"/>
  -                 <not><equals arg1="${icefaces.home}" arg2=""/></not>
  -             </and>
  +            <equals arg1="${icefaces}" arg2="y"/>
            </condition>
            
  -
           <filterset id="jdbc">
               <filter token="jdbcUrl" value="${hibernate.connection.url}"/>
               <filter token="driverClass" value="${hibernate.connection.driver_class}"/>
  @@ -177,6 +167,12 @@
           <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}" />
  +
           <property name="old.richfaces.skin" value="blueSky"/>
           <input addproperty="richfaces.skin.new" 
                      message="Select a RichFaces skin (not applicable if using ICEFaces) [${old.richfaces.skin}]" 
  @@ -412,12 +408,6 @@
           </condition>
           -->
           
  -        <property name="old.icefaces.home" value=""/>
  -        <input addproperty="icefaces.home.new"
  -                   message="Enter your ICEfaces home directory (leave blank to omit ICEfaces) [${old.icefaces.home}]"
  -              defaultvalue="${old.icefaces.home}"/>
  -        <pathFixer property="icefaces.home.new" />
  -
           <delete file="build.properties"/>
           <propertyfile file="build.properties" comment="Generated by seam setup">
               <entry key="workspace.home" value="${workspace.home.new}"/>
  @@ -425,7 +415,7 @@
               <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.home" value="${icefaces.home.new}"/>
  +            <entry key="icefaces" value="${icefaces.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}"/>
  @@ -571,7 +561,7 @@
   
   
   
  -    <target name="copy-lib" depends="copyseam, copyseamdependencies, copyjbossembedded">
  +    <target name="copy-lib" depends="copyseam, copyseamdependencies, copyjbossembedded, copy-icefaces">
           <echo message="Copying Seam and depdencies to the ${project.home}/lib directory..." />
       	
           <copy todir="${project.home}/lib" overwrite="true">
  @@ -584,12 +574,6 @@
               	<exclude name="test/jboss-embedded-api.jar" />
               </fileset>
               <fileset file="${driver.jar}"/>
  -            <fileset dir="${icefaces.lib}" >
  -                <include name="icefaces*.jar" if="icefaces.property"/>
  -                <include name="backport-util-concurrent.jar" if="icefaces.property"/>
  -                <include name="commons-fileupload.jar" if="icefaces.property"/>
  -                <include name="commons-digester.jar" if="icefaces.property"/>
  -            </fileset>
           </copy>
   
           <echo message="Copying JBoss Embedded configuration to the ${project.home}/bootstrap directory..." />
  @@ -599,6 +583,25 @@
           
       </target>
   	
  +	<target name="copy-icefaces" if="icefaces.property">
  +		<artifact:dependencies filesetId="icefaces.fileset" versionsId="icefaces.versions">
  +			<dependency groupId="org.icefaces" artifactId="icefaces" version="1.6.1">
  +				<exclusion groupId="javax.el" artifactId="el-api" />
  +			</dependency>
  +			<dependency groupId="org.icefaces" artifactId="icefaces-comps" version="1.6.1">
  +				<exclusion groupId="javax.el" artifactId="el-api" />
  +			</dependency>
  +			<dependency groupId="org.icefaces" artifactId="icefaces-facelets" version="1.6.1">
  +				<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="file-copy-war" if="project.war">
           <echo message="Copying resources needed for WAR deployment to the ${project.home}/resources directory..." />
   
  @@ -1175,7 +1178,7 @@
               description="Print the settings">
           <echo message="Java project workspace: ${workspace.home}"/>
           <echo message="JBoss home: ${jboss.home}"/>
  -        <echo message="IceFaces home: ${icefaces.home}"/>
  +        <echo message="IceFaces: ${icefaces}"/>
           <echo message="Project name: ${project.name}"/>
           <echo message="Project type: ${project.type}"/>
           <echo message="Hibernate dialect: ${hibernate.dialect}"/>