Author: manaRH Date: 2009-04-23 08:26:44 -0400 (Thu, 23 Apr 2009) New Revision: 10608 Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build-war.xml branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build.properties branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build.xml branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build.xml Log: JBPAPP-1915 Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build-war.xml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build-war.xml 2009-04-23 12:12:55 UTC (rev 10607) +++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build-war.xml 2009-04-23 12:26:44 UTC (rev 10608) @@ -21,7 +21,7 @@ <property name="classes.action.dir" value="${war.dir}/${action.dir}" /> <property name="test.dir" value="test-build" /> <property name="bootstrap.dir" value="${basedir}/bootstrap" /> - <property name="deploy.dir" value="${jboss.home}/server/${server.profile}/deploy" /> + <property name="deploy.dir" value="${jboss.home}/server/${jboss.domain}/deploy" /> <property name="war.deploy.dir" value="${deploy.dir}/${project.name}.war" /> <property name="testng.jar" value="${basedir}/lib/testng.jar" /> <property name="javac.debug" value="true" /> Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build.properties =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build.properties 2009-04-23 12:12:55 UTC (rev 10607) +++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build.properties 2009-04-23 12:26:44 UTC (rev 10608) @@ -1,2 +1,2 @@ jboss.home =@jbossHome@ -server.profile=production \ No newline at end of file +jboss.domain=@jbossDomain@ \ No newline at end of file Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build.xml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build.xml 2009-04-23 12:12:55 UTC (rev 10607) +++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/build.xml 2009-04-23 12:26:44 UTC (rev 10608) @@ -20,7 +20,7 @@ <property name="war.dir" value="exploded-archives/${project.name}.war" /> <property name="test.dir" value="test-build" /> <property name="bootstrap.dir" value="${basedir}/bootstrap" /> - <property name="deploy.dir" value="${jboss.home}/server/${server.profile}/deploy" /> + <property name="deploy.dir" value="${jboss.home}/server/${jboss.domain}/deploy" /> <property name="ear.deploy.dir" value="${deploy.dir}/${project.name}.ear" /> <property name="jar.deploy.dir" value="${ear.deploy.dir}/${project.name}.jar" /> <property name="war.deploy.dir" value="${ear.deploy.dir}/${project.name}.war" /> Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build.xml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build.xml 2009-04-23 12:12:55 UTC (rev 10607) +++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build.xml 2009-04-23 12:26:44 UTC (rev 10608) @@ -106,6 +106,7 @@ <filterset id="project"> <filter token="projectName" value="${project.name}" /> <filter token="jbossHome" value="${jboss.home}" /> + <filter token="jbossDomain" value="${jboss.domain}"/> <filter token="hbm2ddl" value="${hibernate.hbm2ddl.auto}"/> <filter token="driverJar" value="${driver.file}"/> <filter token="skin" value="${richfaces.skin}" /> @@ -141,6 +142,8 @@ <property file="./build.properties" prefix="old" /> <echo message="Welcome to seam-gen :-)"/> + <echo message="Answer each question or hit ENTER to accept the default (in brackets)"/> + <echo message=""/> <property name="old.workspace.home" value="C:/Projects"/> <input addproperty="workspace.home.new" message="Enter the directory where you want the project to be created (should not contain spaces) [${old.workspace.home}]" @@ -152,6 +155,11 @@ message="Enter your JBoss home directory [${old.jboss.home}]" defaultvalue="${old.jboss.home}"/> <pathFixer property="jboss.home.new" /> + + <property name="old.jboss.domain" value="production"/> + <input addproperty="jboss.domain.new" + message="Enter your JBoss AS domain [${old.jboss.domain}]" + defaultvalue="${old.jboss.domain}"/> <property name="old.project.name" value="myproject"/> <input addproperty="project.name.new" @@ -330,7 +338,7 @@ defaultvalue="${old.driver.jar}"/> <input addproperty="hibernate.connection.driver_class.new" - message="Enter JDBC driver class for your database [${hibernate.connection.driver_class.default}]" + message="Enter the JDBC driver class for your database [${hibernate.connection.driver_class.default}]" defaultvalue="${hibernate.connection.driver_class.default}"/> <input addproperty="hibernate.connection.url.new" @@ -422,7 +430,7 @@ </propertyfile> <echo message="Installing JDBC driver jar to JBoss server"/> - <copy file="${driver.jar.new}" todir="${jboss.home.new}/server/${server.profile}/lib"/> + <copy file="${driver.jar.new}" todir="${jboss.home.new}/server/${jboss.domain.new}/lib"/> <echo message="Type 'seam create-project' to create the new project"/> </target>