You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2012/09/25 20:49:31 UTC
git commit: Worked around a Whisker bug for the LICENSE file.
Updated Branches:
refs/heads/master e2730c91d -> 719ccab0e
Worked around a Whisker bug for the LICENSE file.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/719ccab0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/719ccab0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/719ccab0
Branch: refs/heads/master
Commit: 719ccab0efc55e61c87dbe8beab0a472e9a502f8
Parents: e2730c9
Author: Chip Childers <ch...@gmail.com>
Authored: Tue Sep 25 14:48:39 2012 -0400
Committer: Chip Childers <ch...@gmail.com>
Committed: Tue Sep 25 14:48:39 2012 -0400
----------------------------------------------------------------------
LICENSE | 18 +++++++++++++++
tools/whisker/descriptor.xml | 42 ++++++++----------------------------
2 files changed, 28 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/719ccab0/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index df583bb..9a6d2c9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2348,6 +2348,24 @@ Within the deps/awsapi-lib directory
javassist-3.9.0.GA.jar http://sourceforge.net/projects/jboss/files/Javassist/
+Within the patches/systemvm/debian/config/etc directory
+ placed in the public domain
+ by Simon Kelley
+ dnsmasq.conf
+ vpcdnsmasq.conf
+
+
+Within the patches/systemvm/debian/config/etc/apache2 directory
+ licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above)
+ Copyright � 2012 The Apache Software Foundation
+ from The Apache Software Foundation http://www.apache.org/
+ httpd.conf
+ ports.conf
+ sites-available/default
+ sites-available/default-ssl
+ vhostexample.conf
+
+
Within the scripts/storage/secondary directory
licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above)
Copyright � 2010-2011 OpenStack, LLC.
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/719ccab0/tools/whisker/descriptor.xml
----------------------------------------------------------------------
diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml
index 0decf74..18f1738 100644
--- a/tools/whisker/descriptor.xml
+++ b/tools/whisker/descriptor.xml
@@ -16,32 +16,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<!--
-
-The following source / binaries need to be either removed from the project
-completely, or set to be optional downloads / build features:
-
-deps/XenServerJava/*
-deps/bin/*
-deps/cloud-iControl.jar
-deps/cloud-jasypt-1.8.jar
-deps/cloud-jnetpcap.jar
-deps/cloud-manageontap.jar
-deps/cloud-netscaler-sdx.jar
-deps/cloud-netscaler.jar
-deps/cloud-servlet-api.jar
-deps/cloud-xenserver-5.6.100-1.jar
-deps/libvirt-0.4.8.jar
-deps/vmware-apputils.jar
-deps/vmware-lib-jaxrpc.jar
-deps/vmware-vim.jar
-deps/vmware-vim25.jar
-deps/awsapi-lib/c3p0-0.9.1.2.jar < GPL!
-deps/awsapi-lib/hibernate3.jar < GPL!
--->
-
-
<manifest>
<licenses>
<license name='COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0' id='CDDL'
@@ -2283,6 +2257,10 @@ this distribution.
id='apache.org'
name='The Apache Software Foundation'
url='http://www.apache.org/'/>
+ <organisation
+ id='apache.org.2'
+ name='The Apache Software Foundation'
+ url='http://www.apache.org/'/>
<organisation
id='person:Thomas.Nagy'
name='Thomas Nagy'
@@ -2443,7 +2421,7 @@ Copyright © 2005-2010 Thomas Nagy
<copyright-notice>
Copyright © 2012 The Apache Software Foundation
</copyright-notice>
- <by-organisation id='apache.org'>
+ <by-organisation id='apache.org.2'>
<resource name='httpd.conf' />
<resource name='ports.conf' />
<resource name='vhostexample.conf' />
@@ -2454,7 +2432,7 @@ Copyright © 2012 The Apache Software Foundation
</within>
<within dir='patches/systemvm/debian/config/etc'>
<public-domain>
- <by-organisation id='person:simon.kelly'>
+ <by-organisation id='person:simon.kelley'>
<resource name='vpcdnsmasq.conf' />
<resource name='dnsmasq.conf' />
</by-organisation>
@@ -2609,7 +2587,7 @@ Copyright © 2004 Clinton Begin
<copyright-notice>
Copyright © 2012 The Apache Software Foundation
</copyright-notice>
- <by-organisation id="apache.org">
+ <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" />
<resource name="cloud-commons-collections-3.2.1.jar" source="http://commons.apache.org/collections/"/>
@@ -2631,7 +2609,7 @@ Copyright © 2012 The Apache Software Foundation
<copyright-notice>
Copyright © 2012 The Apache Software Foundation
</copyright-notice>
- <by-organisation id="apache.org">
+ <by-organisation id="apache.org.2">
<resource name="cloud-commons-discovery.jar" source="http://commons.apache.org/discovery/" />
</by-organisation>
</with-license>
@@ -2774,7 +2752,7 @@ Copyright © 2010-2011 OpenStack, LLC.
<copyright-notice>
Copyright © 2004-2008 The Apache Software Foundation
</copyright-notice>
- <by-organisation id='apache.org'>
+ <by-organisation id='apache.org.2'>
<resource name='XmlSchema-1.4.3.jar' notice='xmlschema.notice' />
</by-organisation>
</with-license>
@@ -2797,7 +2775,7 @@ Copyright © 2004-2011 QOS.ch
<copyright-notice>
Copyright © 2004-2012 The Apache Software Foundation
</copyright-notice>
- <by-organisation id="apache.org">
+ <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" />
<resource name="axiom-impl-1.2.8.jar" source="http://ws.apache.org/axiom/source-repository.html" notice="axiom.notice" />
Re: git commit: Worked around a Whisker bug for the LICENSE file.
Posted by Noah Slater <ns...@tumbolia.org>.
I see they were changed to "(c)" after this commit. Can probably just
remove them. :)
On Sun, Sep 30, 2012 at 3:58 PM, Noah Slater <ns...@tumbolia.org> wrote:
> The copyright symbols seem to be causing encoding issues. We can drop them
> if that is a concern. (Copyright law treats "Copyright" and "(C)"
> identically. You only need one, not both. And by "(C)" I mean the copyright
> symbol. A "C" in parenthesis means nothing. Amusingly enough.)
>
> Also, putting year ranges in the copyright statements is meaningless. We
> should pick the latest year of release at the time the code was imported.
>
> So, for example:
>
> Copyright 2012, The Apache Software Foundation
>
>
> Instead of:
>
> Copyright © 2004-2012 The Apache Software Foundation
>
>
> (Anyway. This is just an my personal opinion and not an Apache policy
> thing. Feel free to ignore me!)
>
>
> On Tue, Sep 25, 2012 at 7:49 PM, <ch...@apache.org> wrote:
>
>> �
>
>
>
>
> --
> NS
>
--
NS
Re: git commit: Worked around a Whisker bug for the LICENSE file.
Posted by Noah Slater <ns...@tumbolia.org>.
Yes, probably a good call, based on some things I read recently. Thanks!
On Mon, Oct 1, 2012 at 6:42 PM, Chip Childers <ch...@sungard.com>wrote:
> On Sun, Sep 30, 2012 at 10:58 AM, Noah Slater <ns...@tumbolia.org>
> wrote:
> > The copyright symbols seem to be causing encoding issues. We can drop
> them
> > if that is a concern. (Copyright law treats "Copyright" and "(C)"
> > identically. You only need one, not both. And by "(C)" I mean the
> copyright
> > symbol. A "C" in parenthesis means nothing. Amusingly enough.)
> >
> > Also, putting year ranges in the copyright statements is meaningless. We
> > should pick the latest year of release at the time the code was imported.
> >
> > So, for example:
> >
> > Copyright 2012, The Apache Software Foundation
> >
> >
> > Instead of:
> >
> > Copyright © 2004-2012 The Apache Software Foundation
> >
> >
> > (Anyway. This is just an my personal opinion and not an Apache policy
> > thing. Feel free to ignore me!)
>
> I chose to err on the side of respecting the specific way that other
> projects have established the text for their copyright notices vs.
> modifying it for the actual year that the code was pulled in.
>
> -chip
>
> > On Tue, Sep 25, 2012 at 7:49 PM, <ch...@apache.org> wrote:
> >
> >> �
> >
> >
> >
> >
> > --
> > NS
>
--
NS
Re: git commit: Worked around a Whisker bug for the LICENSE file.
Posted by Chip Childers <ch...@sungard.com>.
On Sun, Sep 30, 2012 at 10:58 AM, Noah Slater <ns...@tumbolia.org> wrote:
> The copyright symbols seem to be causing encoding issues. We can drop them
> if that is a concern. (Copyright law treats "Copyright" and "(C)"
> identically. You only need one, not both. And by "(C)" I mean the copyright
> symbol. A "C" in parenthesis means nothing. Amusingly enough.)
>
> Also, putting year ranges in the copyright statements is meaningless. We
> should pick the latest year of release at the time the code was imported.
>
> So, for example:
>
> Copyright 2012, The Apache Software Foundation
>
>
> Instead of:
>
> Copyright © 2004-2012 The Apache Software Foundation
>
>
> (Anyway. This is just an my personal opinion and not an Apache policy
> thing. Feel free to ignore me!)
I chose to err on the side of respecting the specific way that other
projects have established the text for their copyright notices vs.
modifying it for the actual year that the code was pulled in.
-chip
> On Tue, Sep 25, 2012 at 7:49 PM, <ch...@apache.org> wrote:
>
>> �
>
>
>
>
> --
> NS
Re: git commit: Worked around a Whisker bug for the LICENSE file.
Posted by Noah Slater <ns...@tumbolia.org>.
The copyright symbols seem to be causing encoding issues. We can drop them
if that is a concern. (Copyright law treats "Copyright" and "(C)"
identically. You only need one, not both. And by "(C)" I mean the copyright
symbol. A "C" in parenthesis means nothing. Amusingly enough.)
Also, putting year ranges in the copyright statements is meaningless. We
should pick the latest year of release at the time the code was imported.
So, for example:
Copyright 2012, The Apache Software Foundation
Instead of:
Copyright © 2004-2012 The Apache Software Foundation
(Anyway. This is just an my personal opinion and not an Apache policy
thing. Feel free to ignore me!)
On Tue, Sep 25, 2012 at 7:49 PM, <ch...@apache.org> wrote:
> �
--
NS