Author: alessio.soldano(a)jboss.com Date: 2008-02-13 04:56:18 -0500 (Wed, 13 Feb 2008) New Revision: 5660 Modified: stack/native/trunk/src/main/distro/bin-dist-project-gen.xml stack/native/trunk/src/main/distro/user-project-build.xml Log: [JBWS-1887] Minor fixes Modified: stack/native/trunk/src/main/distro/bin-dist-project-gen.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-project-gen.xml 2008-02-12 15:39:30 UTC (rev 5659) +++ stack/native/trunk/src/main/distro/bin-dist-project-gen.xml 2008-02-13 09:56:18 UTC (rev 5660) @@ -19,7 +19,7 @@ <filterset id="project"> <filter token="projectName" value="${project.name}" /> - <filter token="jbossHome" value="${jboss.home}" /> + <filter token="jbossHome" value="${project.jboss.home}" /> </filterset> <path id="jbws-ant.path" path="${basedir}/lib/jbossws-core.jar"/> @@ -67,8 +67,8 @@ <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="jboss.conf" value="${jboss.conf.new}"/> + <entry key="project.jboss.home" value="${jboss.home.new}"/> + <entry key="project.jboss.conf" value="${jboss.conf.new}"/> </propertyfile> <echo message=""/> @@ -133,7 +133,7 @@ </copy> <echo message="Copying other JBoss libraries to the ${project.home}/lib directory..." /> <copy todir="${project.home}/lib" overwrite="true"> - <fileset dir="${jboss.home}/client" > + <fileset dir="${project.jboss.home}/client" > <include name="jbossall-client.jar"/> <include name="jboss-ejb3x.jar"/> <include name="ejb3-persistence.jar"/> @@ -154,8 +154,8 @@ <target name="settings" depends="init-project-properties" description="Print the current project settings"> <echo message="Java project workspace: ${workspace.home}"/> - <echo message="JBoss home: ${jboss.home}"/> - <echo message="JBoss conf: ${jboss.conf}"/> + <echo message="JBoss home: ${project.jboss.home}"/> + <echo message="JBoss conf: ${project.jboss.conf}"/> <echo message="Project name: ${project.name}"/> <echo message="Project type: ${project.type}"/> </target> Modified: stack/native/trunk/src/main/distro/user-project-build.xml =================================================================== --- stack/native/trunk/src/main/distro/user-project-build.xml 2008-02-12 15:39:30 UTC (rev 5659) +++ stack/native/trunk/src/main/distro/user-project-build.xml 2008-02-13 09:56:18 UTC (rev 5660) @@ -7,7 +7,7 @@ <property name="project.name" value="@projectName@" /> <property name="dist.dir" value="dist" /> <property name="lib.dir" value="lib" /> - <property name="deploy.dir" value="${jboss.home}/server/default/deploy" /> + <property name="deploy.dir" value="${project.jboss.home}/server/${project.jboss.conf}/deploy" /> <property name="output.dir" value="output" /> <property name="src.main.dir" value="src/main/java" /> <property name="resources.main.dir" value="src/main/resources" /> @@ -52,7 +52,7 @@ </copy> </target> - <target name="dist" depends="compile,copyclasses" description="Create the application distribution archive"> + <target name="dist" depends="clean,compile,copyclasses" description="Create the application distribution archive"> <fail unless="project.type">project.type not set</fail> <jar jarfile="${dist.dir}/${project.name}.${project.type}"> <fileset dir="${output.dir}" /> @@ -64,13 +64,13 @@ </target> <target name="deploy" depends="dist" description="Deploy to JBoss AS"> - <fail unless="jboss.home">jboss.home not set</fail> + <fail unless="project.jboss.home">project.jboss.home not set</fail> <copy todir="${deploy.dir}" file="${dist.dir}/${project.name}.${project.type}" /> </target> <target name="undeploy" description="Undeploy from JBoss AS"> - <fail unless="jboss.home">jboss.home not set</fail> - <fail unless="jboss.conf">jboss.conf not set</fail> + <fail unless="project.jboss.home">project.jboss.home not set</fail> + <fail unless="project.jboss.conf">project.jboss.conf not set</fail> <delete file="${deploy.dir}/${project.name}.${project.type}" /> </target>