Author: alessio.soldano(a)jboss.com Date: 2011-07-08 06:50:42 -0400 (Fri, 08 Jul 2011) New Revision: 14669 Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml stack/cxf/trunk/modules/dist/src/main/distro/user-project-build.xml Log: [JBWS-3326] Fixing scripts Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml 2011-07-08 10:47:26 UTC (rev 14668) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml 2011-07-08 10:50:42 UTC (rev 14669) @@ -97,8 +97,11 @@ </condition> </fail> </target> + + <target name="configure-project" depends="configure-project-6,configure-project-7"> + </target> - <target name="configure-project"> + <target name="configure-project-7" if="jbossws.integration.jboss70"> <mkdir dir="${project.home}/src/main/java"/> <mkdir dir="${project.home}/src/main/resources"/> <copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml"> @@ -106,6 +109,36 @@ </copy> <copy tofile="${project.home}/build.properties" file="${basedir}/user-project.properties"/> <path id="project.classpath"> + <fileset dir="${jboss.home}/modules/org/apache/cxf/main/"> + <include name="*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/javax/xml/bind/api/main/"> + <include name="*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/com/sun/xml/bind/main/"> + <include name="*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/ws"> + <include name="**/*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/javax/jws/api/main/"> + <include name="*.jar"/> + </fileset> + <path refid="integration.target.javac.classpath" /> + </path> + <eclipseClasspathGenerator pathId="project.classpath" outputFile="${project.home}/.classpath" srcPath="src/main/java" srcOutput="bin/main" /> + <eclipseProjectGenerator projectName="${project.name}" outputFile="${project.home}/.project" /> + <pathWriter pathId="project.classpath" outputFile="${project.home}/libraries.xml" variables="project.jboss.home" /> + </target> + + <target name="configure-project-6" if="jbossws.integration.jboss60"> + <mkdir dir="${project.home}/src/main/java"/> + <mkdir dir="${project.home}/src/main/resources"/> + <copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml"> + <filterset refid="project"/> + </copy> + <copy tofile="${project.home}/build.properties" file="${basedir}/user-project.properties"/> + <path id="project.classpath"> <pathelement location="${jboss.client}/cxf-api.jar"/> <pathelement location="${jboss.client}/cxf-common-schemas.jar"/> <pathelement location="${jboss.client}/cxf-common-utilities.jar"/> Modified: stack/cxf/trunk/modules/dist/src/main/distro/user-project-build.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/user-project-build.xml 2011-07-08 10:47:26 UTC (rev 14668) +++ stack/cxf/trunk/modules/dist/src/main/distro/user-project-build.xml 2011-07-08 10:50:42 UTC (rev 14669) @@ -7,7 +7,14 @@ <!-- set global properties for this build --> <property name="project.name" value="@projectName@" /> <property name="dist.dir" value="dist" /> - <property name="deploy.dir" value="${project.jboss.home}/server/${project.jboss.conf}/deploy" /> + + <condition property="deploy.dir" value="${project.jboss.home}/server/${project.jboss.conf}/deploy"> + <available file="${project.jboss.home}/server" type="dir"/> + </condition> + <condition property="deploy.dir" value="${project.jboss.home}/${project.jboss.conf}/deployments"> + <available file="${project.jboss.home}/${project.jboss.conf}" type="dir"/> + </condition> + <property name="output.dir" value="output" /> <property name="src.main.dir" value="src/main/java" /> <property name="resources.main.dir" value="src/main/resources" /> @@ -57,13 +64,23 @@ <target name="deploy" depends="dist" description="Deploy to JBoss AS"> <fail unless="project.jboss.home">project.jboss.home not set</fail> + <delete quiet="true"> + <fileset dir="${deploy.dir}"> + <include name="${project.name}.${project.type}.undeployed"/> + </fileset> + </delete> <copy todir="${deploy.dir}" file="${dist.dir}/${project.name}.${project.type}" /> </target> <target name="undeploy" description="Undeploy from JBoss AS"> <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}" /> + <fail unless="project.name">project.name not set</fail> + <delete> + <fileset dir="${deploy.dir}"> + <include name="${project.name}.${project.type}*"/> + </fileset> + </delete> </target> </project>