Author: mcconnell
Date: Sat Jun 26 07:55:44 2004
New Revision: 22134
Added:
avalon/trunk/runtime/merlin/cli/etc/INSTALL.TXT
avalon/trunk/runtime/merlin/cli/etc/LICENSE.TXT
avalon/trunk/runtime/merlin/cli/etc/NOTICE.TXT
Modified:
avalon/trunk/central/system/index.xml
avalon/trunk/planet/tutorials/hello/build.properties
avalon/trunk/runtime/merlin/cli/build.xml
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavadocTask.java
Log:
Update javadoc task to run against the BUILD classpath. Update logkit to exclude external dependencies under runtime (this is a problem to be dealt with at the logkit package level).
Modified: avalon/trunk/central/system/index.xml
==============================================================================
--- avalon/trunk/central/system/index.xml (original)
+++ avalon/trunk/central/system/index.xml Sat Jun 26 07:55:44 2004
@@ -119,10 +119,10 @@
<name>avalon-tools-magic</name>
</info>
<dependencies>
- <include key="ant" build="false" test="false" runtime="true"/>
- <include key="junit" build="false" test="false" runtime="true"/>
- <include key="ant-junit" build="false" test="false" runtime="true"/>
- <include key="ant-nodeps" build="false" test="false" runtime="true"/>
+ <include key="ant"/>
+ <include key="junit"/>
+ <include key="ant-junit"/>
+ <include key="ant-nodeps"/>
</dependencies>
</project>
@@ -153,10 +153,10 @@
</info>
<dependencies>
<include key="avalonx-supplemental" build="false" test="false"/>
- <include key="log4j" runtime="true"/>
- <include key="servletapi" runtime="true"/>
- <include key="mailapi" runtime="true"/>
- <include key="jms" runtime="true"/>
+ <include key="log4j" runtime="false"/>
+ <include key="servletapi" runtime="false"/>
+ <include key="mailapi" runtime="false"/>
+ <include key="jms" runtime="false"/>
</dependencies>
</project>
@@ -863,6 +863,10 @@
<include key="avalon-merlin-api" tag="spi"/>
<include key="avalon-merlin-impl"/>
<include key="avalon-merlin-cli"/>
+ <include key="log4j" runtime="false"/>
+ <include key="servletapi"/>
+ <include key="mailapi"/>
+ <include key="jms"/>
</dependencies>
</project>
Modified: avalon/trunk/planet/tutorials/hello/build.properties
==============================================================================
--- avalon/trunk/planet/tutorials/hello/build.properties (original)
+++ avalon/trunk/planet/tutorials/hello/build.properties Sat Jun 26 07:55:44 2004
@@ -2,4 +2,3 @@
project.home = ../..
project.name = avalon-tutorial-hello
project.src.main = java
-project.javadoc.enabled = true
\ No newline at end of file
Modified: avalon/trunk/runtime/merlin/cli/build.xml
==============================================================================
--- avalon/trunk/runtime/merlin/cli/build.xml (original)
+++ avalon/trunk/runtime/merlin/cli/build.xml Sat Jun 26 07:55:44 2004
@@ -6,6 +6,8 @@
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
+ <property name="merlin.zip" value="avalon-merlin-3.3.1-DEV.zip"/>
+
<target name="init" depends="standard.init">
<x:filter key="avalon-merlin-cli" feature="version"
token="VERSION"/>
@@ -33,7 +35,6 @@
<fileset dir="${magic.cache}">
<include name="avalon/**"/>
<include name="commons-cli/jars/commons-cli-1.0.jar"/>
- <include name="servletapi/jars/servletapi-2.3.jar"/>
<exclude name="avalon/test/**"/>
<exclude name="avalon/tools/**"/>
</fileset>
@@ -41,6 +42,22 @@
<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" >
+ <include name="bin/merlin"/>
+ <include name="bin/merlinx"/>
+ <include name="bin/*.sh"/>
+ </zipfileset>
+ <zipfileset dir="target/merlin" prefix="merlin">
+ <include name="**" />
+ <exclude name="bin/merlin"/>
+ <exclude name="bin/merlinx"/>
+ <exclude name="bin/*.sh"/>
+ </zipfileset>
+ </zip>
+
</target>
</project>
Added: avalon/trunk/runtime/merlin/cli/etc/INSTALL.TXT
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/cli/etc/INSTALL.TXT Sat Jun 26 07:55:44 2004
@@ -0,0 +1,57 @@
+
+PROJECT: Merlin @VERSION@
+====================================================================
+
+DESCRIPTION:
+------------
+
+This directory contains the merlin system installation and related
+resources.
+
+ /merlin
+ /bin
+ /config
+ /system
+ README.TXT
+ LICENSE.TXT
+ INSTALL.TXT
+ NOTICE.TXT
+
+Installing Merlin.
+------------------
+
+To use Merlin command line support or the Merlin NT Service
+you will need to define the MERLIN_HOME environment
+variable for your system and include MERLIN_HOME/bin in
+your system path. The MERLIN_HOME environment variable
+should point to the merlin directory.
+
+Under Windows you can set environment variables by selecting the
+Environment Tab from the System Control Panel.
+
+Under Linux you can do this as follows:
+
+ $ echo '
+ > # set location of merlin
+ > export MERLIN_HOME=/opt/merlin
+ > # include it in the path
+ > export PATH=$PATH:$MERLIN_HOME/bin
+ > ' >> ~/.bash_profile
+ $ source ~/.bash_profile
+
+Versions of Merlin prior to the 3.2-dev 20031210 build maintained
+a local repository of jar files under the %MERLIN_HOME%/repository
+directory. As of the 20031210 build the repository is maintained
+under AVALON_HOME/repository where AVALON_HOME defaults to
+${user.home}/.avalon. To override the AVALON_HOME location you can
+either define a AVALON_HOME environment variable or you can add a
+merlin.properties file to ${user.home} containing the
+"merlin.repository" property key and a value point to you preferred
+repository location.
+
+To confirm that your environment variables are correct, you
+should open a new command window and invoke the Merlin
+CLI application.
+
+ $ merlin -version
+
Added: avalon/trunk/runtime/merlin/cli/etc/LICENSE.TXT
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/cli/etc/LICENSE.TXT Sat Jun 26 07:55:44 2004
@@ -0,0 +1,175 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
Added: avalon/trunk/runtime/merlin/cli/etc/NOTICE.TXT
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/cli/etc/NOTICE.TXT Sat Jun 26 07:55:44 2004
@@ -0,0 +1,11 @@
+=========================================================================
+== NOTICE file corresponding to the section 4 d of ==
+== the Apache License, Version 2.0, ==
+=========================================================================
+
+This product is developed by the Apache Avalon Project.
+http://avalon.apache.org
+
+The names "Avalon" and "Merlin" must not be used to endorse or promote
+products derived from this software without prior written permission.
+For written permission, please contact [email protected].
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavadocTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavadocTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavadocTask.java Sat Jun 26 07:55:44 2004
@@ -174,7 +174,7 @@
log( "Generating javadoc for project: " + def, Project.MSG_VERBOSE );
final File root = def.getDocDirectory();
- final Path classpath = def.getPath( getProject(), Policy.RUNTIME );
+ final Path classpath = def.getPath( getProject(), Policy.BUILD );
if( m_staged )
{
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.