notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1877 - in trunk: central/apis/src/docs/index/dpml central/site central/site/src/docs/about/download central/site/src/docs/about/legal main main/depot/library/src/main/dpml/library/impl main/depot/library/src/main/dpml/library/info main/depot/library/src/test/dpml/library/info main/metro/appliance main/metro/part/etc/xsds

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r1877 - in trunk: central/apis/src/docs/index/dpml central/site central/site/src/docs/about/download central/site/src/docs/about/legal main main/depot/library/src/main/dpml/library/impl main/depot/library/src/main/dpml/library/info main/depot/library/src/test/dpml/library/info main/metro/appliance main/metro/part/etc/xsds
Date: Sun, 25 Feb 2007 22:50:19 +0100

Author: mcconnell
Date: 2007-02-25 22:50:18 +0100 (Sun, 25 Feb 2007)
New Revision: 1877

Modified:
trunk/central/apis/src/docs/index/dpml/index.xml
trunk/central/apis/src/docs/index/dpml/navigation.xml
trunk/central/site/build.xml
trunk/central/site/src/docs/about/download/archive.xml
trunk/central/site/src/docs/about/download/index.xml
trunk/central/site/src/docs/about/legal/index.xml
trunk/main/build.xml
trunk/main/depot/library/src/main/dpml/library/impl/DefaultResource.java
trunk/main/depot/library/src/main/dpml/library/info/LibraryDecoder.java
trunk/main/depot/library/src/main/dpml/library/info/TypeDirective.java

trunk/main/depot/library/src/test/dpml/library/info/TypeDirectiveTestCase.java
trunk/main/metro/appliance/project.xml
trunk/main/metro/part/etc/xsds/library.xsd
Log:
add support for non-exported resource types and updated site docs for 2.0.0
release prep

Modified: trunk/central/apis/src/docs/index/dpml/index.xml
===================================================================
--- trunk/central/apis/src/docs/index/dpml/index.xml 2007-02-25 05:50:16
UTC (rev 1876)
+++ trunk/central/apis/src/docs/index/dpml/index.xml 2007-02-25 21:50:18
UTC (rev 1877)
@@ -11,16 +11,14 @@

<section name="DPML SDK Javadocs">

- 

<subsection name="DPML SDK Javadoc Index">

@@ -30,6 +28,10 @@
<th>Description</th>
</tr>
<tr>
+ <td><a
href="http://api.dpml.net/dpml/@VERSION@/index.html";>@VERSION@</a></td>
+ <td>Branch based on SE6 and open Javac compiler APIs.</td>
+ </tr>
+ <tr>
<td><a
href="http://api.dpml.net/dpml/1.1.0/index.html";>1.1.0</a></td>
<td>Updates SE6 support related to garbage collection semantics
and improved
support for symbolic properties in component part
definitions.</td>

Modified: trunk/central/apis/src/docs/index/dpml/navigation.xml
===================================================================
--- trunk/central/apis/src/docs/index/dpml/navigation.xml 2007-02-25
05:50:16 UTC (rev 1876)
+++ trunk/central/apis/src/docs/index/dpml/navigation.xml 2007-02-25
21:50:18 UTC (rev 1877)
@@ -25,6 +25,9 @@
<body>

<menu>
+ <item name="@VERSION@"
href="http://api.dpml.net/dpml/@VERSION@/index.html"/>
+ 
<item name="1.1.0" href="http://api.dpml.net/dpml/1.1.0/index.html"/>
<item name="1.0.5" href="http://api.dpml.net/dpml/1.0.5/index.html"/>
<item name="1.0.4" href="http://api.dpml.net/dpml/1.0.4/index.html"/>
@@ -32,9 +35,6 @@
<item name="1.0.2" href="http://api.dpml.net/dpml/1.0.2/index.html"/>
<item name="1.0.1" href="http://api.dpml.net/dpml/1.0.1/index.html"/>
<item name="1.0.0" href="http://api.dpml.net/dpml/1.0.0/index.html"/>
- 
</menu>

</body>

Modified: trunk/central/site/build.xml
===================================================================
--- trunk/central/site/build.xml 2007-02-25 05:50:16 UTC (rev 1876)
+++ trunk/central/site/build.xml 2007-02-25 21:50:18 UTC (rev 1877)
@@ -74,8 +74,6 @@
<exclude name="dpml"/>
<exclude name="org.acme"/>
<link href="http://java.sun.com/javase/6/docs/api"/>
- <link href="http://api.dpml.net/javax/servlet/2.5"/>
- <link href="http://api.dpml.net/org/mortbay/jetty/6.0.0"/>
<group title="Station">
<package name="net.dpml.appliance"/>
<package name="net.dpml.appliance.*"/>
@@ -90,14 +88,12 @@
<package name="net.dpml.runtime.*"/>
<package name="net.dpml.state"/>
</group>
- <group title="Transit">
+ <group title="Utilities">
<package name="net.dpml.transit"/>
<package name="net.dpml.transit.*"/>
<package name="net.dpml.util"/>
</group>
<group title="Depot">
- <package name="dpml.library"/>
- <package name="dpml.library.*"/>
<package name="net.dpml.depot"/>
<package name="net.dpml.depot.*"/>
</group>

Modified: trunk/central/site/src/docs/about/download/archive.xml
===================================================================
--- trunk/central/site/src/docs/about/download/archive.xml 2007-02-25
05:50:16 UTC (rev 1876)
+++ trunk/central/site/src/docs/about/download/archive.xml 2007-02-25
21:50:18 UTC (rev 1877)
@@ -24,12 +24,7 @@



- The 1.1.0 release includes a number of small updates dealing with
runtime
- support for Java 1.5 and 1.6. The changes deal with memory
management under
- 1.5 and 1.6 that introduce requirements for a more restricted
component
- decommissioning process. Other changes include the addition of the
support
- for symbolic property references inside part definitions declared at
the
- level of a Depot project type declaration.
+


<table>
@@ -81,6 +76,70 @@

</subsection>

+ <subsection name="Version 1.1.0">
+
+ 
+ Resolved issues and/or enhancements:
+ 
+
+ 
+ The 1.1.0 release includes a number of small updates dealing with
runtime
+ support for Java 1.5 and 1.6. The changes deal with memory
management under
+ 1.5 and 1.6 that introduce requirements for a more restricted
component
+ decommissioning process. Other changes include the addition of the
support
+ for symbolic property references inside part definitions declared at
the
+ level of a Depot project type declaration.
+ 
+
+ <table>
+ <tr>
+ <td>Windows NSIS Installer</td>
+ <td>
+ <a
href="http://download.dpml.net/formal/sdk/1.1.0/dpml-sdk-win32-1.1.0.exe";>
+ dpml-sdk-win32-1.1.0.exe</a>
+ </td>
+ <td>
+ <a
href="http://download.dpml.net/formal/sdk/1.1.0/dpml-sdk-win32-1.1.0.exe.md5";>
+ MD5</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Windows Zip Archive</td>
+ <td>
+ <a
href="http://download.dpml.net/formal/sdk/1.1.0/dpml-sdk-win32-1.1.0.zip";>
+ dpml-sdk-win32-1.1.0.zip</a>
+ </td>
+ <td>
+ <a
href="http://download.dpml.net/formal/sdk/1.1.0/dpml-sdk-win32-1.1.0.zip.md5";>
+ MD5</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Linux Archive</td>
+ <td>
+ <a
href="http://download.dpml.net/formal/sdk/1.1.0/dpml-sdk-linux-1.1.0.tar.gz";>
+ dpml-sdk-linux-1.1.0.tar.gz</a>
+ </td>
+ <td>
+ <a
href="http://download.dpml.net/formal/sdk/1.1.0/dpml-sdk-linux-1.1.0.tar.gz.md5";>
+ MD5</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Documentation Archive</td>
+ <td>
+ <a
href="http://download.dpml.net/formal/sdk/1.1.0/dpml-sdk-docs-1.1.0.zip";>
+ dpml-sdk-docs-1.1.0.zip</a>
+ </td>
+ <td>
+ <a
href="http://download.dpml.net/formal/sdk/1.1.0/dpml-sdk-docs-1.1.0.zip.md5";>
+ MD5</a>
+ </td>
+ </tr>
+ </table>
+
+ </subsection>
+
<subsection name="Version 1.0.5">



Modified: trunk/central/site/src/docs/about/download/index.xml
===================================================================
--- trunk/central/site/src/docs/about/download/index.xml 2007-02-25
05:50:16 UTC (rev 1876)
+++ trunk/central/site/src/docs/about/download/index.xml 2007-02-25
21:50:18 UTC (rev 1877)
@@ -19,10 +19,10 @@


<ul>
- <li>Transit resource management </li>
- <li>Depot build system</li>
+ <li>Transit resource management</li>
<li>Metro component management runtime</li>
<li>Station application server</li>
+ <li>Depot build utilities</li>
</ul>

</subsection>

Modified: trunk/central/site/src/docs/about/legal/index.xml
===================================================================
--- trunk/central/site/src/docs/about/legal/index.xml 2007-02-25 05:50:16
UTC (rev 1876)
+++ trunk/central/site/src/docs/about/legal/index.xml 2007-02-25 21:50:18
UTC (rev 1877)
@@ -8,11 +8,24 @@
<description>DPML Content License.</description>
<keywords>DPML, legal, license</keywords>
</properties>
-
+
<body>
+
+ <section name="Preamble">
+
+ 
+ Code developed by members of the DPML is licenced under ASL 2.0.
Utilities for the
+ Windows environment includes the Janel application also available
under ASL 2.0 via
+ special endorcement of the Janel developers. Graphics used in
executable icons include
+ the Cystral XP Alien Collection published under ASL 2.0 by the author
Overlord59.
+ Java compiler capabilities are based on a direct build of the OpenJDK
Project Javac
+ project, licensed under <tt>GPL with "classpath exception"</tt>.
+ 
+
+ </section>
+
+ <section name="DPML Content License">

- <section name="License">
-
<subsection name="Apache License, Version 2.0">


@@ -280,6 +293,492 @@

</subsection>

+ <subsection name="The GNU General Public License (GPL) [Javac Compiler
binary inclusion]">
+
+ 
+The GNU General Public License (GPL)
+ 
+
+ 
+Version 2, June 1991
+ 
+
+ 
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 
+
+ 
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+ 
+
+ 
+Preamble
+ 
+
+ 
+The licenses for most software are designed to take away your freedom to
share
+and change it. By contrast, the GNU General Public License is intended to
+guarantee your freedom to share and change free software--to make sure the
+software is free for all its users. This General Public License applies to
+most of the Free Software Foundation's software and to any other program
whose
+authors commit to using it. (Some other Free Software Foundation software is
+covered by the GNU Library General Public License instead.) You can apply it
to
+your programs, too.
+ 
+
+ 
+When we speak of free software, we are referring to freedom, not price. Our
+General Public Licenses are designed to make sure that you have the freedom
to
+distribute copies of free software (and charge for this service if you wish),
+that you receive source code or can get it if you want it, that you can
change
+the software or use pieces of it in new free programs; and that you know you
+can do these things.
+ 
+
+ 
+To protect your rights, we need to make restrictions that forbid anyone to
deny
+you these rights or to ask you to surrender the rights. These restrictions
+translate to certain responsibilities for you if you distribute copies of the
+software, or if you modify it.
+ 
+
+ 
+For example, if you distribute copies of such a program, whether gratis or
for
+a fee, you must give the recipients all the rights that you have. You must
+make sure that they, too, receive or can get the source code. And you must
+show them these terms so they know their rights.
+ 
+
+ 
+We protect your rights with two steps: (1) copyright the software, and (2)
+offer you this license which gives you legal permission to copy, distribute
+and/or modify the software.
+ 
+
+ 
+Also, for each author's protection and ours, we want to make certain that
+everyone understands that there is no warranty for this free software. If
the
+software is modified by someone else and passed on, we want its recipients to
+know that what they have is not the original, so that any problems introduced
+by others will not reflect on the original authors' reputations.
+ 
+
+ 
+Finally, any free program is threatened constantly by software patents. We
+wish to avoid the danger that redistributors of a free program will
+individually obtain patent licenses, in effect making the program
proprietary.
+To prevent this, we have made it clear that any patent must be licensed for
+everyone's free use or not licensed at all.
+ 
+
+ 
+The precise terms and conditions for copying, distribution and modification
+follow.
+ 
+
+ 
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ 
+
+ 
+0. This License applies to any program or other work which contains a notice
+placed by the copyright holder saying it may be distributed under the terms
of
+this General Public License. The "Program", below, refers to any such
program
+or work, and a "work based on the Program" means either the Program or any
+derivative work under copyright law: that is to say, a work containing the
+Program or a portion of it, either verbatim or with modifications and/or
+translated into another language. (Hereinafter, translation is included
+without limitation in the term "modification".) Each licensee is addressed as
+"you".
+ 
+
+ 
+Activities other than copying, distribution and modification are not covered
by
+this License; they are outside its scope. The act of running the Program is
+not restricted, and the output from the Program is covered only if its
contents
+constitute a work based on the Program (independent of having been made by
+running the Program). Whether that is true depends on what the Program does.
+ 
+
+ 
+1. You may copy and distribute verbatim copies of the Program's source code
as
+you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this
License
+and to the absence of any warranty; and give any other recipients of the
+Program a copy of this License along with the Program.
+ 
+
+ 
+You may charge a fee for the physical act of transferring a copy, and you may
+at your option offer warranty protection in exchange for a fee.
+ 
+
+ 
+2. You may modify your copy or copies of the Program or any portion of it,
thus
+forming a work based on the Program, and copy and distribute such
modifications
+or work under the terms of Section 1 above, provided that you also meet all
of
+these conditions:
+ 
+
+ 
+ a) You must cause the modified files to carry prominent notices stating
+ that you changed the files and the date of any change.
+ 
+
+ 
+ b) You must cause any work that you distribute or publish, that in whole
or
+ in part contains or is derived from the Program or any part thereof, to
be
+ licensed as a whole at no charge to all third parties under the terms of
+ this License.
+ 
+
+ 
+ c) If the modified program normally reads commands interactively when
run,
+ you must cause it, when started running for such interactive use in the
+ most ordinary way, to print or display an announcement including an
+ appropriate copyright notice and a notice that there is no warranty (or
+ else, saying that you provide a warranty) and that users may redistribute
+ the program under these conditions, and telling the user how to view a
copy
+ of this License. (Exception: if the Program itself is interactive but
does
+ not normally print such an announcement, your work based on the Program
is
+ not required to print an announcement.)
+ 
+
+ 
+These requirements apply to the modified work as a whole. If identifiable
+sections of that work are not derived from the Program, and can be reasonably
+considered independent and separate works in themselves, then this License,
and
+its terms, do not apply to those sections when you distribute them as
separate
+works. But when you distribute the same sections as part of a whole which
is a
+work based on the Program, the distribution of the whole must be on the terms
+of this License, whose permissions for other licensees extend to the entire
+whole, and thus to each and every part regardless of who wrote it.
+ 
+
+ 
+Thus, it is not the intent of this section to claim rights or contest your
+rights to work written entirely by you; rather, the intent is to exercise the
+right to control the distribution of derivative or collective works based on
+the Program.
+ 
+
+ 
+In addition, mere aggregation of another work not based on the Program with
the
+Program (or with a work based on the Program) on a volume of a storage or
+distribution medium does not bring the other work under the scope of this
+License.
+ 
+
+ 
+3. You may copy and distribute the Program (or a work based on it, under
+Section 2) in object code or executable form under the terms of Sections 1
and
+2 above provided that you also do one of the following:
+ 
+
+ 
+ a) Accompany it with the complete corresponding machine-readable source
+ code, which must be distributed under the terms of Sections 1 and 2 above
+ on a medium customarily used for software interchange; or,
+ 
+
+ 
+ b) Accompany it with a written offer, valid for at least three years, to
+ give any third party, for a charge no more than your cost of physically
+ performing source distribution, a complete machine-readable copy of the
+ corresponding source code, to be distributed under the terms of Sections
1
+ and 2 above on a medium customarily used for software interchange; or,
+ 
+
+ 
+ c) Accompany it with the information you received as to the offer to
+ distribute corresponding source code. (This alternative is allowed only
+ for noncommercial distribution and only if you received the program in
+ object code or executable form with such an offer, in accord with
+ Subsection b above.)
+ 
+
+ 
+The source code for a work means the preferred form of the work for making
+modifications to it. For an executable work, complete source code means all
+the source code for all modules it contains, plus any associated interface
+definition files, plus the scripts used to control compilation and
installation
+of the executable. However, as a special exception, the source code
+distributed need not include anything that is normally distributed (in either
+source or binary form) with the major components (compiler, kernel, and so
on)
+of the operating system on which the executable runs, unless that component
+itself accompanies the executable.
+ 
+
+ 
+If distribution of executable or object code is made by offering access to
copy
+from a designated place, then offering equivalent access to copy the source
+code from the same place counts as distribution of the source code, even
though
+third parties are not compelled to copy the source along with the object
code.
+ 
+
+ 
+4. You may not copy, modify, sublicense, or distribute the Program except as
+expressly provided under this License. Any attempt otherwise to copy,
modify,
+sublicense or distribute the Program is void, and will automatically
terminate
+your rights under this License. However, parties who have received copies,
or
+rights, from you under this License will not have their licenses terminated
so
+long as such parties remain in full compliance.
+ 
+
+ 
+5. You are not required to accept this License, since you have not signed it.
+However, nothing else grants you permission to modify or distribute the
Program
+or its derivative works. These actions are prohibited by law if you do not
+accept this License. Therefore, by modifying or distributing the Program (or
+any work based on the Program), you indicate your acceptance of this License
to
+do so, and all its terms and conditions for copying, distributing or
modifying
+the Program or works based on it.
+ 
+
+ 
+6. Each time you redistribute the Program (or any work based on the Program),
+the recipient automatically receives a license from the original licensor to
+copy, distribute or modify the Program subject to these terms and conditions.
+You may not impose any further restrictions on the recipients' exercise of
the
+rights granted herein. You are not responsible for enforcing compliance by
+third parties to this License.
+ 
+
+ 
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
conditions
+are imposed on you (whether by court order, agreement or otherwise) that
+contradict the conditions of this License, they do not excuse you from the
+conditions of this License. If you cannot distribute so as to satisfy
+simultaneously your obligations under this License and any other pertinent
+obligations, then as a consequence you may not distribute the Program at all.
+For example, if a patent license would not permit royalty-free redistribution
+of the Program by all those who receive copies directly or indirectly through
+you, then the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+ 
+
+ 
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply and
+the section as a whole is intended to apply in other circumstances.
+ 
+
+ 
+It is not the purpose of this section to induce you to infringe any patents
or
+other property right claims or to contest validity of any such claims; this
+section has the sole purpose of protecting the integrity of the free software
+distribution system, which is implemented by public license practices. Many
+people have made generous contributions to the wide range of software
+distributed through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing to
+distribute software through any other system and a licensee cannot impose
that
+choice.
+ 
+
+ 
+This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+ 
+
+ 
+8. If the distribution and/or use of the Program is restricted in certain
+countries either by patents or by copyrighted interfaces, the original
+copyright holder who places the Program under this License may add an
explicit
+geographical distribution limitation excluding those countries, so that
+distribution is permitted only in or among countries not thus excluded. In
+such case, this License incorporates the limitation as if written in the body
+of this License.
+ 
+
+ 
+9. The Free Software Foundation may publish revised and/or new versions of
the
+General Public License from time to time. Such new versions will be similar
in
+spirit to the present version, but may differ in detail to address new
problems
+or concerns.
+ 
+
+ 
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any later
+version", you have the option of following the terms and conditions either of
+that version or of any later version published by the Free Software
Foundation.
+If the Program does not specify a version number of this License, you may
+choose any version ever published by the Free Software Foundation.
+ 
+
+ 
+10. If you wish to incorporate parts of the Program into other free programs
+whose distribution conditions are different, write to the author to ask for
+permission. For software which is copyrighted by the Free Software
Foundation,
+write to the Free Software Foundation; we sometimes make exceptions for this.
+Our decision will be guided by the two goals of preserving the free status of
+all derivatives of our free software and of promoting the sharing and reuse
of
+software generally.
+ 
+
+ 
+NO WARRANTY
+ 
+
+ 
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
+THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE
+STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE
+PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE,
+YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+ 
+
+ 
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL
+ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE
THE
+PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE
OR
+INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR
DATA
+BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH
HOLDER
+OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ 
+
+ 
+END OF TERMS AND CONDITIONS
+ 
+
+ 
+How to Apply These Terms to Your New Programs
+ 
+
+ 
+If you develop a new program, and you want it to be of the greatest possible
+use to the public, the best way to achieve this is to make it free software
+which everyone can redistribute and change under these terms.
+ 
+
+ 
+To do so, attach the following notices to the program. It is safest to
attach
+them to the start of each source file to most effectively convey the
exclusion
+of warranty; and each file should have at least the "copyright" line and a
+pointer to where the full notice is found.
+ 
+
+ 
+ One line to give the program's name and a brief idea of what it does.
+ 
+
+ 
+ Copyright (C) >year< <name of author%gt;
+ 
+
+ 
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
Free
+ Software Foundation; either version 2 of the License, or (at your option)
+ any later version.
+ 
+
+ 
+ This program is distributed in the hope that it will be useful, but
WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ more details.
+ 
+
+ 
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
59
+ Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 
+
+ 
+Also add information on how to contact you by electronic and paper mail.
+ 
+
+ 
+If the program is interactive, make it output a short notice like this when
it
+starts in an interactive mode:
+ 
+
+ 
+ Gnomovision version 69, Copyright (C) year name of author Gnomovision
comes
+ with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free
+ software, and you are welcome to redistribute it under certain
conditions;
+ type 'show c' for details.
+ 
+
+ 
+The hypothetical commands 'show w' and 'show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may be
+called something other than 'show w' and 'show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+ 
+
+ 
+You should also get your employer (if you work as a programmer) or your
school,
+if any, to sign a "copyright disclaimer" for the program, if necessary. Here
+is a sample; alter the names:
+ 
+
+ 
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ 'Gnomovision' (which makes passes at compilers) written by James Hacker.
+ 
+
+ 
+ signature of Ty Coon, 1 April 1989
+ 
+
+ 
+ Ty Coon, President of Vice
+ 
+
+ 
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General Public
+License instead of this License.
+ 
+
+
+ 
+"CLASSPATH" EXCEPTION TO THE GPL
+ 
+
+ 
+Certain source files distributed by Sun Microsystems, Inc. are subject to
+the following clarification and special exception to the GPL, but only where
+Sun has expressly included in the particular source file's header the words
+"Sun designates this particular file as subject to the "Classpath" exception
+as provided by Sun in the LICENSE file that accompanied this code."
+ 
+
+ 
+ Linking this library statically or dynamically with other modules is
making
+ a combined work based on this library. Thus, the terms and conditions of
+ the GNU General Public License cover the whole combination.
+ 
+
+ 
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent modules,
+ and to copy and distribute the resulting executable under terms of your
+ choice, provided that you also meet, for each linked independent module,
+ the terms and conditions of the license of that module. An independent
+ module is a module which is not derived from or based on this library.
If
+ you modify this library, you may extend this exception to your version of
+ the library, but you are not obligated to do so. If you do not wish to
do
+ so, delete this exception statement from your version.
+ 
+
+ </subsection>
+
</section>

</body>

Modified: trunk/main/build.xml
===================================================================
--- trunk/main/build.xml 2007-02-25 05:50:16 UTC (rev 1876)
+++ trunk/main/build.xml 2007-02-25 21:50:18 UTC (rev 1877)
@@ -219,8 +219,6 @@
Windowtitle="${title}"
access="protected">
<link href="http://java.sun.com/javase/6/docs/api"/>
- <link href="http://api.dpml.net/javax/servlet/2.5"/>
- <link href="http://api.dpml.net/org/mortbay/jetty/6.0.0"/>
<group title="Metro">
<package name="net.dpml.annotation"/>
<package name="net.dpml.appliance"/>

Modified:
trunk/main/depot/library/src/main/dpml/library/impl/DefaultResource.java
===================================================================
--- trunk/main/depot/library/src/main/dpml/library/impl/DefaultResource.java
2007-02-25 05:50:16 UTC (rev 1876)
+++ trunk/main/depot/library/src/main/dpml/library/impl/DefaultResource.java
2007-02-25 21:50:18 UTC (rev 1877)
@@ -916,15 +916,21 @@

TypeDirective[] createExportedTypes( final TypeDirective[] types )
{
- TypeDirective[] export = new TypeDirective[ types.length ];
- for( int i=0; i<export.length; i++ )
+ List<TypeDirective> list = new ArrayList<TypeDirective>();
+ for( int i=0; i<types.length; i++ )
{
TypeDirective type = types[i];
- String id = type.getID();
- String version = type.getVersion();
- export[i] = new TypeDirective( id, version );
+ boolean export = type.getExport();
+ if( export )
+ {
+ boolean test = type.getTest();
+ if( !test )
+ {
+ list.add( type );
+ }
+ }
}
- return export;
+ return list.toArray( new TypeDirective[0] );
}

private DependencyDirective[] createDeps( final DefaultModule module )

Modified:
trunk/main/depot/library/src/main/dpml/library/info/LibraryDecoder.java
===================================================================
--- trunk/main/depot/library/src/main/dpml/library/info/LibraryDecoder.java
2007-02-25 05:50:16 UTC (rev 1876)
+++ trunk/main/depot/library/src/main/dpml/library/info/LibraryDecoder.java
2007-02-25 21:50:18 UTC (rev 1877)
@@ -691,8 +691,9 @@
final String source = getSource( element );
final String name = ElementHelper.getAttribute( element, "name" );
boolean alias = getAliasPolicy( element );
+ boolean export = getExportPolicy( element );
ProductionPolicy production = getProductionPolicy( element );
- return new TypeDirective( production, id, name, version, alias,
source, properties );
+ return new TypeDirective( production, id, name, version, alias,
source, properties, export );
}

private String getVersion( Element element )
@@ -795,6 +796,16 @@
return ElementHelper.getBooleanAttribute( element, "alias", false );
}

+ /**
+ * Return the export attribute of the supplied element.
+ * @param element the DOM element
+ * @return the export value
+ */
+ protected boolean getExportPolicy( Element element )
+ {
+ return ElementHelper.getBooleanAttribute( element, "export", true );
+ }
+
private ProductionPolicy getProductionPolicy( Element element )
{
boolean flag = ElementHelper.getBooleanAttribute( element, "test",
false );

Modified:
trunk/main/depot/library/src/main/dpml/library/info/TypeDirective.java
===================================================================
--- trunk/main/depot/library/src/main/dpml/library/info/TypeDirective.java
2007-02-25 05:50:16 UTC (rev 1876)
+++ trunk/main/depot/library/src/main/dpml/library/info/TypeDirective.java
2007-02-25 21:50:18 UTC (rev 1877)
@@ -38,6 +38,7 @@
private final boolean m_alias;
private final boolean m_test;
private final String m_name;
+ private final boolean m_export;

/**
* Creation of a new type directive.
@@ -55,17 +56,23 @@
*/
public TypeDirective( String id, String version )
{
- this( ProductionPolicy.DELIVERABLE, id, null, version, false, null,
null );
+ this( ProductionPolicy.DELIVERABLE, id, null, version, false, null,
null, true );
}

/**
* Creation of a new generic type directive.
+ * @param policy the production policy
* @param id the type id
- * @param version alias version
+ * @param name the optional overriding name
+ * @param version the optional version
+ * @param alias alias production flag
+ * @param source the optional input source
* @param properties supplimentary properties
+ * @param export the export flag (default is true)
*/
public TypeDirective(
- ProductionPolicy policy, String id, String name, String version,
boolean alias, String source, Properties properties )
+ ProductionPolicy policy, String id, String name, String version,
boolean alias,
+ String source, Properties properties, boolean export )
{
super( properties );

@@ -84,6 +91,7 @@
m_source = source;
m_alias = alias;
m_test = ProductionPolicy.TEST.equals( policy );
+ m_export = export;
}

/**
@@ -114,7 +122,9 @@
}

/**
- * Return the test flag.
+ * Return the test flag. If true, the type
+ * should not be including in a module export and type production
+ * will use the target/test directory as the type destination.
* @return the test flag
*/
public boolean getTest()
@@ -123,6 +133,16 @@
}

/**
+ * Return the export flag (defaults to true). If false, the type
+ * should not be including in a module export.
+ * @return the export flag
+ */
+ public boolean getExport()
+ {
+ return m_export;
+ }
+
+ /**
* Return the alias production flag.
* @return the alias flag
*/

Modified:
trunk/main/depot/library/src/test/dpml/library/info/TypeDirectiveTestCase.java
===================================================================
---
trunk/main/depot/library/src/test/dpml/library/info/TypeDirectiveTestCase.java
2007-02-25 05:50:16 UTC (rev 1876)
+++
trunk/main/depot/library/src/test/dpml/library/info/TypeDirectiveTestCase.java
2007-02-25 21:50:18 UTC (rev 1877)
@@ -33,7 +33,7 @@
TYPES[0] = new TypeDirective( "jar" );
TYPES[1] = new TypeDirective( "plugin", "0.0,0" );
TYPES[2] = new TypeDirective(
- ProductionPolicy.DELIVERABLE, "widget", null, "1.2", false, null,
PROPERTIES );
+ ProductionPolicy.DELIVERABLE, "widget", null, "1.2", false, null,
PROPERTIES, false );
}

/**
@@ -56,6 +56,35 @@
/**
* Test the type directive name accessor.
*/
+ public void testDefaultExport()
+ {
+ TypeDirective type = new TypeDirective( "abc" );
+ assertTrue( "export", type.getExport() );
+ }
+
+ /**
+ * Test the type directive name accessor.
+ */
+ public void testDisabledExport()
+ {
+ TypeDirective type = new TypeDirective(
+ ProductionPolicy.DELIVERABLE, "widget", null, "1.2", false, null,
PROPERTIES, false );
+ assertFalse( "export", type.getExport() );
+ }
+
+ /**
+ * Test the type directive name accessor.
+ */
+ public void testEnabledExport()
+ {
+ TypeDirective type = new TypeDirective(
+ ProductionPolicy.DELIVERABLE, "widget", null, "1.2", false, null,
PROPERTIES, true );
+ assertTrue( "export", type.getExport() );
+ }
+
+ /**
+ * Test the type directive name accessor.
+ */
public void testTypeID()
{
TypeDirective type = new TypeDirective( "abc" );

Modified: trunk/main/metro/appliance/project.xml
===================================================================
--- trunk/main/metro/appliance/project.xml 2007-02-25 05:50:16 UTC (rev
1876)
+++ trunk/main/metro/appliance/project.xml 2007-02-25 21:50:18 UTC (rev
1877)
@@ -14,11 +14,11 @@
<property name="project.package.include-in-classes" value="true"/>
</type>
<type id="jar"/>
- <type id="appliance" name="demo" source="etc/data/appliance.xml"
alias="true"/>
- <type id="appliance" name="demo-foo" source="etc/data/foo.xml"
alias="true"/>
- <type id="appliance" name="demo-bar" source="etc/data/bar.xml"
alias="true"/>
- <type id="plan" name="demo" source="etc/data/plan.xml" alias="true"/>
- <type id="plan" name="empty" source="etc/data/empty.xml" alias="true"/>
+ <type id="appliance" name="demo" source="etc/data/appliance.xml"
alias="true" export="false"/>
+ <type id="appliance" name="demo-foo" source="etc/data/foo.xml"
alias="true" export="false"/>
+ <type id="appliance" name="demo-bar" source="etc/data/bar.xml"
alias="true" export="false"/>
+ <type id="plan" name="demo" source="etc/data/plan.xml" alias="true"
export="false"/>
+ <type id="plan" name="empty" source="etc/data/empty.xml" alias="true"
export="false"/>
</types>

<dependencies>

Modified: trunk/main/metro/part/etc/xsds/library.xsd
===================================================================
--- trunk/main/metro/part/etc/xsds/library.xsd 2007-02-25 05:50:16 UTC (rev
1876)
+++ trunk/main/metro/part/etc/xsds/library.xsd 2007-02-25 21:50:18 UTC (rev
1877)
@@ -19,6 +19,7 @@
<attribute name="name" type="string"/>
<attribute name="test" type="boolean" default="false"/>
<attribute name="alias" type="boolean" default="false"/>
+ <attribute name="export" type="boolean" default="true"/>
<attribute name="version" type="string"/>
</complexType>

r1877 - in trunk: central/apis/src/docs/index/dpml central/site central/site/src/docs/about/download central/site/src/docs/about/legal main main/depot/library/src/main/dpml/library/impl main/depot/library/src/main/dpml/library/info main/depot/library/src/test/dpml/library/info main/metro/appliance main/metro/part/etc/xsds, mcconnell at BerliOS, 02/25/2007