You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/06/29 10:24:57 UTC
svn commit: rev 22263 - in avalon/trunk: central/laboratory/studio/eclipse/core/docs/eclipse/html/downloads central/laboratory/studio/eclipse/core/lib/avalon-framework central/laboratory/studio/eclipse/update/features central/laboratory/studio/eclipse/update/plugins central/laboratory/studio/eclipse/update/zip_dist central/laboratory/studio/org.apache.avalon.ide.eclipse.core central/laboratory/studio/org.apache.avalon.ide.eclipse.core/docs/eclipse/html/downloads central/laboratory/studio/org.apache.avalon.ide.eclipse.core/lib/avalon-framework central/laboratory/studio/org.apache.avalon.ide.eclipse.features central/laboratory/studio/org.apache.avalon.ide.eclipse.launch central/laboratory/studio/org.apache.avalon.ide.eclipse.ui central/laboratory/studio/org.apache.avalon.ide.eclipse.update/features central/laboratory/studio/org.apache.avalon.ide.eclipse.update/plugins central/laboratory/studio/org.apache.avalon.ide.eclipse.update/zip_dist central/system central/system/build planet/cornerstone planet/cornerstone/connection/api planet/cornerstone/connection/impl planet/cornerstone/datasources/api planet/cornerstone/datasources/impl planet/cornerstone/scheduler/api planet/cornerstone/scheduler/impl planet/cornerstone/site planet/cornerstone/sockets/api planet/cornerstone/sockets/impl planet/cornerstone/store/api planet/cornerstone/store/impl planet/cornerstone/threads/api planet/cornerstone/threads/impl planet/cornerstone/threads/tutorial planet/facilities/finder planet/facilities/finder/api planet/facilities/finder/impl planet/facilities/finder/test planet/facilities/http planet/facilities/http/api planet/facilities/http/impl planet/facilities/http/spi planet/facilities/http/test planet/facilities/http/util planet/facilities/jmx planet/facilities/jmx/api planet/facilities/jmx/handler planet/facilities/jmx/mx4j planet/facilities/jmx/spi planet/facilities/jmx/test planet/facilities/jmx/util planet/tutorials planet/tutorials/composition planet/tutorials/composition/application/impl planet/tutorials/composition/location/api planet/tutorials/composition/location/impl planet/tutorials/composition/publisher/api planet/tutorials/composition/publisher/impl planet/tutorials/configuration planet/tutorials/configuration/block planet/tutorials/configuration/defaults planet/tutorials/configuration/injection planet/tutorials/configuration/override planet/tutorials/context/alias planet/tutorials/context/avalon planet/tutorials/context/casting planet/tutorials/context/custom planet/tutorials/context/injection planet/tutorials/context/plus planet/tutorials/context/strategy planet/tutorials/dependencies/auto planet/tutorials/dependencies/manual planet/tutorials/dynamics planet/tutorials/hello planet/tutorials/jmx planet/tutorials/lifecycle/activation planet/tutorials/lifecycle/excalibur planet/tutorials/main planet/tutorials/meta planet/tutorials/parameterization planet/tutorials/profiles planet/tutorials/selection planet/tutorials/simple-web runtime/activation runtime/composition runtime/composition/api runtime/composition/impl runtime/composition/spi runtime/framework/api runtime/framework/impl runtime/logging runtime/logging/api runtime/logging/impl runtime/logging/log4j runtime/logging/logkit/api runtime/logging/logkit/impl runtime/logging/logkit/plugins/datagram runtime/logging/logkit/plugins/socket runtime/logging/logkit/plugins/syslog runtime/logging/spi runtime/logging/test runtime/logkit runtime/maven-plugins runtime/maven-plugins/artifact runtime/maven-plugins/versioning runtime/merlin runtime/merlin/api runtime/merlin/cli runtime/merlin/cli/etc runtime/merlin/cli/etc/bin runtime/merlin/cli/etc/deliverables runtime/merlin/cli/etc/deliverables/bin runtime/merlin/cli/etc/deliverables/bin/nt runtime/merlin/cli/etc/deliverables/config runtime/merlin/cli/etc/deliverables/lib runtime/merlin/impl runtime/merlin/plugin runtime/merlin/servlet runtime/merlin/site runtime/merlin/unit runtime/meta runtime/meta/api runtime/meta/impl runtime/meta/plugin runtime/meta/spi runtime/meta/tools runtime/repository runtime/repository/api runtime/repository/cli runtime/repository/impl runtime/repository/main runtime/repository/spi runtime/repository/test runtime/repository/util runtime/util runtime/util/criteria runtime/util/defaults runtime/util/env runtime/util/exception runtime/util/extension/api runtime/util/extension/impl runtime/util/i18n tools/magic
Author: mcconnell
Date: Tue Jun 29 01:24:55 2004
New Revision: 22263
Added:
avalon/trunk/runtime/merlin/cli/etc/deliverables/INSTALL.TXT
- copied unchanged from rev 22134, avalon/trunk/runtime/merlin/cli/etc/INSTALL.TXT
avalon/trunk/runtime/merlin/cli/etc/deliverables/LICENSE.TXT
- copied unchanged from rev 22134, avalon/trunk/runtime/merlin/cli/etc/LICENSE.TXT
avalon/trunk/runtime/merlin/cli/etc/deliverables/NOTICE.TXT
- copied unchanged from rev 22134, avalon/trunk/runtime/merlin/cli/etc/NOTICE.TXT
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/
- copied from rev 22110, avalon/trunk/runtime/merlin/cli/etc/bin/
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/README.TXT
- copied unchanged from rev 22262, avalon/trunk/runtime/merlin/cli/etc/bin/README.TXT
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/internal-cygwin.sh
- copied unchanged from rev 22262, avalon/trunk/runtime/merlin/cli/etc/bin/internal-cygwin.sh
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/internal-unix.sh
- copied unchanged from rev 22262, avalon/trunk/runtime/merlin/cli/etc/bin/internal-unix.sh
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlin
- copied unchanged from rev 22262, avalon/trunk/runtime/merlin/cli/etc/bin/merlin
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlin-server.sh
- copied unchanged from rev 22262, avalon/trunk/runtime/merlin/cli/etc/bin/merlin-server.sh
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlin.bat
- copied unchanged from rev 22262, avalon/trunk/runtime/merlin/cli/etc/bin/merlin.bat
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlin.sh
- copied unchanged from rev 22262, avalon/trunk/runtime/merlin/cli/etc/bin/merlin.sh
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlinx
- copied unchanged from rev 22262, avalon/trunk/runtime/merlin/cli/etc/bin/merlinx
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlinx.bat
- copied unchanged from rev 22262, avalon/trunk/runtime/merlin/cli/etc/bin/merlinx.bat
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/merlinx.sh
- copied unchanged from rev 22262, avalon/trunk/runtime/merlin/cli/etc/bin/merlinx.sh
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/nt/
- copied from rev 22262, avalon/trunk/runtime/merlin/cli/etc/bin/nt/
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/repository.bat
- copied unchanged from rev 22262, avalon/trunk/runtime/merlin/cli/etc/bin/repository.bat
avalon/trunk/runtime/merlin/cli/etc/deliverables/bin/security.policy
- copied unchanged from rev 22262, avalon/trunk/runtime/merlin/cli/etc/bin/security.policy
avalon/trunk/runtime/merlin/cli/etc/deliverables/config/kernel.xml
- copied unchanged from rev 22131, avalon/trunk/runtime/merlin/cli/etc/kernel.xml
avalon/trunk/runtime/merlin/cli/etc/deliverables/lib/
avalon/trunk/runtime/merlin/cli/etc/deliverables/merlin.properties.template
- copied unchanged from rev 22131, avalon/trunk/runtime/merlin/cli/etc/merlin.properties.template
Removed:
avalon/trunk/central/laboratory/studio/eclipse/core/docs/eclipse/html/downloads/.cvsignore
avalon/trunk/central/laboratory/studio/eclipse/core/lib/avalon-framework/.cvsignore
avalon/trunk/central/laboratory/studio/eclipse/update/features/.cvsignore
avalon/trunk/central/laboratory/studio/eclipse/update/plugins/.cvsignore
avalon/trunk/central/laboratory/studio/eclipse/update/zip_dist/.cvsignore
avalon/trunk/central/laboratory/studio/org.apache.avalon.ide.eclipse.core/.cvsignore
avalon/trunk/central/laboratory/studio/org.apache.avalon.ide.eclipse.core/docs/eclipse/html/downloads/.cvsignore
avalon/trunk/central/laboratory/studio/org.apache.avalon.ide.eclipse.core/lib/avalon-framework/.cvsignore
avalon/trunk/central/laboratory/studio/org.apache.avalon.ide.eclipse.features/.cvsignore
avalon/trunk/central/laboratory/studio/org.apache.avalon.ide.eclipse.launch/.cvsignore
avalon/trunk/central/laboratory/studio/org.apache.avalon.ide.eclipse.ui/.cvsignore
avalon/trunk/central/laboratory/studio/org.apache.avalon.ide.eclipse.update/features/.cvsignore
avalon/trunk/central/laboratory/studio/org.apache.avalon.ide.eclipse.update/plugins/.cvsignore
avalon/trunk/central/laboratory/studio/org.apache.avalon.ide.eclipse.update/zip_dist/.cvsignore
avalon/trunk/planet/cornerstone/.cvsignore
avalon/trunk/planet/cornerstone/connection/api/.cvsignore
avalon/trunk/planet/cornerstone/connection/impl/.cvsignore
avalon/trunk/planet/cornerstone/datasources/api/.cvsignore
avalon/trunk/planet/cornerstone/datasources/impl/.cvsignore
avalon/trunk/planet/cornerstone/scheduler/api/.cvsignore
avalon/trunk/planet/cornerstone/scheduler/impl/.cvsignore
avalon/trunk/planet/cornerstone/site/.cvsignore
avalon/trunk/planet/cornerstone/sockets/api/.cvsignore
avalon/trunk/planet/cornerstone/sockets/impl/.cvsignore
avalon/trunk/planet/cornerstone/store/api/.cvsignore
avalon/trunk/planet/cornerstone/store/impl/.cvsignore
avalon/trunk/planet/cornerstone/threads/api/.cvsignore
avalon/trunk/planet/cornerstone/threads/impl/.cvsignore
avalon/trunk/planet/cornerstone/threads/tutorial/.cvsignore
avalon/trunk/planet/facilities/finder/.cvsignore
avalon/trunk/planet/facilities/finder/api/.cvsignore
avalon/trunk/planet/facilities/finder/impl/.cvsignore
avalon/trunk/planet/facilities/finder/test/.cvsignore
avalon/trunk/planet/facilities/http/.cvsignore
avalon/trunk/planet/facilities/http/api/.cvsignore
avalon/trunk/planet/facilities/http/impl/.cvsignore
avalon/trunk/planet/facilities/http/spi/.cvsignore
avalon/trunk/planet/facilities/http/test/.cvsignore
avalon/trunk/planet/facilities/http/util/.cvsignore
avalon/trunk/planet/facilities/jmx/.cvsignore
avalon/trunk/planet/facilities/jmx/api/.cvsignore
avalon/trunk/planet/facilities/jmx/handler/.cvsignore
avalon/trunk/planet/facilities/jmx/mx4j/.cvsignore
avalon/trunk/planet/facilities/jmx/spi/.cvsignore
avalon/trunk/planet/facilities/jmx/test/.cvsignore
avalon/trunk/planet/facilities/jmx/util/.cvsignore
avalon/trunk/planet/tutorials/.cvsignore
avalon/trunk/planet/tutorials/composition/.cvsignore
avalon/trunk/planet/tutorials/composition/application/impl/.cvsignore
avalon/trunk/planet/tutorials/composition/location/api/.cvsignore
avalon/trunk/planet/tutorials/composition/location/impl/.cvsignore
avalon/trunk/planet/tutorials/composition/publisher/api/.cvsignore
avalon/trunk/planet/tutorials/composition/publisher/impl/.cvsignore
avalon/trunk/planet/tutorials/configuration/.cvsignore
avalon/trunk/planet/tutorials/configuration/block/.cvsignore
avalon/trunk/planet/tutorials/configuration/defaults/.cvsignore
avalon/trunk/planet/tutorials/configuration/injection/.cvsignore
avalon/trunk/planet/tutorials/configuration/override/.cvsignore
avalon/trunk/planet/tutorials/context/alias/.cvsignore
avalon/trunk/planet/tutorials/context/avalon/.cvsignore
avalon/trunk/planet/tutorials/context/casting/.cvsignore
avalon/trunk/planet/tutorials/context/custom/.cvsignore
avalon/trunk/planet/tutorials/context/injection/.cvsignore
avalon/trunk/planet/tutorials/context/plus/.cvsignore
avalon/trunk/planet/tutorials/context/strategy/.cvsignore
avalon/trunk/planet/tutorials/dependencies/auto/.cvsignore
avalon/trunk/planet/tutorials/dependencies/manual/.cvsignore
avalon/trunk/planet/tutorials/dynamics/.cvsignore
avalon/trunk/planet/tutorials/jmx/.cvsignore
avalon/trunk/planet/tutorials/lifecycle/activation/.cvsignore
avalon/trunk/planet/tutorials/lifecycle/excalibur/.cvsignore
avalon/trunk/planet/tutorials/main/.cvsignore
avalon/trunk/planet/tutorials/meta/.cvsignore
avalon/trunk/planet/tutorials/parameterization/.cvsignore
avalon/trunk/planet/tutorials/profiles/.cvsignore
avalon/trunk/planet/tutorials/selection/.cvsignore
avalon/trunk/planet/tutorials/simple-web/.cvsignore
avalon/trunk/runtime/activation/.cvsignore
avalon/trunk/runtime/composition/.cvsignore
avalon/trunk/runtime/composition/api/.cvsignore
avalon/trunk/runtime/composition/impl/.cvsignore
avalon/trunk/runtime/composition/spi/.cvsignore
avalon/trunk/runtime/framework/api/.cvsignore
avalon/trunk/runtime/framework/impl/.cvsignore
avalon/trunk/runtime/logging/.cvsignore
avalon/trunk/runtime/logging/api/.cvsignore
avalon/trunk/runtime/logging/impl/.cvsignore
avalon/trunk/runtime/logging/log4j/.cvsignore
avalon/trunk/runtime/logging/logkit/api/.cvsignore
avalon/trunk/runtime/logging/logkit/impl/.cvsignore
avalon/trunk/runtime/logging/logkit/plugins/datagram/.cvsignore
avalon/trunk/runtime/logging/logkit/plugins/socket/.cvsignore
avalon/trunk/runtime/logging/logkit/plugins/syslog/.cvsignore
avalon/trunk/runtime/logging/spi/.cvsignore
avalon/trunk/runtime/logging/test/.cvsignore
avalon/trunk/runtime/logkit/.cvsignore
avalon/trunk/runtime/maven-plugins/.cvsignore
avalon/trunk/runtime/maven-plugins/artifact/.cvsignore
avalon/trunk/runtime/maven-plugins/versioning/.cvsignore
avalon/trunk/runtime/merlin/.cvsignore
avalon/trunk/runtime/merlin/api/.cvsignore
avalon/trunk/runtime/merlin/cli/.cvsignore
avalon/trunk/runtime/merlin/cli/etc/INSTALL.TXT
avalon/trunk/runtime/merlin/cli/etc/LICENSE.TXT
avalon/trunk/runtime/merlin/cli/etc/NOTICE.TXT
avalon/trunk/runtime/merlin/cli/etc/bin/
avalon/trunk/runtime/merlin/cli/etc/kernel.xml
avalon/trunk/runtime/merlin/cli/etc/merlin.properties.template
avalon/trunk/runtime/merlin/impl/.cvsignore
avalon/trunk/runtime/merlin/plugin/.cvsignore
avalon/trunk/runtime/merlin/servlet/.cvsignore
avalon/trunk/runtime/merlin/site/.cvsignore
avalon/trunk/runtime/merlin/unit/.cvsignore
avalon/trunk/runtime/meta/.cvsignore
avalon/trunk/runtime/meta/api/.cvsignore
avalon/trunk/runtime/meta/impl/.cvsignore
avalon/trunk/runtime/meta/plugin/.cvsignore
avalon/trunk/runtime/meta/spi/.cvsignore
avalon/trunk/runtime/meta/tools/.cvsignore
avalon/trunk/runtime/repository/.cvsignore
avalon/trunk/runtime/repository/api/.cvsignore
avalon/trunk/runtime/repository/cli/.cvsignore
avalon/trunk/runtime/repository/impl/.cvsignore
avalon/trunk/runtime/repository/main/.cvsignore
avalon/trunk/runtime/repository/spi/.cvsignore
avalon/trunk/runtime/repository/test/.cvsignore
avalon/trunk/runtime/repository/util/.cvsignore
avalon/trunk/runtime/util/.cvsignore
avalon/trunk/runtime/util/criteria/.cvsignore
avalon/trunk/runtime/util/defaults/.cvsignore
avalon/trunk/runtime/util/env/.cvsignore
avalon/trunk/runtime/util/exception/.cvsignore
avalon/trunk/runtime/util/extension/api/.cvsignore
avalon/trunk/runtime/util/extension/impl/.cvsignore
avalon/trunk/runtime/util/i18n/.cvsignore
Modified:
avalon/trunk/central/system/build/reactor.xml
avalon/trunk/central/system/index.xml
avalon/trunk/planet/tutorials/build.xml
avalon/trunk/planet/tutorials/dynamics/build.xml
avalon/trunk/planet/tutorials/hello/build.xml
avalon/trunk/runtime/merlin/cli/build.xml
avalon/trunk/tools/magic/ (props changed)
Log:
1. update the avalon reactor template to call "default" for the default goal (this enables usage of the reactor with enclosed ant directives)
2. update the avalon index.xml to delcare build time dependencies on merlin-cli so that we can automate the construction of a path to package the distribution jars
3. reorganize the merlin-cli etc content to reduce custom ant code
4. dump .cvsignore files
4. significantly simplify the cli build procedure though the <x:replicate/> task
Modified: avalon/trunk/central/system/build/reactor.xml
==============================================================================
--- avalon/trunk/central/system/build/reactor.xml (original)
+++ avalon/trunk/central/system/build/reactor.xml Tue Jun 29 01:24:55 2004
@@ -32,7 +32,7 @@
</target>
<target name="default">
- <x:reactor/>
+ <x:reactor target="default"/>
</target>
</project>
Modified: avalon/trunk/central/system/index.xml
==============================================================================
--- avalon/trunk/central/system/index.xml (original)
+++ avalon/trunk/central/system/index.xml Tue Jun 29 01:24:55 2004
@@ -833,7 +833,11 @@
<status>SNAPSHOT</status>
</info>
<dependencies>
- <include key="avalon-merlin-impl" build="false" test="false"/>
+ <include key="avalon-repository-impl" runtime="false" test="false"/>
+ <include key="avalon-logging-logkit-impl" runtime="false" test="false"/>
+ <include key="avalon-logging-log4j" runtime="false" test="false"/>
+ <include key="avalon-activation-impl" runtime="false" test="false"/>
+ <include key="avalon-merlin-impl" runtime="false" test="false"/>
<include key="avalon-repository-main"/>
<include key="commons-cli"/>
</dependencies>
Modified: avalon/trunk/planet/tutorials/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/build.xml (original)
+++ avalon/trunk/planet/tutorials/build.xml Tue Jun 29 01:24:55 2004
@@ -1,8 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="runtime" default="default" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
+<project name="runtime" default="" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
- <import file="${project.system}/build/reactor.xml"/>
+ <!--<import file="${project.system}/build/reactor.xml"/>-->
+
+ <x:home/>
+ <x:reactor>
+ <echo>${reactor.name}, ${basedir}/target/${reactor.path}</echo>
+ </x:reactor>
</project>
Modified: avalon/trunk/planet/tutorials/dynamics/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/dynamics/build.xml (original)
+++ avalon/trunk/planet/tutorials/dynamics/build.xml Tue Jun 29 01:24:55 2004
@@ -6,6 +6,10 @@
<property file="build.properties"/>
<import file="${project.system}/build/standard.xml"/>
+ <x:path id="runtime"/>
+ <pathconvert refid="runtime" targetos="windows" property="myprop"/>
+ <echo>${myprop}</echo>
+
<target name="init" depends="standard.init">
<x:filter key="avalon-tutorial-dynamics" feature="uri"
token="DYNAMICS-SPEC"/>
Modified: avalon/trunk/planet/tutorials/hello/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/hello/build.xml (original)
+++ avalon/trunk/planet/tutorials/hello/build.xml Tue Jun 29 01:24:55 2004
@@ -6,6 +6,15 @@
<property file="build.properties"/>
<import file="${project.system}/build/standard.xml"/>
+ <x:property property="afw.version" key="avalon-framework-api" feature="version"/>
+ <echo>${afw.version}</echo>
+
+ <!--
+ <x:property ns="framework" key="avalon-framework-api"/>
+ <echo>${framework.name}</echo>
+ <echo>${framework.version}</echo>
+ -->
+
<!--
<target name="javadoc" depends="prepare">
<x:javadoc>
Modified: avalon/trunk/runtime/merlin/cli/build.xml
==============================================================================
--- avalon/trunk/runtime/merlin/cli/build.xml (original)
+++ avalon/trunk/runtime/merlin/cli/build.xml Tue Jun 29 01:24:55 2004
@@ -9,6 +9,11 @@
<property name="merlin.zip" value="avalon-merlin-3.3.1-DEV.zip"/>
<target name="init" depends="standard.init">
+
+ <x:path id="runtime" mode="RUNTIME"/>
+ <pathconvert targetos="windows" property="windows" refid="runtime"/>
+ <filter value="${windows}" token="WINDOWS-CLI-CLASSPATH"/>
+
<x:filter key="avalon-merlin-cli" feature="version"
token="VERSION"/>
<x:filter key="avalon-logging-logkit-impl" feature="uri"
@@ -25,52 +30,58 @@
<target name="package" depends="standard.package">
- <mkdir dir="target/merlin"/>
- <copy todir="target/merlin">
- <fileset dir="target/build/etc" includes="bin/**"/>
- </copy>
- <mkdir dir="target/merlin/lib"/>
- <mkdir dir="target/merlin/system"/>
-
- <echo>GROUP: ${project.group}</echo>
- <echo>NAME: ${project.name}</echo>
-
- <copy todir="target/merlin/system">
- <fileset dir="${magic.cache}">
- <include name="avalon/**"/>
- <include name="commons-cli/jars/commons-cli-1.0.jar"/>
- <exclude name="avalon/test/**"/>
- <exclude name="avalon/tools/**"/>
- <exclude name="avalon/merlin/dist/**"/>
- <exclude name="avalon/merlin/jars/${project.name}**"/>
- <exclude name="avalon/planet/**"/>
- </fileset>
- </copy>
- <copy todir="target/merlin/system/${project.group}/jars">
+ <x:path id="build.path" mode="BUILD"/>
+ <x:replicate refid="build.path" todir="target/system"/>
+ <copy todir="target/system/${project.group}/jars">
<fileset dir="target/deliverables/jars">
- <include name="${project.name}*.jar"/>
- <include name="${project.name}*.jar.*"/>
+ <include name="${project.filename}"/>
</fileset>
</copy>
- <copy todir="target/merlin" file="target/build/etc/merlin.properties.template"/>
- <mkdir dir="target/merlin/config"/>
- <copy todir="target/merlin/config" file="target/build/etc/kernel.xml"/>
<mkdir dir="target/deliverables/dist"/>
<zip zipfile="target/deliverables/dist/${merlin.zip}">
- <zipfileset dir="target/merlin" prefix="merlin" filemode="755" >
+ <zipfileset dir="target/deliverables" prefix="merlin" filemode="755" >
<include name="bin/merlin"/>
<include name="bin/merlinx"/>
<include name="bin/*.sh"/>
</zipfileset>
- <zipfileset dir="target/merlin" prefix="merlin">
- <include name="**" />
+ <zipfileset dir="target/deliverables" prefix="merlin">
+ <include name="bin/**" />
+ <include name="config/**" />
+ <include name="lib/**" />
+ <exclude name="jars/**"/>
+ <exclude name="dist/**"/>
<exclude name="bin/merlin"/>
<exclude name="bin/merlinx"/>
<exclude name="bin/*.sh"/>
</zipfileset>
+ <zipfileset dir="target/system" prefix="merlin/system">
+ <include name="**" />
+ </zipfileset>
</zip>
</target>
+
+ <target name="xxx" depends="info">
+ <x:declare/>
+ </target>
+
+ <target name="zzz" depends="info">
+ <echo>${project.filename}</echo>
+ </target>
+
+ <!--
+ <target name="xxx" depends="info">
+ <x:package root="target/temp" key="avalon-merlin-impl"/>
+ </target>
+ -->
+
+ <!--
+ <target name="xxx" depends="info">
+ <x:foreach property="dep" key="avalon-merlin-impl">
+ </x:foreach>
+ </target>
+ -->
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org