Added XenServerJava BSD licensing information to the whisker descriptor and output LICENSE files.

chipchilders · chipchilders · commit 0f0c08373ff0 · 2012-08-29T16:33:47.000-04:00
diff --git a/LICENSE b/LICENSE
@@ -275,6 +275,40 @@ Within the console-proxy/js directory
             jquery.js             
 
 
+Within the deps directory
+    licensed under the BSD (2-clause) for XenServerJava http://www.opensource.org/licenses/BSD-2-Clause  (as follows)
+
+            Copyright (c) Citrix Systems, Inc.
+            All rights reserved. 
+            
+            Redistribution and use in source and binary forms, with or without
+            modification, are permitted provided that the following conditions are
+            met:
+            
+             1) Redistributions of source code must retain the above copyright
+                notice, this list of conditions and the following disclaimer.
+            
+             2) Redistributions in binary form must reproduce the above copyright
+                notice, this list of conditions and the following disclaimer in
+                the documentation and/or other materials provided with the
+                distribution.
+            
+            THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+            "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+            LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+            A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+            HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+            SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+            LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+            DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+            THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+            (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+            OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+                            
+        from Citrix Systems, Inc  http://www.citrix.com/ 
+            XenServerJava  http://community.citrix.com/cdn/xs/sdks/             
+
+
 Within the deps/awsapi-lib directory
     licensed under the ANTLR 2 License http://www.antlr2.org/license.html  (as follows)
  
diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml
@@ -1022,6 +1022,34 @@ 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>
+        <license name='BSD (2-clause) for XenServerJava' id='BSD2ClauseXenServerJava'
+            url='http://www.opensource.org/licenses/BSD-2-Clause'>
+            <text>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ 1) Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+ 2) Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+            </text>
+        </license>
         <license name='BSD (2-clause)' id='BSD2ClauseGeneric'
             url='http://www.opensource.org/licenses/BSD-2-Clause'>
             <text>
@@ -2368,6 +2396,10 @@ this distribution.
         	id='person:shigeru.chiba'
         	name='Shigeru Chiba'
         	url='http://www.csg.ci.i.u-tokyo.ac.jp/~chiba/javassist/' />
+        <organisation
+            id='citrix.com'
+            name='Citrix Systems, Inc'
+            url='http://www.citrix.com/' />
     </organisations>
     <primary-license id='ApacheLicenseVersion2'>
         <copyright-notice>Copyright (c) 2012 The Apache Software Foundation</copyright-notice>
@@ -2387,6 +2419,17 @@ Copyright © 2005-2010 Thomas Nagy
             </by-organisation>
         </with-license>
     </within>
+    <within dir='deps'>
+        <with-license id='BSD2ClauseXenServerJava'>
+            <copyright-notice>
+Copyright (c) Citrix Systems, Inc.
+All rights reserved.
+            </copyright-notice>
+            <by-organisation id='citrix.com'>
+                <resource name='XenServerJava' source='http://community.citrix.com/cdn/xs/sdks/' />
+            </by-organisation>
+        </with-license>
+    </within>
     <within dir='console-proxy/js'>
         <with-license id='MIT'>
             <copyright-notice>
