[seam-commits] Seam SVN: r15133 - in branches/community/Seam_2_3/jboss-seam-gen/dist: build-scripts and 1 other directory.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2012-09-13 10:27:20 -0400 (Thu, 13 Sep 2012)
New Revision: 15133

Modified:
   branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build-war.xml
   branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.properties
   branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.xml
   branches/community/Seam_2_3/jboss-seam-gen/dist/build.xml
Log:
JBSEAM-5036

Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build-war.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build-war.xml	2012-09-13 14:27:10 UTC (rev 15132)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build-war.xml	2012-09-13 14:27:20 UTC (rev 15133)
@@ -24,8 +24,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="jboss.domain" value="standalone"/>
-	<property name="deploy.dir" value="${jboss.home}/${jboss.domain}/deployments"/>
+	<property name="deploy.dir" value="${jboss.home}/standalone/deployments"/>
     <property name="war.deploy.dir" value="${deploy.dir}/${project.name}.war" />
     <property name="packaged.archive" value="${dist.dir}/${project.name}.war"/>
     <property name="testng.jar" value="${basedir}/lib/testng.jar" />

Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.properties
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.properties	2012-09-13 14:27:10 UTC (rev 15132)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.properties	2012-09-13 14:27:20 UTC (rev 15133)
@@ -1,5 +1,4 @@
 jboss.home=@jbossHome@
-jboss.domain=@jbossDomain@
 glassfish.home=@glassfishHome@
 glassfish.domain=@glassfishDomain@
 # Uncomment to stop the build from deploying the datasource to GlassFish

Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.xml	2012-09-13 14:27:10 UTC (rev 15132)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.xml	2012-09-13 14:27:20 UTC (rev 15133)
@@ -22,8 +22,7 @@
 	<property name="jar.dir" value="${ear.dir}/${project.name}_jar"/>
 	<property name="war.dir" value="${ear.dir}/${project.name}_war"/>
 	<property name="test.dir" value="test-build"/>
-	<property name="jboss.domain" value="standalone"/>
-	<property name="deploy.dir" value="${jboss.home}/${jboss.domain}/deployments"/>
+	<property name="deploy.dir" value="${jboss.home}/standalone/deployments"/>
 	<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/community/Seam_2_3/jboss-seam-gen/dist/build.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/build.xml	2012-09-13 14:27:10 UTC (rev 15132)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/build.xml	2012-09-13 14:27:20 UTC (rev 15133)
@@ -30,7 +30,6 @@
     <condition property="jboss.home" value="${env.JBOSS_HOME}" else="C:/Program Files/jboss-as-7.1.1.Final">
         <isset property="env.JBOSS_HOME"/>
     </condition>
-    <property name="jboss.domain" value="standalone"/>
     <condition property="glassfish.home" value="${env.GLASSFISH_HOME}" else="C:/Program Files/glassfish-v2.1">
         <isset property="env.GLASSFISH_HOME"/>
     </condition>
@@ -181,7 +180,6 @@
             <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="glassfishDomain" value="${glassfish.domain}"/>
             <filter token="iceHome" value="${icefaces.home}"/>
@@ -235,11 +233,6 @@
               defaultvalue="${old.jboss.home}"/>
         <pathFixer property="jboss.home.new"/>
 
-        <property name="old.jboss.domain" value="${jboss.domain}"/>
-        <input addproperty="jboss.domain.new"
-                   message="Enter your JBoss AS domain [${old.jboss.domain}]"
-              defaultvalue="${old.jboss.domain}"/>
-
         <property name="old.glassfish.home" value="${glassfish.home}"/>
         <input addproperty="glassfish.home.new"
                    message="Enter your GlassFish V2 or V3 home directory (Ignore if you aren't deploying to GlassFish) [${old.glassfish.home}]"
@@ -575,7 +568,6 @@
             <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="glassfish.home" value="${glassfish.home.new}"/>
             <entry key="glassfish.domain" value="${glassfish.domain.new}"/>
             <entry key="icefaces" value="${icefaces.new}"/>
@@ -604,7 +596,7 @@
         <condition property="has.license.jar">
             <not><equals arg1="${driver.license.jar.new}" arg2=""/></not>
         </condition>
-        <copy todir="${jboss.home.new}/${jboss.domain.new}/deployments" overwrite="true">
+        <copy todir="${jboss.home.new}/standalone/deployments" overwrite="true">
             <fileset file="${driver.jar.new}">
                 <include name="${driver.jar.new}"/>
             </fileset>