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

[Peter Muir]

  User: pmuir   
  Date: 08/01/09 08:22:57

  Modified:    seam-gen  build.xml
  Log:
  icefaces improvements
  
  Revision  Changes    Path
  1.130     +38 -3     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.129
  retrieving revision 1.130
  diff -u -b -r1.129 -r1.130
  --- build.xml	8 Jan 2008 16:18:36 -0000	1.129
  +++ build.xml	9 Jan 2008 13:22:56 -0000	1.130
  @@ -90,13 +90,27 @@
           </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}"/>
  @@ -173,6 +187,15 @@
   	    	     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>
  @@ -420,6 +443,7 @@
               <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}"/>
  @@ -565,7 +589,7 @@
   
   
   
  -    <target name="copy-lib" depends="copyseam, copyseamdependencies, copyjbossembedded, copy-icefaces">
  +    <target name="copy-lib" depends="copyseam, copyseamdependencies, copyjbossembedded, copy-icefaces-home, copy-icefaces-maven">
           <echo message="Copying Seam and depdencies to the ${project.home}/lib directory..." />
       	
           <copy todir="${project.home}/lib" overwrite="true">
  @@ -587,7 +611,7 @@
           
       </target>
   	
  -	<target name="copy-icefaces" if="icefaces.property">
  +	<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.6.1">
   				<exclusion groupId="javax.el" artifactId="el-api" />
  @@ -606,6 +630,17 @@
   		</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..." />