Author: alessio.soldano(a)jboss.com Date: 2011-12-06 14:33:25 -0500 (Tue, 06 Dec 2011) New Revision: 15361 Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-project-gen.xml Log: Further changes in proj build Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-project-gen.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-project-gen.xml 2011-12-06 18:05:38 UTC (rev 15360) +++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-project-gen.xml 2011-12-06 19:33:25 UTC (rev 15361) @@ -42,12 +42,6 @@ <taskdef name="eclipseProjectGenerator" classname="org.jboss.ws.tools.ant.EclipseProjectTask" classpathref="jbws-ant.path"/> <taskdef name="pathWriter" classname="org.jboss.ws.tools.ant.PathWriterTask" classpathref="jbws-ant.path"/> - <condition property="jbossws.integration.jboss7" value="true"> - <or> - <equals arg1="${jbossws.integration.jboss700}" arg2="true"/> - <equals arg1="${jbossws.integration.jboss710}" arg2="true"/> - </or> - </condition> </target> <target name="setup-new-project" depends="init-project-properties" description="Prompt for settings and setup configuration for a new user project"> @@ -81,7 +75,6 @@ <entry key="project.name" value="${project.name.new}"/> <entry key="project.type" value="${project.type.new}"/> <entry key="project.jboss.home" value="${jboss.home}"/> - <entry key="project.jboss.conf" value="${jboss.server.instance}"/> </propertyfile> <echo message=""/> @@ -118,10 +111,7 @@ </fail> </target> - <target name="configure-project" depends="configure-project-6,configure-project-7"> - </target> - - <target name="configure-project-7" if="jbossws.integration.jboss7"> <!-- variable defined above --> + <target name="configure-project"> <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"> @@ -151,39 +141,6 @@ <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"/> - <pathelement location="${jboss.client}/cxf-rt-core.jar"/> - <pathelement location="${jboss.client}/cxf-rt-ws-addr.jar"/> - <pathelement location="${jboss.client}/cxf-rt-ws-policy.jar"/> - <pathelement location="${jboss.client}/cxf-rt-ws-rm.jar"/> - <pathelement location="${jboss.client}/cxf-rt-ws-security.jar"/> - <pathelement location="${jboss.client}/FastInfoset.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> - <pathelement location="${jboss.client}/jaxb-impl.jar"/> - <pathelement location="${jboss.client}/jaxb-xjc.jar"/> - <pathelement location="${jboss.client}/jaxws-api.jar"/> - <pathelement location="${jboss.client}/jbossws-api.jar"/> - <pathelement location="${jboss.client}/jbossws-common.jar"/> - <pathelement location="${jboss.client}/jbossws-spi.jar"/> - <pathelement location="${jboss.client}/jbossws-cxf-client.jar"/> - <pathelement location="${jboss.client}/geronimo-ws-metadata_2.0_spec.jar"/> - <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="delete-project" depends="validate-settings" description="Delete the configured user project"> <echo message="Deleting the entire project in ${project.home}" /> <delete dir="${project.home}" />