[seam-commits] Seam SVN: r10155 - in trunk/seam-gen: build-scripts and 1 other directory.

[seam-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2009-03-13 20:23:51 -0400 (Fri, 13 Mar 2009)
New Revision: 10155

Modified:
   trunk/seam-gen/build-scripts/build.properties
   trunk/seam-gen/build.xml
Log:
JBSEAM-2900
JBSEAM-3827


Modified: trunk/seam-gen/build-scripts/build.properties
===================================================================
--- trunk/seam-gen/build-scripts/build.properties	2009-03-14 00:01:28 UTC (rev 10154)
+++ trunk/seam-gen/build-scripts/build.properties	2009-03-14 00:23:51 UTC (rev 10155)
@@ -1,4 +1,4 @@
 jboss.home=@jbossHome@
-jboss.domain=default
+jboss.domain=@jbossDomain@
 glassfish.home=@glassfishHome@
 glassfish.domain=domain1

Modified: trunk/seam-gen/build.xml
===================================================================
--- trunk/seam-gen/build.xml	2009-03-14 00:01:28 UTC (rev 10154)
+++ trunk/seam-gen/build.xml	2009-03-14 00:23:51 UTC (rev 10155)
@@ -155,6 +155,7 @@
             <filter token="testPackage" value="${test.package}"/>
             <filter token="deploymentType" value="${project.type}"/>
             <filter token="jbossHome" value="${jboss.home}"/>
+            <filter token="jbossDomain" value="${jboss.domain}"/>
             <filter token="glassfishHome" value="${glassfish.home}"/>
             <filter token="iceHome" value="${icefaces.home}"/>
             <filter token="hbm2ddl" value="${hibernate.hbm2ddl.auto}"/>
@@ -190,6 +191,8 @@
         <property file="${seam-gen.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 your Java project workspace (the directory that contains your Seam projects) [${old.workspace.home}]"
@@ -202,6 +205,11 @@
               defaultvalue="${old.jboss.home}"/>
         <pathFixer property="jboss.home.new"/>
 
+        <property name="old.jboss.domain" value="default"/>
+        <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"
                    message="Enter the project name [${old.project.name}]"
@@ -417,11 +425,11 @@
               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.dataSource_class.new"
-                   message="Enter JDBC DataSource class for your database [${hibernate.connection.dataSource_class.default}]"
+                   message="Enter the JDBC DataSource class for your database [${hibernate.connection.dataSource_class.default}]"
               defaultvalue="${hibernate.connection.dataSource_class.default}"/>
 
         <input addproperty="hibernate.connection.url.new"
@@ -430,12 +438,12 @@
 
         <property name="old.hibernate.connection.username" value="sa"/>
         <input addproperty="hibernate.connection.username.new"
-                   message="Enter database username [${old.hibernate.connection.username}]"
+                   message="Enter the database username [${old.hibernate.connection.username}]"
               defaultvalue="${old.hibernate.connection.username}"/>
 
         <property name="old.hibernate.connection.password" value=""/>
         <input addproperty="hibernate.connection.password.new"
-                   message="Enter database password [${old.hibernate.connection.password}]"
+                   message="Enter the database password [${old.hibernate.connection.password}]"
               defaultvalue="${old.hibernate.connection.password}"/>
 
         <property name="old.hibernate.default_schema" value=""/>
@@ -491,6 +499,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="jboss.domain" value="${jboss.domain.new}"/>
             <entry key="icefaces" value="${icefaces.new}"/>
             <entry key="icefaces.home" value="${icefaces.home.new}"/>
             <entry key="action.package" value="${action.package.new}"/>
@@ -513,7 +522,7 @@
         </propertyfile>
 
         <echo message="Installing JDBC driver jar to JBoss AS"/>
-        <copy file="${driver.jar.new}" todir="${jboss.home.new}/server/default/lib"/>
+        <copy file="${driver.jar.new}" todir="${jboss.home.new}/server/${jboss.domain.new}/lib"/>
 
         <echo message="Type '${seam.cmd} create-project' to create the new project"/>
     </target>