Author: heiko.braun(a)jboss.com
Date: 2007-11-27 09:05:34 -0500 (Tue, 27 Nov 2007)
New Revision: 5121
Added:
stack/metro/trunk/metro-trunk.iml
Modified:
stack/metro/trunk/ant-import/build-bin-dist.xml
stack/metro/trunk/src/main/distro/ant.properties.example
stack/metro/trunk/src/main/distro/bin-dist-deploy.xml
Log:
Fix bin dist targets
Modified: stack/metro/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/metro/trunk/ant-import/build-bin-dist.xml 2007-11-27 11:06:56 UTC (rev 5120)
+++ stack/metro/trunk/ant-import/build-bin-dist.xml 2007-11-27 14:05:34 UTC (rev 5121)
@@ -13,141 +13,141 @@
<project>
- <!-- ================================================================== -->
- <!-- Binary distribution -->
- <!-- ================================================================== -->
+ <!-- ================================================================== -->
+ <!-- Binary distribution -->
+ <!-- ================================================================== -->
- <target name="build-bin-dist" depends="jars, javadoc"
description="Build the binary distribution">
+ <target name="build-bin-dist" depends="jars, javadoc"
description="Build the binary distribution">
- <property name="bindist.dir"
value="${sunri.output.dir}/jbossws-metro-${version.id}"/>
- <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"/>
- <property name="bindist.docs.dir"
value="${bindist.dir}/docs"/>
- <property name="bindist.tests.dir"
value="${bindist.dir}/tests"/>
- <property name="bindist.tools.dir"
value="${bindist.dir}/tools"/>
+ <property name="bindist.dir"
value="${sunri.output.dir}/jbossws-metro-${version.id}"/>
+ <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"/>
+ <property name="bindist.docs.dir"
value="${bindist.dir}/docs"/>
+ <property name="bindist.tests.dir"
value="${bindist.dir}/tests"/>
+ <property name="bindist.tools.dir"
value="${bindist.dir}/tools"/>
- <delete dir="${bindist.dir}"/>
- <mkdir dir="${bindist.build.dir}"/>
- <mkdir dir="${bindist.bin.dir}"/>
- <mkdir dir="${bindist.docs.dir}"/>
- <mkdir dir="${bindist.tests.dir}"/>
- <mkdir dir="${bindist.tools.dir}"/>
+ <delete dir="${bindist.dir}"/>
+ <mkdir dir="${bindist.build.dir}"/>
+ <mkdir dir="${bindist.bin.dir}"/>
+ <mkdir dir="${bindist.docs.dir}"/>
+ <mkdir dir="${bindist.tests.dir}"/>
+ <mkdir dir="${bindist.tools.dir}"/>
- <!-- root -->
- <copy tofile="${bindist.dir}/ant.properties"
file="${sunri.distro.dir}/ant.properties.example">
- <filterset>
- <filtersfile file="${sunri.dir}/ant.properties"/>
- </filterset>
- </copy>
- <copy tofile="${bindist.dir}/version.properties"
file="${sunri.dir}/version.properties"/>
- <copy tofile="${bindist.dir}/build.xml"
file="${sunri.distro.dir}/bin-dist-build.xml"/>
- <copy tofile="${bindist.build.dir}/build-deploy.xml"
file="${sunri.distro.dir}/bin-dist-deploy.xml"/>
+ <!-- root -->
+ <copy tofile="${bindist.dir}/ant.properties"
file="${sunri.distro.dir}/ant.properties.example" >
+ <filterset>
+ <filtersfile file="${sunri.dir}/ant.properties"/>
+ </filterset>
+ </copy>
+ <copy tofile="${bindist.dir}/version.properties"
file="${sunri.dir}/version.properties"/>
+ <copy tofile="${bindist.dir}/build.xml"
file="${sunri.distro.dir}/bin-dist-build.xml"/>
+ <copy tofile="${bindist.build.dir}/build-deploy.xml"
file="${sunri.distro.dir}/bin-dist-deploy.xml"/>
- <!-- build -->
- <copy todir="${bindist.build.dir}">
- <fileset dir="${sunri.dir}/ant-import">
- <include name="macros-deploy-framework.xml"/>
- <include name="macros-deploy-sunri.xml"/>
- </fileset>
- </copy>
+ <!-- build -->
+ <copy todir="${bindist.build.dir}">
+ <fileset dir="${sunri.dir}/ant-import">
+ <include name="macros-deploy-framework.xml"/>
+ <include name="macros-deploy-sunri.xml"/>
+ </fileset>
+ </copy>
- <unzip dest="${bindist.bin.dir}"
src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>
+ <unzip dest="${bindist.bin.dir}"
src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>
- <copy todir="${bindist.bin.dir}">
- <fileset dir="${sunri.dir}/src/main/etc">
- <include name="*.sh"/>
- <include name="*.bat"/>
- </fileset>
- </copy>
+ <copy todir="${bindist.bin.dir}">
+ <fileset dir="${sunri.dir}/src/main/etc">
+ <include name="*.sh"/>
+ <include name="*.bat"/>
+ </fileset>
+ </copy>
- <chmod dir="${bindist.bin.dir}" perm="+x"
includes="**/*.sh"/>
+ <chmod dir="${bindist.bin.dir}" perm="+x"
includes="**/*.sh"/>
- <!-- docs -->
- <copy todir="${bindist.docs.dir}" >
- <fileset dir="${sunri.output.dir}">
- <include name="apidocs/**"/>
- </fileset>
- </copy>
- <copy todir="${bindist.docs.dir}" filtering="yes">
- <fileset dir="${sunri.distro.dir}">
- <include name="Install.txt"/>
- <include name="ReleaseNotes.txt"/>
- </fileset>
- <filterset>
- <filtersfile file="${sunri.dir}/version.properties"/>
- </filterset>
- </copy>
+ <!-- docs -->
+ <copy todir="${bindist.docs.dir}" >
+ <fileset dir="${sunri.output.dir}">
+ <include name="apidocs/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${bindist.docs.dir}" filtering="yes">
+ <fileset dir="${sunri.distro.dir}">
+ <include name="Install.txt"/>
+ <include name="ReleaseNotes.txt"/>
+ </fileset>
+ <filterset>
+ <filtersfile file="${sunri.dir}/version.properties"/>
+ </filterset>
+ </copy>
- <copy todir="${bindist.docs.dir}">
- <fileset dir="${sunri.etc.dir}">
- <include name="JBossORG-EULA.txt"/>
- </fileset>
- </copy>
+ <copy todir="${bindist.docs.dir}">
+ <fileset dir="${sunri.etc.dir}">
+ <include name="JBossORG-EULA.txt"/>
+ </fileset>
+ </copy>
- <!-- lib -->
- <copy todir="${bindist.lib.dir}" overwrite="true">
- <fileset dir="${thirdparty.dir}">
- <include name="jbossws-common.jar"/>
- <include name="jbossws-framework.jar"/>
- <include name="jbossws-framework-scripts.zip"/>
- <include name="jbossws-spi.jar"/>
- </fileset>
- <fileset dir="${sunri.dir}/output/lib">
- <include name="jbossws-context.war"/>
- <include name="jbossws-sunri.jar"/>
- <include name="jbossws-sunri-client.jar"/>
- <include name="jbossws-sunri42.sar"/>
- <include name="jbossws-sunri50.sar"/>
- </fileset>
- <fileset dir="${thirdparty.dir}">
- <include name="FastInfoset.jar"/>
- <include name="http.jar"/>
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="jaxrpc-api.jar"/>
- <include name="jaxws-api.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jsr173_api.jar"/>
- <include name="jsr181-api.jar"/>
- <include name="jsr250-api.jar"/>
- <include name="juddi-service.sar"/>
- <include name="resolver.jar"/>
- <include name="saaj-api.jar"/>
- <include name="saaj-impl.jar"/>
- <include name="sjsxp.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wstx.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
- </copy>
+ <!-- lib -->
+ <copy todir="${bindist.lib.dir}" overwrite="true">
+ <fileset dir="${thirdparty.dir}">
+ <include name="jbossws-common.jar"/>
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-framework-scripts.zip"/>
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="${sunri.dir}/output/lib">
+ <include name="jbossws-context.war"/>
+ <include name="jbossws-sunri.jar"/>
+ <include name="jbossws-sunri-client.jar"/>
+ <include name="jbossws-sunri42.sar"/>
+ <include name="jbossws-sunri50.sar"/>
+ </fileset>
+ <fileset dir="${thirdparty.dir}">
+ <include name="FastInfoset.jar"/>
+ <include name="http.jar"/>
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxrpc-api.jar"/>
+ <include name="jaxws-api.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jsr173_api.jar"/>
+ <include name="jsr181-api.jar"/>
+ <include name="jsr250-api.jar"/>
+ <include name="juddi-service.sar"/>
+ <include name="resolver.jar"/>
+ <include name="saaj-api.jar"/>
+ <include name="saaj-impl.jar"/>
+ <include name="sjsxp.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wstx.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+ </copy>
- <!-- tests -->
- <copy todir="${bindist.tests.dir}" overwrite="true">
- <fileset dir="${sunri.dir}/src/test-framework"/>
- <fileset dir="${sunri.dir}/src/test">
- <include name="resources/test-excludes-*.txt"/>
- </fileset>
- </copy>
+ <!-- tests -->
+ <copy todir="${bindist.tests.dir}" overwrite="true">
+ <fileset dir="${sunri.dir}/src/test-framework"/>
+ <fileset dir="${sunri.dir}/src/test">
+ <include name="resources/test-excludes-*.txt"/>
+ </fileset>
+ </copy>
- <!-- build tools -->
- <copy todir="${bindist.tools.dir}" overwrite="true">
- <fileset dir="${sunri.dir}/tools/ant"/>
- </copy>
- <copy todir="${bindist.dir}" overwrite="true">
- <fileset dir="${sunri.dir}">
- <include name="build.bat"/>
- <include name="build.sh"/>
- </fileset>
- </copy>
- <chmod file="${bindist.dir}/build.sh" perm="+x"/>
+ <!-- build tools -->
+ <copy todir="${bindist.tools.dir}" overwrite="true">
+ <fileset dir="${sunri.dir}/tools/ant"/>
+ </copy>
+ <copy todir="${bindist.dir}" overwrite="true">
+ <fileset dir="${sunri.dir}">
+ <include name="build.bat"/>
+ <include name="build.sh"/>
+ </fileset>
+ </copy>
+ <chmod file="${bindist.dir}/build.sh" perm="+x"/>
- <zip destfile="${sunri.output.dir}/jbossws-metro-${version.id}.zip">
- <fileset dir="${sunri.output.dir}"
includes="jbossws-metro-${version.id}/**"/>
- </zip>
- </target>
+ <zip
destfile="${sunri.output.dir}/jbossws-metro-${version.id}.zip">
+ <fileset dir="${sunri.output.dir}"
includes="jbossws-metro-${version.id}/**"/>
+ </zip>
+ </target>
</project>
Added: stack/metro/trunk/metro-trunk.iml
===================================================================
--- stack/metro/trunk/metro-trunk.iml (rev 0)
+++ stack/metro/trunk/metro-trunk.iml 2007-11-27 14:05:34 UTC (rev 5121)
@@ -0,0 +1,15 @@
+<?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" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntryProperties />
+ </component>
+</module>
+
Modified: stack/metro/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/metro/trunk/src/main/distro/ant.properties.example 2007-11-27 11:06:56 UTC (rev
5120)
+++ stack/metro/trunk/src/main/distro/ant.properties.example 2007-11-27 14:05:34 UTC (rev
5121)
@@ -4,11 +4,11 @@
# $Id: ant.properties.example 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $
# Optional JBoss Home
-jboss50.home=(a)jboss50.home@
-jboss42.home=(a)jboss42.home@
+jboss500.home=(a)jboss500.home@
+jboss422.home=(a)jboss422.home@
-# The JBoss server under test. This can be [jboss50|jboss42]
-jbossws.integration.target=jboss42
+# The JBoss server under test. This can be [jboss500|jboss422]
+jbossws.integration.target=jboss422
# The JBoss settings
jboss.server.instance=default
Modified: stack/metro/trunk/src/main/distro/bin-dist-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/bin-dist-deploy.xml 2007-11-27 11:06:56 UTC (rev
5120)
+++ stack/metro/trunk/src/main/distro/bin-dist-deploy.xml 2007-11-27 14:05:34 UTC (rev
5121)
@@ -18,47 +18,47 @@
<!-- ================================================================== -->
<!-- Deploy jbossws/sunri to jboss50 -->
- <target name="deploy-jboss50"
depends="undeploy-jboss50,deploy-jboss50-endorsed" description="Deploy
jbossws/sunri to jboss50">
- <macro-deploy-sunri50
+ <target name="deploy-jboss500"
depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy
jbossws/sunri to jboss50">
+ <macro-deploy-sunri500
stacklibs="${lib.dir}"
thirdpartylibs="${lib.dir}"/>
<macro-deploy-framework
thirdpartylibs="${lib.dir}"
jbosshome="${jboss500.home}"/>
</target>
- <target name="deploy-jboss50-endorsed" depends="prepare"
if="HAVE_JDK_1.6">
+ <target name="deploy-jboss500-endorsed" depends="prepare"
if="HAVE_JDK_1.6">
<macro-deploy-endorsed
jbosshome="${jboss500.home}"
thirdpartylibs="${lib.dir}"/>
</target>
<!-- Remove jbossws/sunri from jboss50 -->
- <target name="undeploy-jboss50" depends="prepare"
description="Remove jbossws/sunri from jboss50">
- <macro-undeploy-sunri50/>
+ <target name="undeploy-jboss500" depends="prepare"
description="Remove jbossws/sunri from jboss50">
+ <macro-undeploy-sunri500/>
<macro-undeploy-framework jbosshome="${jboss500.home}"/>
</target>
<!-- Deploy jbossws/sunri to jboss42 -->
- <target name="deploy-jboss42"
depends="undeploy-jboss42,deploy-jboss42-endorsed" description="Deploy
jbossws/sunri to jboss42">
- <macro-deploy-sunri42
+ <target name="deploy-jboss422"
depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy
jbossws/sunri to jboss42">
+ <macro-deploy-sunri422
stacklibs="${lib.dir}"
thirdpartylibs="${lib.dir}"/>
<macro-deploy-framework
thirdpartylibs="${lib.dir}"
jbosshome="${jboss422.home}"/>
</target>
- <target name="deploy-jboss42-endorsed" depends="prepare"
if="HAVE_JDK_1.6">
+ <target name="deploy-jboss422-endorsed" depends="prepare"
if="HAVE_JDK_1.6">
<macro-deploy-endorsed
jbosshome="${jboss422.home}"
thirdpartylibs="${lib.dir}"/>
</target>
<!-- Remove jbossws/sunri from jboss42 -->
- <target name="undeploy-jboss42"
depends="prepare,undeploy-jboss42-endorsed" description="Remove
jbossws/sunri from jboss42">
- <macro-undeploy-sunri42/>
+ <target name="undeploy-jboss422"
depends="prepare,undeploy-jboss422-endorsed" description="Remove
jbossws/sunri from jboss42">
+ <macro-undeploy-sunri422/>
<macro-undeploy-framework jbosshome="${jboss422.home}"/>
</target>
- <target name="undeploy-jboss42-endorsed" depends="prepare"
if="HAVE_JDK_1.6">
+ <target name="undeploy-jboss422-endorsed" depends="prepare"
if="HAVE_JDK_1.6">
<macro-undeploy-endorsed jbosshome="${jboss422.home}"/>
</target>
Show replies by date