[jboss-cvs] jboss-seam/seam-gen ...
Michael Yuan
michael.yuan at jboss.com
Tue Jul 17 11:58:55 EDT 2007
User: myuan
Date: 07/07/17 11:58:55
Modified: seam-gen build.xml
Log:
remove icefaces
Revision Changes Path
1.90 +13 -134 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.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- build.xml 16 Jul 2007 00:51:50 -0000 1.89
+++ build.xml 17 Jul 2007 15:58:54 -0000 1.90
@@ -78,12 +78,6 @@
<not><isset property="hibernate.default_catalog"/></not>
</condition>
- <condition property="icefaces.home" value="
 <property name="icefaces.home" value="${icefaces.home}"/>">
- <isset property="icefaces.home"/>
- </condition>
- <condition property="icefaces.home" value="">
- <not><isset property="icefaces.home"/></not>
- </condition>
<filterset id="jdbc">
<filter token="jdbcUrl" value="${hibernate.connection.url}"/>
<filter token="driverClass" value="${hibernate.connection.driver_class}"/>
@@ -118,18 +112,6 @@
<exclude name="**/*.ftl"/>
</fileset>
- <!-- have to define a fileset for icefaces-view jag 25-05-07 -->
- <fileset id="icefaces-view" dir="${basedir}/icefaces/view">
- <include name="home.xhtml"/>
- <include name="error.xhtml"/>
- <include name="login.xhtml"/>
- <include name="login.page.xml"/>
- <include name="index.html"/>
- <include name="layout/*"/>
- <include name="stylesheet/*"/>
- <exclude name="**/*.ftl"/>
- </fileset>
-
<fileset id="seam" dir="../">
<include name="jboss-seam*.jar"/>
<exclude name="jboss-seam-gen.jar"/>
@@ -161,23 +143,14 @@
description="Prompt for settings">
<property file="${basedir}/build.properties" prefix="old" />
- <!-- next 2 lines new jag May 25-07 -->
- <echo message="Welcome to seam-gen"/>
- <echo message=" (leave icefaces directory blank if non-ICEFaces application)"/>
+ <echo message="Welcome to seam-gen :-)"/>
<property name="old.workspace.home" value="C:/Projects"/>
<input addproperty="workspace.home.new"
message="Enter your Java project workspace (the directory that contains your Seam projects) [${old.workspace.home}]"
defaultvalue="${old.workspace.home}"/>
<pathFixer property="workspace.home.new" />
- <!-- next 5 lines new jag 25-05-07 -->
- <property name="old.icefaces.home" value=""/>
- <input addproperty="icefaces.home.new"
- message="If you want to generate your view using IceFaces components, enter your icefaces home directory (SeamGen will generate a view using RichFaces components if you leave it blank)"
- defaultvalue="${old.icefaces.home}"/>
- <pathFixer property="icefaces.home.new" />
-
- <property name="old.jboss.home" value="C:/Servers/EJB3jboss-4.0.5.GA"/>
+ <property name="old.jboss.home" value="C:/Program Files/jboss-4.2.0.GA"/>
<input addproperty="jboss.home.new"
message="Enter your JBoss home directory [${old.jboss.home}]"
defaultvalue="${old.jboss.home}"/>
@@ -379,13 +352,11 @@
<equals arg1="${hibernate.default_catalog.new}" arg2=""/>
</condition>
- <!-- added icefaces.home property to be read in from properties file either has value or is blank -->
<propertyfile file="build.properties">
<entry key="workspace.home" value="${workspace.home.new}"/>
<entry key="project.name" value="${project.name.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="action.package" value="${action.package.new}"/>
<entry key="model.package" value="${model.package.new}"/>
<entry key="test.package" value="${test.package.new}"/>
@@ -504,15 +475,9 @@
</target>
- <!-- if icefaces then we want to copy over the icefaces jars & not the jsf-facelets or ajax4jsf jars -->
- <!-- next 3 targets have changed or are new jag 25-05-2007 -->
- <target name="copy-lib" depends="icefacesCheck, copy-lib-icefaces, copy-lib-regular">
- <echo message="Copying Seam jars to the ${project.home}/lib directory..." />
-
- </target>
- <target name="copy-lib-regular" unless="icefaces.property">
- <echo message="not an icefaces project"/>
+ <target name="copy-lib">
+ <echo message="Copying Seam jars to the ${project.home}/lib directory..." />
<copy todir="${project.home}/lib" overwrite="true">
<fileset dir="../lib"/>
@@ -528,31 +493,6 @@
</target>
- <target name="copy-lib-icefaces" if="icefaces.property">
- <echo message="This is an icefaces project"/>
- <copy todir="${project.home}/lib" overwrite="true">
- <fileset dir="../lib">
- <exclude name="jsf-facelets.jar" />
- <exclude name="ajax4jsf*.jar" />
- </fileset>
- <fileset dir="../drools/lib"/>
- <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"/>
- </fileset>
- <fileset refid="seam"/>
- <fileset file="${driver.jar}"/>
- </copy>
-
- <echo message="Copying JBoss Embedded configuration to the ${project.home}/bootstrap directory..." />
- <copy todir="${project.home}/bootstrap" overwrite="true">
- <fileset dir="../bootstrap" />
- </copy>
-
- </target>
-
<target name="file-copy-war" if="project.war">
<echo message="Copying resources needed for WAR deployment to the ${project.home}/resources directory..." />
@@ -603,8 +543,7 @@
</copy>
</target>
- <!-- added target file-copy-icefaces -->
- <target name="file-copy" depends="file-copy-war,file-copy-ear,setup-filters, file-copy-icefaces">
+ <target name="file-copy" depends="file-copy-war,file-copy-ear,setup-filters">
<copy todir="${project.home}/resources">
<fileset dir="${basedir}/resources/">
@@ -703,45 +642,6 @@
</target>
- <!-- next 2 targets new jag 25-05-07 -->
- <target name="file-copy-icefaces" depends="icefacesCheck, copy-images" if="icefaces.property">
- <copy todir="${project.home}/src/${action.dir}" file="${basedir}/icefaces/src/TimerBean.java" >
- <filterset refid="filters"/>
- </copy>
- <copy todir="${project.home}/src/${action.dir}" file="${basedir}/icefaces/src/TimerBeanImpl.java">
- <filterset refid="filters"/>
- </copy>
- <copy todir="${project.home}/resources" overwrite="true">
- <fileset dir="${basedir}/icefaces/resources/">
- <include name="components.properties"/>
- <include name="META-INF/application.xml"/>
- <include name="WEB-INF/components.xml"/>
- <include name="WEB-INF/web.xml"/>
- <include name="WEB-INF/faces-config.xml"/>
- </fileset>
- <filterset refid="project"/>
- <filterset refid="jdbc"/>
- </copy>
- <copy todir="${project.home}" overwrite="true">
- <fileset dir="${basedir}/icefaces/build-scripts">
- <include name="build*.xml"/>
- </fileset>
- <filterset refid="project"/>
- </copy>
- <copy todir="${project.home}/view" overwrite="true">
- <fileset refid="icefaces-view"/>
- <filterset refid="project"/>
- </copy>
-
- </target>
-
- <target name="copy-images" if="icefaces.property">
- <copy todir="${project.home}/view/img" overwrite="true">
- <fileset file="${basedir}/icefaces/view/img/*"/>
- </copy>
- </target>
-
-
<target name="validate-project" depends="init-properties, validate-workspace">
<fail message="No project name specified (run 'seam new-project' first)">
<condition>
@@ -911,7 +811,7 @@
<echo message="Type 'seam restart' and go to http://localhost:8080/${project.name}/${masterPage.name}.seam"/>
</target>
- <target name="generate-entities" depends="validate-project, icefacesCheck"
+ <target name="generate-entities" depends="validate-project"
description="Reverse engineer entities from the database">
<echo message="Reverse engineering database using JDBC driver ${driver.jar}"/>
@@ -929,8 +829,7 @@
<echo>project=${project.home}</echo>
<echo>model=${model.package}</echo>
- <!-- <hibernate templatepath="."> -->
- <hibernate templatepath="${view.dir}">
+ <hibernate templatepath=".">
<jdbcconfiguration propertyfile="build.properties"
packagename="${model.package}"
revengfile="${project.home}/resources/seam-gen.reveng.xml"
@@ -996,9 +895,7 @@
<echo message="Type 'seam restart' and go to http://localhost:8080/${project.name}"/>
</target>
- <target name="generate-icefaces" depends="icefacesCheck" if="icefaces.property">
- </target>
<target name="deploy" depends="validate-project"
description="Deploy the EAR or WAR">
<echo message="Deploying project '${project.name}' to JBoss" />
@@ -1062,23 +959,5 @@
<target name="help">
<print file="README"/>
</target>
- <target name="icefacesCheck" depends="cond-if,cond-else"/>
- <target name="check-icefaces">
- <condition property="icefaces.property">
- <and>
- <isset property="icefaces.home"/>
- <not><equals arg1="${icefaces.home}" arg2=""/></not>
- </and>
- </condition>
- <echo message=" icefaces.property is ${icefaces.property}"/>
- </target>
- <target name="cond-if" depends="check-icefaces" if="icefaces.property">
- <property name="view.dir" value="icefaces/."/>
- <echo message="is icefaces and view.dir is ${view.dir}"/>
- </target>
- <target name="cond-else" depends="check-icefaces" unless="icefaces.property">
- <property name="view.dir" value="."/>
- <echo message="not icefaces and view.dir is ${view.dir}"/>
- </target>
</project>
More information about the jboss-cvs-commits
mailing list