Author: heiko.braun(a)jboss.com Date: 2008-02-08 03:06:18 -0500 (Fri, 08 Feb 2008) New Revision: 5623 Added: stack/cxf/trunk/cxf-trunk.iml Modified: stack/cxf/trunk/ant-import/build-bin-dist.xml stack/cxf/trunk/build.xml stack/cxf/trunk/version.properties Log: Build implementation version from specification version and build Id (i.e. jbossws-3.0-cxf.1.0.0.DEV) Modified: stack/cxf/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/cxf/trunk/ant-import/build-bin-dist.xml 2008-02-07 20:31:36 UTC (rev 5622) +++ stack/cxf/trunk/ant-import/build-bin-dist.xml 2008-02-08 08:06:18 UTC (rev 5623) @@ -19,7 +19,10 @@ <target name="build-bin-dist" depends="jars, javadoc" description="Build the binary distribution"> - <property name="bindist.dir" value="${cxf.output.dir}/jbossws-cxf-${version.id}"/> + <!-- FIXME: the framework version has to be included somehow. Maybe from jbossws-framework.jar ? --> + <property name="dist.name" value="${specification.version}-cxf-${version.id}"/> + + <property name="bindist.dir" value="${cxf.output.dir}/jbossws-cxf-dist"/> <property name="bindist.build.dir" value="${bindist.dir}/build"/> <property name="bindist.bin.dir" value="${bindist.dir}/bin"/> <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> @@ -142,8 +145,8 @@ </copy> <chmod file="${bindist.dir}/build.sh" perm="+x"/> - <zip destfile="${cxf.output.dir}/jbossws-cxf-${version.id}.zip"> - <fileset dir="${cxf.output.dir}" includes="jbossws-cxf-${version.id}/**"/> + <zip destfile="${cxf.output.dir}/${dist.name}.zip"> + <fileset dir="${cxf.output.dir}" includes="jbossws-cxf-dist/**"/> </zip> </target> Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2008-02-07 20:31:36 UTC (rev 5622) +++ stack/cxf/trunk/build.xml 2008-02-08 08:06:18 UTC (rev 5623) @@ -83,7 +83,7 @@ <filter token="java.vm.version" value="${java.vm.version}"/> <filter token="java.vm.vendor" value="${java.vm.vendor}"/> <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-cxf-${version.id}"/> + <filter token="implementation.version" value="${specification.version}-cxf-${version.id}"/> <filtersfile file="${int.cxf.dir}/version.properties"/> </filterset> </copy> Added: stack/cxf/trunk/cxf-trunk.iml =================================================================== --- stack/cxf/trunk/cxf-trunk.iml (rev 0) +++ stack/cxf/trunk/cxf-trunk.iml 2008-02-08 08:06:18 UTC (rev 5623) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test-framework/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntryProperties /> + </component> +</module> + Modified: stack/cxf/trunk/version.properties =================================================================== --- stack/cxf/trunk/version.properties 2008-02-07 20:31:36 UTC (rev 5622) +++ stack/cxf/trunk/version.properties 2008-02-08 08:06:18 UTC (rev 5623) @@ -3,9 +3,9 @@ specification.title=JBossWS specification.vendor=JBoss (http://www.jboss.org) -specification.version=jbossws-2.0 + specification.version=jbossws-3.0 -version.id=2.1.0.DEV +version.id=1.0.0.DEV repository.id=snapshot implementation.title=JBoss Web Services - Apache CXF @@ -34,9 +34,9 @@ cxf.xmlschema=1.3.2 # Thirdparty library versions -jbossws-spi=snapshot -jbossws-common=snapshot -jbossws-framework=snapshot +jbossws-spi=1.0.1.GA +jbossws-common=1.0.3.GA +jbossws-framework=2.0.3.GA jbossws-macros=1.0.0.GA jbossws-jboss42=4.2.1.GA