creadur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r1372101 - in /creadur/whisker/trunk/apache-whisker-plugin4maven/src/it/in-5: descriptor.xml verify.groovy
Date Sun, 12 Aug 2012 14:20:06 GMT
Author: rdonkin
Date: Sun Aug 12 14:20:06 2012
New Revision: 1372101

URL: http://svn.apache.org/viewvc?rev=1372101&view=rev
Log:
Prepare annotated sample and complete integration test

Modified:
    creadur/whisker/trunk/apache-whisker-plugin4maven/src/it/in-5/descriptor.xml
    creadur/whisker/trunk/apache-whisker-plugin4maven/src/it/in-5/verify.groovy

Modified: creadur/whisker/trunk/apache-whisker-plugin4maven/src/it/in-5/descriptor.xml
URL: http://svn.apache.org/viewvc/creadur/whisker/trunk/apache-whisker-plugin4maven/src/it/in-5/descriptor.xml?rev=1372101&r1=1372100&r2=1372101&view=diff
==============================================================================
--- creadur/whisker/trunk/apache-whisker-plugin4maven/src/it/in-5/descriptor.xml (original)
+++ creadur/whisker/trunk/apache-whisker-plugin4maven/src/it/in-5/descriptor.xml Sun Aug 12
14:20:06 2012
@@ -56,7 +56,7 @@ maintained by an informal group. 
 <!ATTLIST organisation url CDATA #IMPLIED>
 
 <!-- The primary license for the application -->
-<!ELEMENT primary-license EMPTY>
+<!ELEMENT primary-license (copyright-notice?)>
 <!-- References the license by id attribute -->
 <!ATTLIST primary-license id IDREF #REQUIRED>
 
@@ -64,7 +64,7 @@ maintained by an informal group. 
 <!ELEMENT primary-notice (#PCDATA)>
 
 <!-- The organisation responsible for the application -->
-<!ELEMENT primary-organisation (copyright-notice?)>
+<!ELEMENT primary-organisation EMPTY>
 <!-- References the organisation by id attribute -->
 <!ATTLIST primary-organisation id IDREF #REQUIRED>
 
@@ -97,8 +97,7 @@ maintained by an informal group. 
 <!ATTLIST resource sha1 CDATA #IMPLIED>
 <!ATTLIST resource notice IDREF #IMPLIED>
 <!ATTLIST resource source CDATA #IMPLIED>
-]>
-<manifest>    
+]><manifest>
 <!-- 
     Definitions 
     ===========    
@@ -107,11 +106,40 @@ by ID. Data only needs to be entered onc
     -->
     <licenses>
     <!--
-All artifacts distributed by this sample project shared the Apache License,
-version 2. When artifacts are included with different licenses,
-those licenses would be added here. 
+The primary license is the MIT license. No template is
+needed for this license. The primary license is treated
+like any other license in the meta-data, though it will
+be given more prominence when legal documents are 
+generated.
      -->
-        <license 
+        <license name='MIT License' id='osi:mit' 
+            url='http://www.opensource.org/licenses/mit-license.php'>
+            <text>
+Permission is hereby granted, free  of charge, to any person obtaining
+a  copy  of this  software  and  associated  documentation files  (the
+"Software"), to  deal in  the Software without  restriction, including
+without limitation  the rights to  use, copy, modify,  merge, publish,
+distribute,  sublicense, and/or sell  copies of  the Software,  and to
+permit persons to whom the Software  is furnished to do so, subject to
+the following conditions:
+
+The  above  copyright  notice  and  this permission  notice  shall  be
+included in all copies or substantial portions of the Software.
+
+THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+            </text>
+        </license>
+        <!-- 
+The Apache License, Version 2 is used by one of the third party
+dependencies aggregated within the distribution. 
+         -->
+         <license 
             name='Apache License, Version 2' 
             id='osi:AL2' 
             url='http://www.apache.org/licenses/LICENSE-2.0.txt'>
@@ -302,30 +330,37 @@ within the distribution, add NOTICE deta
      -->
     <notices/>
     <!-- 
-This sample example defines only two organisations. Informal groups
-are described using the same organisation element used for corporate
-and individual maintainers. 
+This sample example defines only two organisations.
      -->
     <organisations>
-     <!-- The primary organisation for the project -->
-        <organisation 
-            id='apache.org' 
-            name='The Apache Software Foundation' 
-            url='http://www.apache.org/'/>  
     <!-- 
-        The informal group from whom the dependency 
-        included in the distribution is licensed 
+    The primary organisation for the project, 
+    typically the main maintainers. 
     -->
-        <organisation
-           id='example.org'
-           name='The Legion of the Bouncy Example'
-           url='http://example.org/'
-        />
+        <organisation 
+            id='example.org' 
+            name='The Hypothetical Example Foundation' 
+            url='http://www.example.org'/>
+    <!--
+    A third party who licenses a resource aggregated within the
+    distribution. 
+     -->
+        <organisation 
+            id='apache.org' 
+            name='Apache Software Foundation' 
+            url='http://www.apache.org'/>
     </organisations>
     <!--
 The ID links back into the license section. 
      -->
-    <primary-license id='osi:AL2'/>
+    <primary-license id='osi:mit'>
+        <!--
+        The MIT license does not contain a copyright notice.
+        This copyright notice will be prefixed when the primary
+        licensed is rendered. Only a few licenses need this. 
+        -->
+        <copyright-notice>Copyright (c) 3535 Someone</copyright-notice>
+    </primary-license>
     <!--
 This sample project chooses not to distribute a NOTICE. 
      -->
@@ -333,8 +368,8 @@ This sample project chooses not to distr
     <!--
 The ID links back into the organisation section. 
      -->                
-    <primary-organisation id='apache.org'/>
-        
+    <primary-organisation id='example.org'/>
+    
     <!-- 
     Contents
     ========
@@ -343,48 +378,66 @@ The ID links back into the organisation 
     direction, license and organisation. 
     -->
     <within dir='.'>
-     <!-- '.' is the root directory -->
-        <with-license id='osi:AL2'>
-         <!-- List Apache Licensed resources in the root directory -->
-            <by-organisation id='apache.org'>
+    <!-- '.' is the root directory -->
+        <with-license id='osi:mit'>
+        <!-- List MIT Licensed resources in the root directory -->
+            <by-organisation id='example.org'>
             <!-- 
                 List resources
                 in the root directory
-                with Apache License and 
+                with MIT License and 
                 licensed from apache.org 
                 -->
-                <resource name='HelloWorld.py'/>
-            </by-organisation>
-            <by-organisation id='example.org'>
-              <!-- 
-                List resources
-                in the root directory
-                with Apache License and 
-                licensed from the sample group 
-                -->
-                <resource name='boo.png'/>
+                <resource name='one.text'/>
+                <resource name='two.html'/>
+                <resource name='three.py'/>
             </by-organisation>
+        </with-license>
+    </within>
+    <!-- 
+    alpha is contained within the root directory,
+    but the meta-data uses a flat list for directories
+    and so the natural tree structure of the file system
+    is not reflected here. 
+    -->
+    <within dir='alpha'>
+        <with-license id='osi:mit'>
             <!--
-            If other resources 
-              in the root directory
-              with the Apache License
-              licensed by other organisations
-            where added
-              then this is where they would be recorded.
+            Resources are grouped by the organisation
+            that licenses them. 
              -->
+            <by-organisation id='example.org'>
+                <resource name='five.js'/>
+                <resource name='six.rb'/>
+            </by-organisation>
+            <by-organisation id='apache.org'>
+                <resource name='seven.coffee'/>
+            </by-organisation>
         </with-license>
-        <!--
-            If other resources 
-              in the root directory
-              with other licenses
-            where added
-              then this is where they would be recorded.
-        -->         
     </within>
-     <!--
-            If other resources 
-              in other directories
-            where added
-              then this is where they would be recorded.
+    <!-- 
+    alpha is contained within the root directory,
+    but the meta-data uses a flat list for directories
+    and so the natural tree structure of the file system
+    is not reflected here. 
+    -->
+    <within dir='beta'>
+    <!-- 
+    Compare this with the root directory,
+    and you'll see that there is nothing special 
+    about the handling of contents with the primary
+    license.
      -->
+        <with-license id='osi:AL2'>
+            <by-organisation id='apache.org'>
+                <resource name='eight.java'/>
+            </by-organisation>
+        </with-license>
+    </within>
+    <!--
+       If other resources 
+       in other directories
+       where added
+       then this is where they would be recorded.
+    -->
 </manifest>

Modified: creadur/whisker/trunk/apache-whisker-plugin4maven/src/it/in-5/verify.groovy
URL: http://svn.apache.org/viewvc/creadur/whisker/trunk/apache-whisker-plugin4maven/src/it/in-5/verify.groovy?rev=1372101&r1=1372100&r2=1372101&view=diff
==============================================================================
--- creadur/whisker/trunk/apache-whisker-plugin4maven/src/it/in-5/verify.groovy (original)
+++ creadur/whisker/trunk/apache-whisker-plugin4maven/src/it/in-5/verify.groovy Sun Aug 12
14:20:06 2012
@@ -25,24 +25,69 @@ assert license.exists()  
 def reader = new BufferedReader(new InputStreamReader(new FileInputStream(license), "UTF-8"))
 
 
 def alv2 = false
-def group = false
-def boo = false
+def mit = false
+def thirdParty = false
+def apacheOrg = false
+def five = false
+def copyright = false
+def one = false
+def two = false
+def three = false
+def six = false
+def seven = false
+def eight = false
 def line = reader.readLine()
 while (line != null) {
     if (line.contains("Apache License")) {
         apache = true
     }
-    if (line.contains("The Legion of the Bouncy Example")) {
-        group = true
+    if (line.contains("Permission is hereby granted, free  of charge, to any person obtaining"))
{
+        mit = true
     }
-    if (line.contains("boo.png")) {
-        boo = true
+    if (line.contains("Copyright (c) 3535 Someone")) {
+        copyright = true
     }
+    if (line.contains("This distribution contains third party resources.")) {
+        thirdParty = true
+    }
+    if (line.contains("Apache Software Foundation")) {
+        apacheOrg = true
+    }
+    
+    if (line.contains("five.js")) {
+        five = true
+    }
+    if (line.contains("one.text")) {
+        one = true
+    }
+    if (line.contains("two.html")) {
+        two = true
+    }
+    if (line.contains("three.py")) {
+        three = true
+    }
+    if (line.contains("six.rb")) {
+        six = true
+    }
+    if (line.contains("seven.coffee")) {
+        seven = true
+    }
+    if (line.contains("eight.java")) {
+        eight = true
+    }
+    
     line = reader.readLine()
 }
-assert boo
+assert apacheOrg
 assert apache
-assert group
-
+assert thirdParty
+assert mit
+assert !five
+assert !one
+assert !two
+assert !three
+assert !six
+assert seven
+assert eight
     
 return true;
\ No newline at end of file



Mime
View raw message