You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by rd...@apache.org on 2012/11/05 21:36:09 UTC

svn commit: r1405943 - /creadur/whisker/trunk/apache-whisker-plugin4maven/src/it/whisker-10/descriptor.xml

Author: rdonkin
Date: Mon Nov  5 20:36:09 2012
New Revision: 1405943

URL: http://svn.apache.org/viewvc?rev=1405943&view=rev
Log:
WHISKER-10 remove copyright notices, demonstrating that there is no issue in the current codebase.

Modified:
    creadur/whisker/trunk/apache-whisker-plugin4maven/src/it/whisker-10/descriptor.xml

Modified: creadur/whisker/trunk/apache-whisker-plugin4maven/src/it/whisker-10/descriptor.xml
URL: http://svn.apache.org/viewvc/creadur/whisker/trunk/apache-whisker-plugin4maven/src/it/whisker-10/descriptor.xml?rev=1405943&r1=1405942&r2=1405943&view=diff
==============================================================================
--- creadur/whisker/trunk/apache-whisker-plugin4maven/src/it/whisker-10/descriptor.xml (original)
+++ creadur/whisker/trunk/apache-whisker-plugin4maven/src/it/whisker-10/descriptor.xml Mon Nov  5 20:36:09 2012
@@ -2425,7 +2425,6 @@ Innovation Centre, 2006 (http://www.it-i
             url='http://www.adiscon.com/' />
     </organisations>
     <primary-license id='ApacheLicenseVersion2'>
-        <copyright-notice>Copyright (c) 2012 The Apache Software Foundation</copyright-notice>
     </primary-license>
     <primary-notice id="foo">
 This product includes software developed at
@@ -2434,9 +2433,6 @@ The Apache Software Foundation (http://w
     <primary-organisation id='apache.org'/>
     <within dir='.'>
         <with-license id='BSD3ClauseGeneric'>
-            <copyright-notice>
-Copyright (c) 2005-2010 Thomas Nagy
-            </copyright-notice>
             <by-organisation id="person:Thomas.Nagy">
                 <resource name="waf"/>
             </by-organisation>
@@ -2444,9 +2440,6 @@ Copyright (c) 2005-2010 Thomas Nagy
     </within>
     <within dir='patches/systemvm/debian/config/etc/apache2'>
         <with-license id='ApacheLicenseVersion2'>
-            <copyright-notice>
-Copyright (c) 2012 The Apache Software Foundation
-            </copyright-notice>
             <by-organisation id='apache.org.2'>
                 <resource name='httpd.conf' />
                 <resource name='ports.conf' />
@@ -2476,7 +2469,6 @@ Copyright (c) 2012 The Apache Software F
     </within>
     <within dir='patches/systemvm/debian/config/etc/ssh/'>
         <with-license id='BSD2ClauseGeneric'>
-            <copyright-notice />
             <by-organisation id='openssh.org'>
                 <resource name='sshd_config' />
             </by-organisation>
@@ -2484,10 +2476,6 @@ Copyright (c) 2012 The Apache Software F
     </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>
@@ -2505,9 +2493,6 @@ Copyright (c) 2009, John Resig
     </within>
     <within dir='ui/lib'>
         <with-license id='ApacheLicenseVersion2'>
-            <copyright-notice>
-Copyright (c) 2006 Google Inc.
-            </copyright-notice>
             <by-organisation id='google.com'>
                 <resource name='excanvas.js' source='http://code.google.com/p/explorercanvas/' />
             </by-organisation>
@@ -2545,10 +2530,6 @@ Copyright (c) 2006 Klaus Hartl (stilbuer
             </by-organisation>
         </with-license>
         <with-license id='BSD2ClauseGeneric'>
-            <copyright-notice>
-Copyright (c) 2008 George McGinley Smith
-All rights reserved.
-            </copyright-notice>
             <by-organisation id='person:george.mcginley.smith'>
                 <resource name="jquery.easing.js" />
             </by-organisation>
@@ -2616,9 +2597,6 @@ Copyright (c) 2012 John Resig, Jörn Z
     </within>
     <within dir='awsapi'>
         <with-license id='BSD3ClauseGeneric'>
-            <copyright-notice>
-Copyright (c) 2005-2010 Thomas Nagy
-            </copyright-notice>
             <by-organisation id="person:Thomas.Nagy">
                 <resource name="waf"/>
             </by-organisation>
@@ -2626,9 +2604,6 @@ Copyright (c) 2005-2010 Thomas Nagy
     </within>
     <within dir='utils/src/com/cloud/utils/db'>
         <with-license id='ApacheLicenseVersion2'>
-            <copyright-notice>
-Copyright (c) 2004 Clinton Begin
-            </copyright-notice>
             <by-organisation id="person:Clinton.Begin">
 `                <resource name="ScriptRunner.java" source="http://code.google.com/p/mybatis/" />
             </by-organisation>
@@ -2646,9 +2621,6 @@ Copyright (C) 2008      Tóth Istvá
             </by-organisation>
         </with-license>
         <with-license id="ApacheLicenseVersion2">
-            <copyright-notice>
-Copyright (c) 2012 The Apache Software Foundation
-            </copyright-notice>
             <by-organisation id="apache.org.2">
                 <resource name="cloud-axis.jar" source="http://axis.apache.org/axis/" notice='axis2.notice'/>
                 <resource name="cloud-commons-codec-1.5.jar" source="http://commons.apache.org/codec/" notice="codec" />
@@ -2668,82 +2640,52 @@ Copyright (c) 2012 The Apache Software F
             </by-organisation>
         </with-license>
         <with-license id="ApacheLicenseVersion1.1">
-            <copyright-notice>
-Copyright (c) 2012 The Apache Software Foundation
-            </copyright-notice>
             <by-organisation id="apache.org.2">
                 <resource name="cloud-commons-discovery.jar" source="http://commons.apache.org/discovery/" />
             </by-organisation>
         </with-license>
         <with-license id="ApacheLicenseVersion2">
-            <copyright-notice>
-Copyright (c) 2007-2010, The JASYPT team (http://www.jasypt.org)
-            </copyright-notice>
             <by-organisation id='jasypt.org'>
                 <resource name='cloud-jasypt-1.9.jar' source='http://www.jasypt.org' notice='jasypt.notice' />
             </by-organisation>
         </with-license>
         <with-license id="ApacheLicenseVersion2">
-            <copyright-notice>
-Copyright (c) 2003-2007 Luck Consulting Pty Ltd
-            </copyright-notice>
             <by-organisation id="luck">
                 <resource name="cloud-ehcache.jar" source="http://ehcache.org/" />
             </by-organisation>
         </with-license>
         <with-license id='CDDL'>
-            <copyright-notice>
-Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved.
-            </copyright-notice>
             <by-organisation id='glassfish.org'>
                 <resource name='cloud-ejb-api-3.0.jar' source='http://repo1.maven.org/maven2/javax/ejb/ejb-api/3.0/ejb-api-3.0-sources.jar' notice='cddlnotice' />
                 <resource name='cloud-jstl-1.2.jar' source='http://jstl.java.net/' notice='cddlnotice' />
             </by-organisation>
         </with-license>
         <with-license id='CDDL'>
-            <copyright-notice>
-Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
-            </copyright-notice>
             <by-organisation id='oracle.com'>
                 <resource name='cloud-email.jar' source='http://kenai.com/projects/javamail' notice='cddlnotice' />
             </by-organisation>
         </with-license>
         <with-license id='ApacheLicenseVersion2'>
-            <copyright-notice>
-Copyright (c) 2009 Google Inc.
-            </copyright-notice>
             <by-organisation id='google.com'>
                 <resource name='cloud-google-gson-1.7.1.jar' source='http://code.google.com/p/google-gson/' />
             </by-organisation>
         </with-license>
         <with-license id='EclipseDistributionLicense1'>
-            <copyright-notice>
-Copyright (c) 2012 The Eclipse Foundation.
-            </copyright-notice>
             <by-organisation id='eclipse.org'>
                 <resource name='cloud-javax.persistence-2.0.0.jar' source='http://wiki.eclipse.org/EclipseLink/Release/2.0.0' notice='eclipse.persistence' />
             </by-organisation>
         </with-license>
         <with-license id='BSD3ClauseGeneric'>
-            <copyright-notice>
-Copyright (c) 2009, Caringo, Inc.
-            </copyright-notice>
             <by-organisation id='caringo.com'>
                 <resource name='CAStorSDK.jar' source='http://www.castor.org/download.html' />
             </by-organisation>
         </with-license>
         <with-license id='BSD3ClauseGeneric'>
-            <copyright-notice>
-Copyright (c) 2002-2011 Atsuhiko Yamanaka, JCraft,Inc.
-            </copyright-notice>
             <by-organisation id='jcraft.com'>
                 <resource name='cloud-jsch-0.1.42.jar' source='http://www.jcraft.com/jsch/' />
             </by-organisation>
         </with-license>
         <with-license id='CPL1'>
-            <copyright-notice>
-Copyright (c) IBM Corp 2006
-            </copyright-notice>
             <by-organisation id='ibm.com'>
                 <resource name='cloud-wsdl4j-1.6.2.jar' source='http://sourceforge.net/projects/wsdl4j/' />
                 <resource name='cloud-wsdl4j.jar' source='http://sourceforge.net/projects/wsdl4j/' />
@@ -2762,23 +2704,17 @@ Copyright (c) IBM Corp 2006
             </by-organisation>
         </with-license>
         <with-license id='BSD3ClauseGeneric'>
-            <copyright-notice>
-Copyright (c) 2007-2008 Trilead AG (http://www.trilead.com)
-All rights reserved.
-            </copyright-notice>
             <by-organisation id='trilead.com'>
                 <resource name='cloud-trilead-ssh2-build213.jar' source='http://sourceforge.net/projects/orion-ssh2/' notice='trilead.notice' />
             </by-organisation>
         </with-license>
         <with-license id='ApacheLicenseVersion2'>
-            <copyright-notice />
             <by-organisation id='jetty.codehaus.com'>
                 <resource name='jetty-6.1.26.jar' source='http://repo1.maven.org/maven2/org/mortbay/jetty/jetty/6.1.26/jetty-6.1.26-sources.jar' />
                 <resource name='jetty-util-6.1.26.jar' source='http://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util/6.1.26/jetty-util-6.1.26-sources.jar' />
             </by-organisation>
         </with-license>
         <with-license id='CPL1'>
-            <copyright-notice />
             <by-organisation id='junit.org'>
                 <resource name='cloud-junit.jar' source='http://kentbeck.github.com/junit/' />
             </by-organisation>
@@ -2791,9 +2727,6 @@ All rights reserved.
     </within>
     <within dir='scripts/storage/secondary'>
         <with-license id='ApacheLicenseVersion2'>
-            <copyright-notice>
-Copyright (c) 2010-2011 OpenStack, LLC.
-            </copyright-notice>
             <by-organisation id='openstack.org'>
                 <resource name='swift' />
             </by-organisation>
@@ -2801,9 +2734,6 @@ Copyright (c) 2010-2011 OpenStack, LLC.
     </within>
     <within dir='scripts/vm/hypervisor/xenserver'>
         <with-license id='ApacheLicenseVersion2'>
-            <copyright-notice>
-Copyright (c) 2010-2011 OpenStack, LLC.
-            </copyright-notice>
             <by-organisation id='openstack.org'>
                 <resource name='swift' />
             </by-organisation>
@@ -2811,15 +2741,11 @@ Copyright (c) 2010-2011 OpenStack, LLC.
     </within>
     <within dir='deps/awsapi-lib'>
         <with-license id='ApacheLicenseVersion2'>
-            <copyright-notice>
-Copyright (c) 2004-2008 The Apache Software Foundation
-            </copyright-notice>
             <by-organisation id='apache.org.2'>
                 <resource name='XmlSchema-1.4.3.jar' notice='xmlschema.notice' />
             </by-organisation>
         </with-license>
         <with-license id='antlr2'>
-            <copyright-notice />
             <by-organisation id='antlr2.org'>
                 <resource name='antlr-2.7.6.jar' source='http://repo1.maven.org/maven2/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar' />
             </by-organisation>
@@ -2834,9 +2760,6 @@ Copyright (c) 2004-2011 QOS.ch
             </by-organisation>
         </with-license>
         <with-license id="ApacheLicenseVersion2">
-            <copyright-notice>
-Copyright (c) 2004-2012 The Apache Software Foundation
-            </copyright-notice>
             <by-organisation id="apache.org.2">
                 <resource name="apache-log4j-extras-1.0.jar" source="http://logging.apache.org/log4j/companions/extras/" />
                 <resource name="axiom-api-1.2.8.jar" source="http://ws.apache.org/axiom/source-repository.html" notice="axiom.notice" />
@@ -2871,24 +2794,17 @@ Copyright (c) 2004-2012 The Apache Softw
             </by-organisation>
         </with-license>
         <with-license id='ApacheLicenseVersion2'>
-            <copyright-notice>
-Copyright (c) 2009 Google Inc.
-            </copyright-notice>
             <by-organisation id='google.com'>
                 <resource name='cloud-gson.jar' source='http://code.google.com/p/google-gson/' />
             </by-organisation>
         </with-license>
         <with-license id='dom4j.license'>
-            <copyright-notice />
             <by-organisation id='dom4j.sourceforge.net'>
                 <!-- TODO: Need to have a review of this license! -->
                 <resource name='dom4j-1.6.1.jar' source='http://dom4j.sourceforge.net/source-repository.html' />
             </by-organisation>
         </with-license>
         <with-license id='CDDL'>
-            <copyright-notice>
-Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
-            </copyright-notice>
             <by-organisation id='oracle.com'>
                 <resource name='jaxb-api-2.1.jar' source='http://repo1.maven.org/maven2/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar' notice='cddlnotice' />
                 <resource name='jaxb-impl-2.1.7.jar' source='http://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl/2.1.7/jaxb-impl-2.1.7-sources.jar' notice='cddlnotice' />
@@ -2896,43 +2812,31 @@ Copyright (c) 1997-2010 Oracle and/or it
             </by-organisation>
         </with-license>
         <with-license id='CDDL'>
-            <copyright-notice>
-Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved.
-            </copyright-notice>
             <by-organisation id='glassfish.org'>
                 <resource name='jta-1.1.jar' source='http://repo1.maven.org/maven2/javax/transaction/jta/1.1/jta-1.1-sources.jar' notice='cddlnotice' />
             </by-organisation>
         </with-license>
         <with-license id='BSD3ClauseGeneric'>
-            <copyright-notice>
-Copyright (c) 2002-2011 Atsuhiko Yamanaka, JCraft,Inc.
-            </copyright-notice>
             <by-organisation id='jcraft.com'>
                 <resource name='jsch-0.1.42.jar' source='http://www.jcraft.com/jsch/' />
             </by-organisation>
         </with-license>
         <with-license id='ApacheLicenseVersion2'>
-            <copyright-notice />
             <by-organisation id='json-simple'>
                 <resource name='json_simple-1.1.jar' source='http://code.google.com/p/json-simple/source/checkout' />
             </by-organisation>
         </with-license>
         <with-license id='CDDL'>
-            <copyright-notice>
-Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
-            </copyright-notice>
             <by-organisation id='oracle.com'>
                 <resource name='mail-1.4.jar' source='http://kenai.com/projects/javamail' notice='cddlnotice' />
             </by-organisation>
         </with-license>
         <with-license id='CPL1'>
-            <copyright-notice />
             <by-organisation id='junit.org'>
                 <resource name='junit-4.8.1.jar' source='http://kentbeck.github.com/junit/' />
             </by-organisation>
         </with-license>
         <with-license id='MPL1'>
-            <copyright-notice />
             <license-parameters>
                 <parameter><name>PROJECT</name><value>Javassist</value></parameter>
                 <parameter><name>INITIAL_DEVELOPER</name><value>Shigeru Chiba</value></parameter>