svn commit: r1407874 - /creadur/whisker/trunk/src/site/apt/examples/copyright-notices.apt

[rd...@apache.org]

Author: rdonkin
Date: Sat Nov 10 19:42:50 2012
New Revision: 1407874

URL: http://svn.apache.org/viewvc?rev=1407874&view=rev
Log:
WHISKER-7 Write up definitions

Modified:
    creadur/whisker/trunk/src/site/apt/examples/copyright-notices.apt

Modified: creadur/whisker/trunk/src/site/apt/examples/copyright-notices.apt
URL: http://svn.apache.org/viewvc/creadur/whisker/trunk/src/site/apt/examples/copyright-notices.apt?rev=1407874&r1=1407873&r2=1407874&view=diff
==============================================================================
--- creadur/whisker/trunk/src/site/apt/examples/copyright-notices.apt (original)
+++ creadur/whisker/trunk/src/site/apt/examples/copyright-notices.apt Sat Nov 10 19:42:50 2012
@@ -142,7 +142,19 @@ All About Copyright Notices
  and one which requires a <<<notice>>>
  ({{{http://www.apache.org/licenses/LICENSE-2.0.html}Apache License, Version 2}}).
 
- Begin by adding definitions for these licenses
+** Definitions
+
+*** Define Licenses
+
+ Begin by adding definitions for the licenses for the
+ works contained in the distribution:
+
+  * CDDL 1.0 (primary, <<<copyright-notice>>> not required)
+
+  * MIT License (<<<copyright-notice>>> required)
+
+  * Apache License, Version 2 (<<<notice>>> required)
+
 
 +---------------------------------------+
 <manifest>
@@ -717,3 +729,41 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE
     ...
 +---------------------------------------+
 
+*** Define Organisations
+
+  Let's assume (for clarity) that <The Example Project> has licensed
+  each of the works distributed. So, only need to define one
+  {{{../faq.html#what-is-org}organisation}}:
+
++---------------------------------------+
+    ...
+    </licenses>
+    <organisations>
+        <organisation
+           id='example.org'
+           name='The Example Project'
+           url='http://example.org/'
+        />
+    </organisations>
+    ...
++---------------------------------------+
+
+*** Define Primary License, Organisation, Notice and Copyright Notice
+
+  Add {{{../faq.html#why-ids}references}} to the main license (CDDL 1.0)
+  and organisation (<The Example Project>).
+
+  The CDDL 1.0 has no
+  {{{../faq.html#when-notice-needed}retention clause}} so no
+  <<<primary-notice>>> needs to be added, and includes no copyright
+  claim so no <<<<copyright-notice>>> is needed either.
+
++---------------------------------------+
+    ...
+    </organisations>
+    <primary-license id='osi:CDDL-1.0'/>
+    <primary-notice/>
+    <primary-organisation id='example.org'/>
+    ...
++---------------------------------------+
+