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

Gavin King gavin.king at jboss.com
Mon Nov 6 20:53:57 EST 2006


  User: gavin   
  Date: 06/11/06 20:53:56

  Modified:    seam-gen  build.xml
  Log:
  refresh
  
  Revision  Changes    Path
  1.24      +530 -538  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.23
  retrieving revision 1.24
  diff -u -b -r1.23 -r1.24
  --- build.xml	6 Nov 2006 22:18:20 -0000	1.23
  +++ build.xml	7 Nov 2006 01:53:56 -0000	1.24
  @@ -28,11 +28,18 @@
   		<filter token="password" value="${hibernate.connection.password}"/>
       </filterset>
   
  +    <filterset id="project">
  +        <filter token="projectName" value="${project.name}" />
  +        <filter token="jbossHome" value="${jboss.home}" />
  +    </filterset>
  +    
   	<packageDirectory property="action.dir" package="${action.package}"/>
   	<packageDirectory property="model.dir" package="${model.package}"/>
   	<packageDirectory property="mdb.dir" package="${mdb.package}"/>
   	<packageDirectory property="test.dir" package="${test.package}"/>
   	
  +    <property name="project.home" value="${workspace.home}/${project.name}"/>
  +    
   	<target name="action-input">
   		
   		<input addproperty="component.name" message="Enter the Seam component name"/>
  @@ -57,11 +64,11 @@
   			addproperty="page.name" 
             defaultvalue="${page.name.default}"/>
   			
  -		<property name="bean.file" value="${workspace.home}/${project.name}/src/${action.dir}/${bean.name}.java"/>
  -		<property name="interface.file" value="${workspace.home}/${project.name}/src/${action.dir}/${interface.name}.java"/>
  -		<property name="page.file" value="${workspace.home}/${project.name}/view/${page.name}.xhtml"/>
  -		<property name="test.file" value="${workspace.home}/${project.name}/src/${test.dir}/${interface.name}Test.java"/>
  -		<property name="testng.file" value="${workspace.home}/${project.name}/src/${test.dir}/testng.xml"/>
  +        <property name="bean.file" value="${project.home}/src/${action.dir}/${bean.name}.java"/>
  +        <property name="interface.file" value="${project.home}/src/${action.dir}/${interface.name}.java"/>
  +        <property name="page.file" value="${project.home}/view/${page.name}.xhtml"/>
  +        <property name="test.file" value="${project.home}/src/${test.dir}/${interface.name}Test.java"/>
  +        <property name="testng.file" value="${project.home}/src/${test.dir}/testng.xml"/>
   
   	</target>
   	
  @@ -80,11 +87,11 @@
   			addproperty="page.name" 
             defaultvalue="${page.name.default}"/>
   				
  -		<property name="entity.file" value="${workspace.home}/${project.name}/src/${action.dir}/${entity.name}.java"/>
  -		<property name="home.file" value="${workspace.home}/${project.name}/src/${action.dir}/${entity.name}Home.java"/>
  -		<property name="list.file" value="${workspace.home}/${project.name}/src/${action.dir}/${entity.name}List.java"/>
  -		<property name="page.file" value="${workspace.home}/${project.name}/view/${page.name}.xhtml"/>
  -		<property name="masterPage.file" value="${workspace.home}/${project.name}/view/${masterPage.name}.xhtml"/>
  +        <property name="entity.file" value="${project.home}/src/${action.dir}/${entity.name}.java"/>
  +        <property name="home.file" value="${project.home}/src/${action.dir}/${entity.name}Home.java"/>
  +        <property name="list.file" value="${project.home}/src/${action.dir}/${entity.name}List.java"/>
  +        <property name="page.file" value="${project.home}/view/${page.name}.xhtml"/>
  +        <property name="masterPage.file" value="${project.home}/view/${masterPage.name}.xhtml"/>
   
   	</target>
   	
  @@ -110,72 +117,67 @@
   	
   	<target name="create-folders">
   		<echo message="Creating Project Folders ..." />
  -		<mkdir dir="${workspace.home}/${project.name}" />
  -		<mkdir dir="${workspace.home}/${project.name}/exploded-archives/${project.name}.ear" />
  -		<mkdir dir="${workspace.home}/${project.name}/exploded-archives/${project.name}.war" />
  -		<mkdir dir="${workspace.home}/${project.name}/exploded-archives/${project.name}.jar" />
   	</target>
   
   	<target name="create-folders-wtp">
   		<echo message="Creating Project Folders ..." />
  -		<mkdir dir="${workspace.home}/${project.name}" />
  -		<mkdir dir="${workspace.home}/${project.name}EJB" />
  -		<mkdir dir="${workspace.home}/${project.name}Web" />
  +        <mkdir dir="${project.home}" />
  +        <mkdir dir="${project.home}EJB" />
  +        <mkdir dir="${project.home}Web" />
   	</target>
   
   	<target name="file-copy" depends="create-folders">
   		<echo message="Copying project jars and resources ..." />
  -		<copy todir="${workspace.home}/${project.name}/lib">
  -			<fileset dir="../lib/" />
  -			<fileset dir="../facelets/lib/" />
  +        
  +        <copy todir="${project.home}/lib">
  +            <fileset dir="../lib"/>
  +            <fileset dir="../facelets/lib"/>
   			<fileset dir="../">
  -				<include name="jboss-seam.jar" />
  -				<include name="jboss-seam-ui.jar" />
  -				<include name="jboss-seam-debug.jar" />
  +                <include name="jboss-seam.jar"/>
  +                <include name="jboss-seam-ui.jar"/>
  +                <include name="jboss-seam-debug.jar"/>
   			</fileset>
   		</copy>
  -		<copy todir="${workspace.home}/${project.name}/resources">
  +        
  +        <copy todir="${project.home}/resources">
   			<fileset dir="${basedir}/resources/">
   				<exclude name="META-INF/application-wtp.xml" />
   			</fileset>
  -			<filterset>
  -				<filter token="projectName" value="${project.name}" />
  -			</filterset>
  +            <filterset refid="project"/>
   		</copy>
  -		<move tofile="${workspace.home}/${project.name}/resources/${project.name}-ds.xml" 
  -			    file="${workspace.home}/${project.name}/resources/datasource-ds.xml">
  +        
  +        <move tofile="${project.home}/resources/${project.name}-ds.xml" 
  +                file="${project.home}/resources/datasource-ds.xml">
   			<filterset refid="jdbc"/>
   		</move>
  -		<copy todir="${workspace.home}/${project.name}/view">
  +        
  +        <copy todir="${project.home}/view">
   			<fileset dir="${basedir}/view">
   				<include name="home.xhtml"/>
   				<include name="index.html"/>
   				<include name="layout/*"/>
   				<include name="stylesheet/*"/>
   			</fileset>
  -			<filterset>
  -				<filter token="projectName" value="${project.name}" />
  -			</filterset>
  +            <filterset refid="project"/>
   		</copy>
  -		<copy todir="${workspace.home}/${project.name}/">
  -			<fileset dir="${basedir}/build-scripts/" />
  -				<filterset>
  -				<filter token="projectName" value="${project.name}" />
  -				<filter token="jbossHome" value="${jboss.home}" />
  -			</filterset>
  +        
  +        <copy todir="${project.home}">
  +            <fileset dir="${basedir}/build-scripts" />
  +            <filterset refid="project"/>
   		</copy>
  -		<copy todir="${workspace.home}/${project.name}/embedded-ejb">
  -			<fileset dir="../embedded-ejb/" />
  -			<filterset>
  -				<filter token="projectName" value="${project.name}" />
  -			</filterset>
  +        
  +        <copy todir="${project.home}/embedded-ejb">
  +            <fileset dir="../embedded-ejb" />
   		</copy>
  -		<mkdir dir="${workspace.home}/${project.name}/src"/>
  +        
  +        <mkdir dir="${project.home}/src"/>
  +        
   	</target>
   
   	<target name="file-copy-wtp" depends="create-folders-wtp">
   		<echo message="Copying project jars and resources ..." />
  -		<copy todir="${workspace.home}/${project.name}/lib">
  +        
  +        <copy todir="${project.home}/lib">
   			<fileset dir="../lib/" />
   			<fileset dir="../facelets/lib/" />
   			<fileset dir="../">
  @@ -184,7 +186,8 @@
   				<include name="jboss-seam-debug.jar" />
   			</fileset>
   		</copy>
  -		<copy todir="${workspace.home}/${project.name}EJB/ejbModule" overwrite="true">
  +        
  +        <copy todir="${project.home}EJB/ejbModule" overwrite="true">
   			<fileset dir="${basedir}/resources/">
   				<exclude name="WEB-INF/**" />
   				<exclude name="META-INF/application.xml" />
  @@ -194,71 +197,67 @@
   				<exclude name="datasource-ds.xml" />
   				<exclude name="messages*.properties" />
   			</fileset>
  -			<filterset>
  -				<filter token="projectName" value="${project.name}" />
  -			</filterset>
  +            <filterset refid="project"/>
   		</copy>
  -		<copy todir="${workspace.home}/${project.name}/EarContent" overwrite="true">
  +        
  +        <copy todir="${project.home}/EarContent" overwrite="true">
   			<fileset dir="${basedir}/resources">
   				<exclude name="WEB-INF/**" />
   				<exclude name="META-INF/ejb-jar.xml" />
   				<exclude name="META-INF/persistence.xml" />
   				<exclude name="META-INF/application.xml" />
   			</fileset>
  -			<filterset>
  -				<filter token="projectName" value="${project.name}" />
  -			</filterset>
  +            <filterset refid="project"/>
   		</copy>
  -		<move file="${workspace.home}/${project.name}/EarContent/META-INF/application-wtp.xml" 
  -			tofile="${workspace.home}/${project.name}/EarContent/META-INF/application.xml" />
  -		<copy todir="${workspace.home}/${project.name}/EarContent" overwrite="true">
  +        
  +        <move file="${project.home}/EarContent/META-INF/application-wtp.xml" 
  +            tofile="${project.home}/EarContent/META-INF/application.xml" />
  +            
  +        <copy todir="${project.home}/EarContent" overwrite="true">
   			<fileset dir="../lib">
   				<include name="jbpm-*.jar" />
   			</fileset>
  -			<fileset dir="../">
  +            <fileset dir="..">
   				<include name="jboss-seam.jar" />
   			</fileset>
   		</copy>
  +        
   		<move tofile="${jboss.home}/server/default/deploy/${project.name}-ds.xml" 
  -			    file="${workspace.home}/${project.name}/EarContent/datasource-ds.xml">
  +                file="${project.home}/EarContent/datasource-ds.xml">
   			<filterset refid="jdbc"/>
   		</move>
  -		<copy todir="${workspace.home}/${project.name}Web/WebContent">
  +        
  +        <copy todir="${project.home}Web/WebContent">
   			<fileset dir="${basedir}/view">
   				<include name="home.xhtml"/>
   				<include name="index.html"/>
   				<include name="layout/*"/>
   				<include name="stylesheet/*"/>
   			</fileset>
  -			<filterset>
  -				<filter token="projectName" value="${project.name}" />
  -			</filterset>
  +            <filterset refid="project"/>
   		</copy>
  -		<copy todir="${workspace.home}/${project.name}Web/WebContent/WEB-INF" overwrite="true">
  +        
  +        <copy todir="${project.home}Web/WebContent/WEB-INF" overwrite="true">
   			<fileset dir="${basedir}/resources/WEB-INF" />
  -			<filterset>
  -				<filter token="projectName" value="${project.name}" />
  -			</filterset>
  +            <filterset refid="project"/>
   		</copy>
  -		<copy todir="${workspace.home}/${project.name}Web/WebContent/WEB-INF/lib" overwrite="true">
  +        
  +        <copy todir="${project.home}Web/WebContent/WEB-INF/lib" overwrite="true">
   			<fileset dir="../facelets/lib" />
   			<fileset file="../jboss-seam-debug.jar" />
   			<fileset file="../jboss-seam-ui.jar" />
   			<fileset file="../jboss-seam-debug.jar" />
   		</copy>
  -		<copy todir="${workspace.home}/${project.name}/">
  -			<filterset>
  -				<filter token="projectName" value="${project.name}" />
  -				<filter token="jbossHome" value="${jboss.home}" />
  -			</filterset>
  -			<fileset dir="${basedir}/build-scripts-wtp/" />
  +        
  +        <copy todir="${project.home}">
  +            <fileset dir="${basedir}/build-scripts-wtp"/>
  +            <filterset refid="project"/>
   		</copy>
  -		<copy todir="${workspace.home}/${project.name}/embedded-ejb">
  -			<fileset dir="../embedded-ejb/" />
  -			<filterset>
  -				<filter token="projectName" value="${project.name}" />
  -			</filterset>
  +        
  +        <copy todir="${project.home}/embedded-ejb">
  +            <fileset dir="../embedded-ejb" />
   		</copy>
  +        
   	</target>
   	
   	<target name="set-default-project" depends="validate-project">
  @@ -299,38 +298,30 @@
   
   	<target name="update-project" depends="validate-project">
   		<echo message="Copying jars to project /lib directory ..." />
  -		<copy todir="${workspace.home}/${project.name}/lib" overwrite="true">
  -			<fileset dir="../lib/" />
  +        
  +        <copy todir="${project.home}/lib" overwrite="true">
  +            <fileset dir="../lib" />
   		</copy>
   
   		<echo message="Copying new components.xml to project ..." />
  -		<copy todir="${workspace.home}/${project.name}/resources/WEB-INF" overwrite="false" file="${basedir}/resources/WEB-INF/components.xml/" />
  +        <copy todir="${project.home}/resources/WEB-INF" overwrite="false" 
  +               file="${basedir}/resources/WEB-INF/components.xml/" />
   
   		<echo message="Copying ebmedded-ejb to project ..." />
  -		<copy todir="${workspace.home}/${project.name}/embedded-ejb" overwrite="true">
  -			<fileset dir="../embedded-ejb/" />
  -			<filterset>
  -				<filter token="projectName" value="${project.name}" />
  -			</filterset>
  -		</copy>
  -		<copy todir="${workspace.home}/${project.name}/embedded-ejb" overwrite="true">
  -			<fileset dir="${basedir}/resources/embedded-ejb/" />
  -			<filterset>
  -				<filter token="projectName" value="${project.name}" />
  -			</filterset>
  +        <copy todir="${project.home}/embedded-ejb" overwrite="true">
  +            <fileset dir="../embedded-ejb" />
   		</copy>
   
   		<echo message="Copying jbpm jars to project's exploded jar archive ..." />
  -		<copy todir="${workspace.home}/${project.name}/exploded-archives/${project.name}.jar" overwrite="true">
  +        <copy todir="${project.home}/exploded-archives/${project.name}.jar" overwrite="true">
   			<fileset dir="../lib">
   				<include name="jbpm-*.jar" />
   			</fileset>
   		</copy>
   
   		<echo message="Copying seam/jsf jars to project's exploded war archive ..." />
  -		<copy todir="${workspace.home}/${project.name}/exploded-archives/${project.name}.war/WEB-INF/lib" overwrite="true">
  +        <copy todir="${project.home}/exploded-archives/${project.name}.war/WEB-INF/lib" overwrite="true">
   			<fileset dir="../">
  -				<fileset file="jboss-seam-debug.jar" />
   				<include name="jboss-seam-ui.jar" />
   				<include name="jboss-seam-debug.jar" />
   			</fileset>
  @@ -342,17 +333,18 @@
   		</copy>
   
   		<echo message="Copying seam jar to project's exploded ear archive ..." />
  -		<copy todir="${workspace.home}/${project.name}/exploded-archives/${project.name}.ear" overwrite="true">
  +        <copy todir="${project.home}/exploded-archives/${project.name}.ear" overwrite="true">
   			<fileset dir="../">
   				<include name="jboss-seam.jar" />
   			</fileset>
   		</copy>
  +        
   		<echo message="'${project.name}' has been updated with the latest/seam jars" />
   	</target>
   
   	<target name="delete-project" depends="validate-project">
   		<echo message="Deleting the entire project's contents ..." />
  -		<delete dir="${workspace.home}/${project.name}" />
  +        <delete dir="${project.home}" />
   	</target>
   
   	<target name="new-action" depends="validate-project,action-input,setup-filters">
  @@ -372,7 +364,7 @@
   		<copy file="view/action.xhtml" tofile="${page.file}">
   			<filterset refid="filters"/>
   		</copy>
  -		<echo message="Go to http://localhost:8080/${project.name}/${page.name}.seam"/>
  +        <echo message="Type 'seam restart' and go to http://localhost:8080/${project.name}/${page.name}.seam"/>
   	</target>
   
   	<target name="new-form" depends="validate-project,action-input,setup-filters">
  @@ -387,7 +379,7 @@
   		<copy file="view/form.xhtml" tofile="${page.file}">
   			<filterset refid="filters"/>
   		</copy>
  -		<echo message="Go to http://localhost:8080/${project.name}/${page.name}.seam"/>
  +        <echo message="Type 'seam restart' and go to http://localhost:8080/${project.name}/${page.name}.seam"/>
   	</target>
   
   	<target name="new-conversation" depends="validate-project,action-input,setup-filters">
  @@ -401,7 +393,7 @@
   		<copy file="view/conversation.xhtml" tofile="${page.file}">
   			<filterset refid="filters"/>
   		</copy>
  -		<echo message="Go to http://localhost:8080/${project.name}/${page.name}.seam"/>
  +        <echo message="Type 'seam restart' and go to http://localhost:8080/${project.name}/${page.name}.seam"/>
   	</target>
   
   	<target name="new-entity" depends="validate-project,entity-input,setup-filters">
  @@ -421,32 +413,32 @@
   		<copy file="view/list.xhtml" tofile="${masterPage.file}">
   			<filterset refid="filters"/>
   		</copy>
  -		<echo message="Go to http://localhost:8080/${project.name}/${masterPage.name}.seam"/>
  +        <echo message="Type 'seam restart' and go to http://localhost:8080/${project.name}/${masterPage.name}.seam"/>
   	</target>
   
   	<target name="deploy" depends="validate-project">
   		<echo message="Deploying project '${project.name}' to JBoss" />
  -		<ant antfile="${workspace.home}/${project.name}/build.xml" target="deploy" inheritall="false"/>
  +        <ant antfile="${project.home}/build.xml" target="deploy" inheritall="false"/>
   	</target>
   
   	<target name="undeploy" depends="validate-project">
   		<echo message="Undeploying project '${project.name}'" />
  -		<ant antfile="${workspace.home}/${project.name}/build.xml" target="undeploy" inheritall="false"/>
  +        <ant antfile="${project.home}/build.xml" target="undeploy" inheritall="false"/>
   	</target>
   
   	<target name="explode" depends="validate-project">
   		<echo message="Deploying project '${project.name}' to JBoss as an exploded directory" />
  -		<ant antfile="${workspace.home}/${project.name}/build.xml" target="explode" inheritall="false"/>
  +        <ant antfile="${project.home}/build.xml" target="explode" inheritall="false"/>
   	</target>
   
   	<target name="restart" depends="validate-project">
   		<echo message="Restarting project '${project.name}'" />
  -		<ant antfile="${workspace.home}/${project.name}/build.xml" target="restart" inheritall="false"/>
  +        <ant antfile="${project.home}/build.xml" target="restart" inheritall="false"/>
   	</target>
   
   	<target name="unexplode" depends="validate-project">
   		<echo message="Undeploying exploded directory for project '${project.name}'" />
  -		<ant antfile="${workspace.home}/${project.name}/build.xml" target="unexplode" inheritall="false"/>
  +        <ant antfile="${project.home}/build.xml" target="unexplode" inheritall="false"/>
   	</target>
   	
   	<target name="help">
  @@ -550,7 +542,7 @@
   	</taskdef>
   	
   	<target name="generate-entities">
  -		<hibernatetool destdir="${workspace.home}/${project.name}/src">
  +        <hibernatetool destdir="${project.home}/src">
   			<jdbcconfiguration propertyfile="build.properties" packagename="${model.package}"/>
   			<hbm2java jdk5="true" ejb3="true"/> 
   		</hibernatetool>
  
  
  



More information about the jboss-cvs-commits mailing list