avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject svn commit: rev 22131 - in avalon/trunk: central/supplemental central/supplemental/etc central/supplemental/etc/deliverables central/supplemental/etc/deliverables/jars central/supplemental/etc/deliverables/licenses central/system runtime/merlin/cli runtime/merlin/cli/conf runtime/merlin/cli/etc tools/magic/etc/deliverables tools/magic/etc/deliverables/jars tools/magic/etc/deliverables/licenses
Date Sat, 26 Jun 2004 13:20:17 GMT
Author: mcconnell
Date: Sat Jun 26 06:20:13 2004
New Revision: 22131

Added:
   avalon/trunk/central/supplemental/   (props changed)
   avalon/trunk/central/supplemental/README.TXT
   avalon/trunk/central/supplemental/build.xml
   avalon/trunk/central/supplemental/etc/
   avalon/trunk/central/supplemental/etc/deliverables/
   avalon/trunk/central/supplemental/etc/deliverables/jars/   (props changed)
   avalon/trunk/central/supplemental/etc/deliverables/licenses/
   avalon/trunk/central/supplemental/etc/deliverables/licenses/LICENSE.TXT
   avalon/trunk/central/supplemental/etc/deliverables/licenses/NOTICE.TXT
   avalon/trunk/runtime/merlin/cli/etc/kernel.xml
   avalon/trunk/runtime/merlin/cli/etc/merlin.properties.template
Removed:
   avalon/trunk/runtime/merlin/cli/conf/
   avalon/trunk/tools/magic/etc/deliverables/README.TXT
   avalon/trunk/tools/magic/etc/deliverables/jars/
   avalon/trunk/tools/magic/etc/deliverables/licenses/JMS.license
   avalon/trunk/tools/magic/etc/deliverables/licenses/MAILAPI.license
Modified:
   avalon/trunk/central/system/index.xml
   avalon/trunk/runtime/merlin/cli/build.xml
   avalon/trunk/tools/magic/etc/deliverables/licenses/NOTICE.TXT
Log:
Updates to the build procedure and magic to seperate out avalon supplemental content maangement
from magic.  Main avalon build procedure updated to handle supplemental content handling and
magic cut back to core magic.  Progress on CLI build procedure with addition of inital construction
of the binary distribution content.

Added: avalon/trunk/central/supplemental/README.TXT
==============================================================================
--- (empty file)
+++ avalon/trunk/central/supplemental/README.TXT	Sat Jun 26 06:20:13 2004
@@ -0,0 +1,30 @@
+
+Avalon Supplemental
+===================
+
+The Avalon Supplemental module prepares a bar file holding
+supplimental containing required by the avalon runtime.
+
+Build details
+-------------
+
+The etc/deliverables/jars directory is a placeholder for jar 
+files that are required to bootstrap the core buildsystem.  
+To setup the library you need to download the following 
+jar files and place them in jars directory under the names 
+show below:
+
+  mailapi-1.3.1.jar
+  jms-1.1.jar
+
+The mailet and jms jar files can be downloaded from the 
+following urls:
+
+  http://java.sun.com/products/javamail/downloads/index.html
+  http://java.sun.com/products/jms/docs.html
+
+Following population of the deliverables/jars directory as 
+detailed above - generate a bar file using the following
+command:
+
+  $ ant bar install

Added: avalon/trunk/central/supplemental/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/central/supplemental/build.xml	Sat Jun 26 06:20:13 2004
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalonx-supplemental" default="install" basedir="." 
+    xmlns:x="antlib:org.apache.avalon.tools">
+
+  <property name="supplemental.bar" value="avalonx-supplemental-1.0.bar"/>
+  <property name="mailapi.jar" value="mailapi-1.3.1.jar"/>
+  <x:home index="../system/index.xml"/>
+  <import file="../system/build/standard.xml"/>
+
+  <available property="mailet.cache.available" 
+      file="${magic.cache}/avalonx/supplemental/jars/${mailapi.jar}"/>
+  <available property="mailet.etc.available" 
+      file="etc/deliverables/jars/${mailapi.jar}"/>
+
+  <target name="package" depends="info" unless="mailet.cache.available">
+    <property name="supplemental.path" value="avalon/supplemental"/>
+    <property name="supplemental.dir" value="${magic.cache}/${supplemental.path}"/>
+    <mkdir dir="target"/>
+    <get src="http://www.dpml.net/${supplemental.path}/bars/${supplemental.bar}" usetimestamp="true"
+      dest="target/${supplemental.bar}"/>
+    <unzip src="target/${supplemental.bar}" dest="${magic.cache}/${supplemental.path}">
+      <patternset>
+        <include name="**/*"/>
+        <exclude name="META-INF/**"/>
+        <exclude name="**/bars/**"/>
+      </patternset>
+    </unzip>
+  </target>
+
+  <target name="verify" depends="info" unless="mailet.etc.available">
+    <echo>
+#
+# Connot proceed.
+# Dependent resources have not been installed. 
+# Please see README.TXT for instructions.
+#
+    </echo>
+    <fail message="Missing resources."/>
+  </target>
+
+  <target name="bar" depends="info,prepare" if="mailet.etc.available">
+    <x:bar/>
+    <delete dir="target/deliverables/jars"/>
+    <delete dir="target/deliverables/licenses"/>
+  </target>
+
+</project>
+

Added: avalon/trunk/central/supplemental/etc/deliverables/licenses/LICENSE.TXT
==============================================================================
--- (empty file)
+++ avalon/trunk/central/supplemental/etc/deliverables/licenses/LICENSE.TXT	Sat Jun 26 06:20:13
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/central/supplemental/etc/deliverables/licenses/NOTICE.TXT
==============================================================================
--- (empty file)
+++ avalon/trunk/central/supplemental/etc/deliverables/licenses/NOTICE.TXT	Sat Jun 26 06:20:13
2004
@@ -0,0 +1,506 @@
+=========================================================================
+==  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 for use in conjunction with the Merlin Runtime
+Platform.
+
+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 pmc@avalon.apache.org.
+
+=========================================================================
+==  Supplemental Terms and Conditions                                  ==
+=========================================================================
+
+Portions of this software are subject to the following terms and 
+conditions.
+
+=========================================================================
+==  Mailet API                                                         ==
+=========================================================================
+
+                 Sun Microsystems, Inc.
+             Binary Code License Agreement
+
+   READ THE TERMS OF THIS AGREEMENT AND ANY PROVIDED
+   SUPPLEMENTAL LICENSE TERMS (COLLECTIVELY
+   "AGREEMENT") CAREFULLY BEFORE OPENING THE SOFTWARE
+   MEDIA PACKAGE.  BY OPENING THE SOFTWARE MEDIA
+   PACKAGE, YOU AGREE TO THE TERMS OF THIS
+   AGREEMENT.  IF YOU ARE ACCESSING THE SOFTWARE
+   ELECTRONICALLY, INDICATE YOUR ACCEPTANCE OF THESE
+   TERMS BY SELECTING THE "ACCEPT" BUTTON AT THE END
+   OF THIS AGREEMENT.  IF YOU DO NOT AGREE TO ALL
+   THESE TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE
+   TO YOUR PLACE OF PURCHASE FOR A REFUND OR, IF THE
+   SOFTWARE IS ACCESSED ELECTRONICALLY, SELECT THE
+   "DECLINE" BUTTON AT THE END OF THIS AGREEMENT.
+
+   1.  LICENSE TO USE.  Sun grants you a
+   non-exclusive and non-transferable license for the
+   internal use only of the accompanying software and
+   documentation and any error corrections provided
+   by Sun (collectively "Software"), by the number of
+   users and the class of computer hardware for which
+   the corresponding fee has been paid.
+
+   2.  RESTRICTIONS.  Software is confidential and
+   copyrighted. Title to Software and all associated
+   intellectual property rights is retained by Sun
+   and/or its licensors.  Except as specifically
+   authorized in any Supplemental License Terms, you
+   may not make copies of Software, other than a
+   single copy of Software for archival purposes.
+   Unless enforcement is prohibited by applicable
+   law, you may not modify, decompile, or reverse
+   engineer Software.  You acknowledge that Software
+   is not designed, licensed or intended for use in
+   the design, construction, operation or maintenance
+   of any nuclear facility.  Sun disclaims any
+   express or implied warranty of fitness for such
+   uses.  No right, title or interest in or to any
+   trademark, service mark, logo or trade name of Sun
+   or its licensors is granted under this Agreement.
+
+   3. LIMITED WARRANTY.  Sun warrants to you that for
+   a period of ninety (90) days from the date of
+   purchase, as evidenced by a copy of the receipt,
+   the media on which Software is furnished (if any)
+   will be free of defects in materials and
+   workmanship under normal use.  Except for the
+   foregoing, Software is provided "AS IS".  Your
+   exclusive remedy and Sun's entire liability under
+   this limited warranty will be at Sun's option to
+   replace Software media or refund the fee paid for
+   Software.
+
+   4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN
+   THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS,
+   REPRESENTATIONS AND WARRANTIES, INCLUDING ANY
+   IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+   PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE
+   DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE
+   DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
+
+   5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT
+   PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS
+   LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT
+   OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL,
+   INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED
+   REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT
+   OF OR RELATED TO THE USE OF OR INABILITY TO USE
+   SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGES.  In no event will
+   Sun's liability to you, whether in contract, tort
+   (including negligence), or otherwise, exceed the
+   amount paid by you for Software under this
+   Agreement.  The foregoing limitations will apply
+   even if the above stated warranty fails of its
+   essential purpose.
+
+   6.  Termination.  This Agreement is effective
+   until terminated.  You may terminate this
+   Agreement at any time by destroying all copies of
+   Software.  This Agreement will terminate
+   immediately without notice from Sun if you fail to
+   comply with any provision of this Agreement.  Upon
+   Termination, you must destroy all copies of
+   Software.
+
+   7. Export Regulations. All Software and technical
+   data delivered under this Agreement are subject to
+   US export control laws and may be subject to
+   export or import regulations in other countries.
+   You agree to comply strictly with all such laws
+   and regulations and acknowledge that you have the
+   responsibility to obtain such licenses to export,
+   re-export, or import as may be required after
+   delivery to you.
+
+   8.   U.S. Government Restricted Rights.  If
+   Software is being acquired by or on behalf of the
+   U.S. Government or by a U.S. Government prime
+   contractor or subcontractor (at any tier), then
+   the Government's rights in Software and
+   accompanying documentation will be only as set
+   forth in this Agreement; this is in accordance
+   with 48 CFR 227.7201 through 227.7202-4 (for
+   Department of Defense (DOD) acquisitions) and with
+   48 CFR 2.101 and 12.212 (for non-DOD
+   acquisitions).
+
+   9.  Governing Law.  Any action related to this
+   Agreement will be governed by California law and
+   controlling U.S. federal law.  No choice of law
+   rules of any jurisdiction will apply.
+
+   10.  Severability. If any provision of this
+   Agreement is held to be unenforceable, this
+   Agreement will remain in effect with the provision
+   omitted, unless omission would frustrate the
+   intent of the parties, in which case this
+   Agreement will immediately terminate.
+
+   11.  Integration.  This Agreement is the entire
+   agreement between you and Sun relating to its
+   subject matter.  It supersedes all prior or
+   contemporaneous oral or written communications,
+   proposals, representations and warranties and
+   prevails over any conflicting or additional terms
+   of any quote, order, acknowledgment, or other
+   communication between the parties relating to its
+   subject matter during the term of this Agreement.
+   No modification of this Agreement will be binding,
+   unless in writing and signed by an authorized
+   representative of each party.
+
+               JAVAMAIL(TM), VERSION 1.3.1
+               SUPPLEMENTAL LICENSE TERMS
+
+   These supplemental license terms ("Supplemental
+   Terms") add to or modify the terms of the Binary
+   Code License Agreement (collectively, the
+   "Agreement"). Capitalized terms not defined in
+   these Supplemental Terms shall have the same
+   meanings ascribed to them in the Agreement. These
+   Supplemental Terms shall supersede any
+   inconsistent or conflicting terms in the
+   Agreement, or in any license contained within the
+   Software.
+
+   1. Software Internal Use and Development License
+   Grant.  Subject to the terms and conditions of
+   this Agreement, including, but not limited to
+   Section 3 (Java(TM) Technology Restrictions) of
+   these Supplemental Terms, Sun grants you a
+   non-exclusive, non-transferable, limited license
+   to reproduce internally and use internally the
+   binary form of the Software, complete and
+   unmodified, for the sole purpose of designing,
+   developing and testing your Java applets and
+   applications ("Programs").
+
+   2. License to Distribute Software. Subject to the
+   terms and conditions of this Agreement, including,
+   but not limited to Section 3 (Java (TM) Technology
+   Restrictions) of these Supplemental Terms, Sun
+   grants you a non-exclusive, non-transferable,
+   limited license to reproduce and distribute the
+   Software in binary code form only, provided that
+   (i) you distribute the Software complete and
+   unmodified and only bundled as part of, and for
+   the sole purpose of  running, your Java applets or
+   applications ("Programs"), (ii) the Programs add
+   significant and primary functionality to the
+   Software, (iii) you do not distribute additional
+   software intended to replace any component(s) of
+   the Software, (iv) you do not remove or alter any
+   proprietary legends or notices contained in the
+   Software, (v) you only distribute the Software
+   subject to a license agreement that protects Sun's
+   interests consistent with the terms contained in
+   this Agreement, and (vi) you agree to defend and
+   indemnify Sun and its licensors from and against
+   any damages, costs, liabilities, settlement
+   amounts and/or expenses (including attorneys'
+   fees) incurred in connection with any claim,
+   lawsuit or action by any third party that arises
+   or results from the use or distribution of any and
+   all Programs and/or Software.
+
+   3. Java Technology Restrictions. You may not
+   modify the Java Platform Interface ("JPI",
+   identified as classes contained within the "java"
+   package or any subpackages of the "java" package),
+   by creating additional classes within the JPI or
+   otherwise causing the addition to or modification
+   of the classes in the JPI.  In the event that you
+   create an additional class and associated API(s)
+   which (i) extends the functionality of the Java
+   platform, and (ii) is exposed to third party
+   software developers for the purpose of developing
+   additional software which invokes such additional
+   API, you must promptly publish broadly an accurate
+   specification for such API for free use by all
+   developers.  You may not create, or authorize your
+   licensees to create additional classes,
+   interfaces, or subpackages that are in any way
+   identified as "java", "javax", "sun" or similar
+   convention as specified by Sun in any naming
+   convention designation.
+
+   4. Trademarks and Logos. You acknowledge and agree
+   as between you and Sun that Sun owns the SUN,
+   SOLARIS, JAVA, JINI, FORTE, STAROFFICE, STARPORTAL
+   and iPLANET trademarks and all SUN, SOLARIS, JAVA,
+   JINI, FORTE, STAROFFICE, STARPORTAL and
+   iPLANET-related trademarks, service marks, logos
+   and other brand designations ("Sun Marks"), and
+   you agree to comply with the Sun Trademark and
+   Logo Usage Requirements currently located at
+   http://www.sun.com/policies/trademarks. Any use
+   you make of the Sun Marks inures to Sun's benefit.
+
+   5. Source Code. Software may contain source code
+   that is provided solely for reference purposes
+   pursuant to the terms of this Agreement.  Source
+   code may not be redistributed unless expressly
+   provided for in this Agreement.
+
+   6. Termination for Infringement.  Either party may
+   terminate this Agreement immediately should any
+   Software become, or in either party's opinion be
+   likely to become, the subject of a claim of
+   infringement of any intellectual property right.
+
+   For inquiries please contact: Sun Microsystems,
+   Inc., 4150 Network Circle, Santa Clara, California
+   95054, U.S.A
+   (LFI#132726/Form ID#011801)
+
+=========================================================================
+==  JMS API                                                            ==
+=========================================================================
+
+                 Sun Microsystems, Inc.
+             Binary Code License Agreement
+
+   READ THE TERMS OF THIS AGREEMENT AND ANY PROVIDED
+   SUPPLEMENTAL LICENSE TERMS (COLLECTIVELY
+   "AGREEMENT") CAREFULLY BEFORE OPENING THE SOFTWARE
+   MEDIA PACKAGE.  BY OPENING THE SOFTWARE MEDIA
+   PACKAGE, YOU AGREE TO THE TERMS OF THIS
+   AGREEMENT.  IF YOU ARE ACCESSING THE SOFTWARE
+   ELECTRONICALLY, INDICATE YOUR ACCEPTANCE OF THESE
+   TERMS BY SELECTING THE "ACCEPT" BUTTON AT THE END
+   OF THIS AGREEMENT.  IF YOU DO NOT AGREE TO ALL
+   THESE TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE
+   TO YOUR PLACE OF PURCHASE FOR A REFUND OR, IF THE
+   SOFTWARE IS ACCESSED ELECTRONICALLY, SELECT THE
+   "DECLINE" BUTTON AT THE END OF THIS AGREEMENT.
+
+   1.  LICENSE TO USE.  Sun grants you a
+   non-exclusive and non-transferable license for the
+   internal use only of the accompanying software and
+   documentation and any error corrections provided
+   by Sun (collectively "Software"), by the number of
+   users and the class of computer hardware for which
+   the corresponding fee has been paid.
+
+   2.  RESTRICTIONS.  Software is confidential and
+   copyrighted. Title to Software and all associated
+   intellectual property rights is retained by Sun
+   and/or its licensors.  Except as specifically
+   authorized in any Supplemental License Terms, you
+   may not make copies of Software, other than a
+   single copy of Software for archival purposes.
+   Unless enforcement is prohibited by applicable
+   law, you may not modify, decompile, or reverse
+   engineer Software.  You acknowledge that Software
+   is not designed, licensed or intended for use in
+   the design, construction, operation or maintenance
+   of any nuclear facility.  Sun disclaims any
+   express or implied warranty of fitness for such
+   uses.  No right, title or interest in or to any
+   trademark, service mark, logo or trade name of Sun
+   or its licensors is granted under this Agreement.
+
+   3. LIMITED WARRANTY.  Sun warrants to you that for
+   a period of ninety (90) days from the date of
+   purchase, as evidenced by a copy of the receipt,
+   the media on which Software is furnished (if any)
+   will be free of defects in materials and
+   workmanship under normal use.  Except for the
+   foregoing, Software is provided "AS IS".  Your
+   exclusive remedy and Sun's entire liability under
+   this limited warranty will be at Sun's option to
+   replace Software media or refund the fee paid for
+   Software.
+
+   4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN
+   THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS,
+   REPRESENTATIONS AND WARRANTIES, INCLUDING ANY
+   IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+   PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE
+   DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE
+   DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
+
+   5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT
+   PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS
+   LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT
+   OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL,
+   INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED
+   REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT
+   OF OR RELATED TO THE USE OF OR INABILITY TO USE
+   SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGES.  In no event will
+   Sun's liability to you, whether in contract, tort
+   (including negligence), or otherwise, exceed the
+   amount paid by you for Software under this
+   Agreement.  The foregoing limitations will apply
+   even if the above stated warranty fails of its
+   essential purpose.
+
+   6.  Termination.  This Agreement is effective
+   until terminated.  You may terminate this
+   Agreement at any time by destroying all copies of
+   Software.  This Agreement will terminate
+   immediately without notice from Sun if you fail to
+   comply with any provision of this Agreement.  Upon
+   Termination, you must destroy all copies of
+   Software.
+
+   7. Export Regulations. All Software and technical
+   data delivered under this Agreement are subject to
+   US export control laws and may be subject to
+   export or import regulations in other countries.
+   You agree to comply strictly with all such laws
+   and regulations and acknowledge that you have the
+   responsibility to obtain such licenses to export,
+   re-export, or import as may be required after
+   delivery to you.
+
+   8.   U.S. Government Restricted Rights.  If
+   Software is being acquired by or on behalf of the
+   U.S. Government or by a U.S. Government prime
+   contractor or subcontractor (at any tier), then
+   the Government's rights in Software and
+   accompanying documentation will be only as set
+   forth in this Agreement; this is in accordance
+   with 48 CFR 227.7201 through 227.7202-4 (for
+   Department of Defense (DOD) acquisitions) and with
+   48 CFR 2.101 and 12.212 (for non-DOD
+   acquisitions).
+
+   9.  Governing Law.  Any action related to this
+   Agreement will be governed by California law and
+   controlling U.S. federal law.  No choice of law
+   rules of any jurisdiction will apply.
+
+   10.  Severability. If any provision of this
+   Agreement is held to be unenforceable, this
+   Agreement will remain in effect with the provision
+   omitted, unless omission would frustrate the
+   intent of the parties, in which case this
+   Agreement will immediately terminate.
+
+   11.  Integration.  This Agreement is the entire
+   agreement between you and Sun relating to its
+   subject matter.  It supersedes all prior or
+   contemporaneous oral or written communications,
+   proposals, representations and warranties and
+   prevails over any conflicting or additional terms
+   of any quote, order, acknowledgment, or other
+   communication between the parties relating to its
+   subject matter during the term of this Agreement.
+   No modification of this Agreement will be binding,
+   unless in writing and signed by an authorized
+   representative of each party.
+
+               JAVA(TM) INTERFACE CLASSES
+        JAVA MESSAGE SERVICE (JMS), VERSION 1.1
+               SUPPLEMENTAL LICENSE TERMS
+
+   These supplemental license terms ("Supplemental
+   Terms") add to or modify the terms of the Binary
+   Code License Agreement (collectively, the
+   "Agreement"). Capitalized terms not defined in
+   these Supplemental Terms shall have the same
+   meanings ascribed to them in the Agreement. These
+   Supplemental Terms shall supersede any
+   inconsistent or conflicting terms in the
+   Agreement, or in any license contained within the
+   Software.
+
+   1. Software Internal Use and Development License
+   Grant. Subject to the terms and conditions of this
+   Agreement, including, but not limited to Section 3
+   (Java Technology Restrictions) of these
+   Supplemental Terms, Sun grants you a
+   non-exclusive, non-transferable, limited license
+   to reproduce internally and use internally the
+   binary form of the Software, complete and
+   unmodified, for the sole purpose of designing,
+   developing and testing your Java applets and
+   applications ("Programs").
+
+   2. License to Distribute Software.  In addition to
+   the license granted in Section 1 (Software
+   Internal Use and Development License Grant) of
+   these Supplemental Terms, subject to the terms and
+   conditions of this Agreement, including but not
+   limited to Section 3 (Java Technology
+   Restrictions), Sun grants you a non-exclusive,
+   non-transferable, limited license to reproduce and
+   distribute the Software in binary form only,
+   provided that you (i) distribute the Software
+   complete and unmodified and only bundled as part
+   of your Programs, (ii) do not distribute
+   additional software intended to replace any
+   component(s) of the Software, (iii) do not remove
+   or alter any proprietary legends or notices
+   contained in the Software, (iv) only distribute
+   the Software subject to a license agreement that
+   protects Sun's interests consistent with the terms
+   contained in this Agreement, and (v) agree to
+   defend and indemnify Sun and its licensors from
+   and against any damages, costs, liabilities,
+   settlement amounts and/or expenses (including
+   attorneys' fees) incurred in connection with any
+   claim, lawsuit or action by any third party that
+   arises or results from the use or distribution of
+   any and all Programs and/or Software.
+
+   3. Java Technology Restrictions. You may not
+   modify the Java Platform Interface ("JPI",
+   identified as classes contained within the "java"
+   package or any subpackages of the "java" package),
+   by creating additional classes within the JPI or
+   otherwise causing the addition to or modification
+   of the classes in the JPI.  In the event that you
+   create an additional class and associated API(s)
+   which (i) extends the functionality of the Java
+   Platform, and (ii) is exposed to third party
+   software developers for the purpose of developing
+   additional software which invokes such additional
+   API, you must promptly publish broadly an accurate
+   specification for such API for free use by all
+   developers. You may not create, or authorize your
+   licensees to create additional classes,
+   interfaces, or subpackages that are in any way
+   identified as "java", "javax", "sun" or similar
+   convention as specified by Sun in any naming
+   convention designation.
+
+   4. Trademarks and Logos. You acknowledge and agree
+   as between you and Sun that Sun owns the SUN,
+   SOLARIS, JAVA, JINI, FORTE, STAROFFICE, STARPORTAL
+   and iPLANET trademarks and all SUN, SOLARIS, JAVA,
+   JINI, FORTE, STAROFFICE, STARPORTAL and
+   iPLANET-related trademarks, service marks, logos
+   and other brand designations ("Sun Marks"), and
+   you agree to comply with the Sun Trademark and
+   Logo Usage Requirements currently located at
+   http://www.sun.com/policies/trademarks. Any use
+   you make of the Sun Marks inures to Sun's benefit.
+
+   5. Source Code. Software may contain source code
+   that is provided solely for reference purposes
+   pursuant to the terms of this Agreement.  Source
+   code may not be redistributed unless expressly
+   provided for in this Agreement.
+
+   6. Termination for Infringement.  Either party may
+   terminate this Agreement immediately should any
+   Software become, or in either party's opinion be
+   likely to become, the subject of a claim of
+   infringement of any intellectual property right.
+
+   For inquiries please contact: Sun Microsystems,
+   Inc.  901 San Antonio Road, Palo Alto, California
+   94303
+   (LFI#111755/Form ID#011801)
+

Modified: avalon/trunk/central/system/index.xml
==============================================================================
--- avalon/trunk/central/system/index.xml	(original)
+++ avalon/trunk/central/system/index.xml	Sat Jun 26 06:20:13 2004
@@ -9,24 +9,6 @@
 
   <resource>
     <info>
-      <group>avalon/tools</group>
-      <name>mailapi</name>
-      <version>1.3.1</version>
-      <type>jar</type>
-    </info>
-  </resource>
-
-  <resource>
-    <info>
-      <group>avalon/tools</group>
-      <name>jms</name>
-      <version>1.1</version>
-      <type>jar</type>
-    </info>
-  </resource>
-
-  <resource>
-    <info>
       <group>log4j</group>
       <name>log4j</name>
       <version>1.2.8</version>
@@ -97,6 +79,36 @@
     </info>
   </resource>
 
+  <resource>
+    <info>
+      <group>avalonx/supplemental</group>
+      <name>mailapi</name>
+      <version>1.3.1</version>
+      <type>jar</type>
+    </info>
+  </resource>
+
+  <resource>
+    <info>
+      <group>avalonx/supplemental</group>
+      <name>jms</name>
+      <version>1.1</version>
+      <type>jar</type>
+    </info>
+  </resource>
+
+  <!--
+  Avalon eXternal Supplemental.
+  -->
+
+  <project basedir="../supplemental">
+    <info>
+      <group>avalonx/supplemental</group>
+      <name>avalonx-supplemental</name>
+      <version>1.0</version>
+    </info>
+  </project>
+
   <!--
   Avalon Tools.
   -->
@@ -140,6 +152,7 @@
       <version>2.0.0</version>
     </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"/>

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 06:20:13 2004
@@ -7,6 +7,8 @@
   <import file="${project.home}/build/standard.xml"/>
 
   <target name="init" depends="standard.init">
+    <x:filter key="avalon-merlin-cli" feature="version" 
+       token="VERSION"/>
     <x:filter key="avalon-logging-logkit-impl" feature="uri" 
        token="LOGGING_IMPLEMENTATION"/>
     <x:filter key="avalon-merlin-impl" feature="uri" 
@@ -20,6 +22,25 @@
   </target>
 
   <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"/>
+    <copy todir="target/merlin/system">
+      <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>
+    </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"/>
   </target>
 
 </project>

Added: avalon/trunk/runtime/merlin/cli/etc/kernel.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/cli/etc/kernel.xml	Sat Jun 26 06:20:13 2004
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<kernel> 
+
+  <repository>
+     <hosts>
+       <host path="http://www.dpml.net/"/>
+       <host path="http://www.ibiblio.org/maven/"/>
+     </hosts>
+  </repository>
+
+</kernel>
+

Added: avalon/trunk/runtime/merlin/cli/etc/merlin.properties.template
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/cli/etc/merlin.properties.template	Sat Jun 26 06:20:13 2004
@@ -0,0 +1,23 @@
+
+#----------------------------------------------------------------------
+# template merlin.properties file
+# This file is provided as an example of a merlin.properties 
+# configuration file.  Please copy the file to the name 
+# "merlin.properties" before making modifications.
+#----------------------------------------------------------------------
+
+#
+# merlin system implementation artifact uri
+#
+# merlin.implementation = @MERLIN_IMPLEMENTATION@
+
+#
+# default logging plugin implementation artifact uri
+#
+# merlin.logging.implementation = @LOGGING_IMPLEMENTATION@
+
+#
+# default activation runtime plugin implementation artifact uri
+#
+# merlin.runtime.implementation = @STANDARD_RUNTIME@
+

Modified: avalon/trunk/tools/magic/etc/deliverables/licenses/NOTICE.TXT
==============================================================================
--- avalon/trunk/tools/magic/etc/deliverables/licenses/NOTICE.TXT	(original)
+++ avalon/trunk/tools/magic/etc/deliverables/licenses/NOTICE.TXT	Sat Jun 26 06:20:13 2004
@@ -6,6 +6,6 @@
 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 pmc@avalon.apache.org.
+The names "Avalon", "Magic" and "Merlin" must not be used to endorse or  
+promote products derived from this software without prior written 
+permission. For written permission, please contact pmc@avalon.apache.org.

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message