You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@lenya.apache.org by Andreas Hartmann <an...@apache.org> on 2009/04/02 14:26:13 UTC
Re: svn commit: r761231 - in /lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk:
./ multi-install/ src/extension/ src/extension/chrome/content/ src/extension/chrome/content/browser/
Michael Wechner schrieb:
> You might want to check with Apache legal if this is actually possible.
>
> AFAIK the ASF requires to obtain the copyright if stuff is being checked
> in and distributed by the ASF.
Thanks for the hint! I'll investigate this immediately.
-- Andreas
>
> Cheers
>
> Michael
>
> andreas@apache.org schrieb:
>> Author: andreas
>> Date: Thu Apr 2 10:15:07 2009
>> New Revision: 761231
>>
>> URL: http://svn.apache.org/viewvc?rev=761231&view=rev
>> Log:
>> Adding copyright notice for Wired Inference GmbH. BTW, thanks to the
>> University of Zurich for sponsoring the development of the Firedocs
>> editor and the Medical Institute of the University of Freiburg for
>> contributing the integration of the editor in Lenya.
>>
>> Modified:
>>
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/README.txt
>>
>>
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/build.properties
>>
>>
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/build.xml
>>
>>
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/multi-install/install.rdf
>>
>>
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome.manifest
>>
>>
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/LenyaDocumentUriResolver.js
>>
>>
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/LenyaOverlayManager.js
>>
>>
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/browser/LenyaEditorButtonPopupShowingListener.js
>>
>>
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/browser/browserOverlay.xul
>>
>>
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/lenyaOverlay.xul
>>
>>
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/install.rdf
>>
>>
>> Modified:
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/README.txt
>>
>> URL:
>> http://svn.apache.org/viewvc/lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/README.txt?rev=761231&r1=761230&r2=761231&view=diff
>>
>> ==============================================================================
>>
>> ---
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/README.txt
>> (original)
>> +++
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/README.txt
>> Thu Apr 2 10:15:07 2009
>> @@ -1,4 +1,6 @@
>> #
>> +# Copyright 2008-2011 Wired Inference GmbH Zuerich
>> +#
>> # Licensed to the Apache Software Foundation (ASF) under one or more
>> # contributor license agreements. See the NOTICE file distributed with
>> # this work for additional information regarding copyright ownership.
>>
>> Modified:
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/build.properties
>>
>> URL:
>> http://svn.apache.org/viewvc/lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/build.properties?rev=761231&r1=761230&r2=761231&view=diff
>>
>> ==============================================================================
>>
>> ---
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/build.properties
>> (original)
>> +++
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/build.properties
>> Thu Apr 2 10:15:07 2009
>> @@ -1,4 +1,6 @@
>> #
>> +# Copyright 2008-2011 Wired Inference GmbH Zuerich
>> +#
>> # Licensed to the Apache Software Foundation (ASF) under one or more
>> # contributor license agreements. See the NOTICE file distributed with
>> # this work for additional information regarding copyright ownership.
>>
>> Modified:
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/build.xml
>>
>> URL:
>> http://svn.apache.org/viewvc/lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/build.xml?rev=761231&r1=761230&r2=761231&view=diff
>>
>> ==============================================================================
>>
>> ---
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/build.xml
>> (original)
>> +++
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/build.xml
>> Thu Apr 2 10:15:07 2009
>> @@ -1,4 +1,6 @@
>> <!--
>> + Copyright 2008-2011 Wired Inference GmbH Zuerich
>> + Licensed to the Apache Software Foundation (ASF) under one or more
>> contributor license agreements. See the NOTICE file distributed with
>> this work for additional information regarding copyright ownership.
>>
>> Modified:
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/multi-install/install.rdf
>>
>> URL:
>> http://svn.apache.org/viewvc/lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/multi-install/install.rdf?rev=761231&r1=761230&r2=761231&view=diff
>>
>> ==============================================================================
>>
>> ---
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/multi-install/install.rdf
>> (original)
>> +++
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/multi-install/install.rdf
>> Thu Apr 2 10:15:07 2009
>> @@ -1,5 +1,7 @@
>> <?xml version="1.0" encoding="ISO-8859-1"?>
>> <!--
>> + Copyright 2008-2011 Wired Inference GmbH Zuerich
>> +
>> Licensed to the Apache Software Foundation (ASF) under one or more
>> contributor license agreements. See the NOTICE file distributed with
>> this work for additional information regarding copyright ownership.
>>
>> Modified:
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome.manifest
>>
>> URL:
>> http://svn.apache.org/viewvc/lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome.manifest?rev=761231&r1=761230&r2=761231&view=diff
>>
>> ==============================================================================
>>
>> ---
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome.manifest
>> (original)
>> +++
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome.manifest
>> Thu Apr 2 10:15:07 2009
>> @@ -1,4 +1,6 @@
>> #
>> +# Copyright 2008-2011 Wired Inference GmbH Zuerich
>> +#
>> # Licensed to the Apache Software Foundation (ASF) under one or more
>> # contributor license agreements. See the NOTICE file distributed with
>> # this work for additional information regarding copyright ownership.
>>
>> Modified:
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/LenyaDocumentUriResolver.js
>>
>> URL:
>> http://svn.apache.org/viewvc/lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/LenyaDocumentUriResolver.js?rev=761231&r1=761230&r2=761231&view=diff
>>
>> ==============================================================================
>>
>> ---
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/LenyaDocumentUriResolver.js
>> (original)
>> +++
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/LenyaDocumentUriResolver.js
>> Thu Apr 2 10:15:07 2009
>> @@ -1,4 +1,6 @@
>> /*
>> + * Copyright 2008-2011 Wired Inference GmbH Zuerich
>> + *
>> * Licensed to the Apache Software Foundation (ASF) under one or more
>> * contributor license agreements. See the NOTICE file distributed
>> with
>> * this work for additional information regarding copyright ownership.
>>
>> Modified:
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/LenyaOverlayManager.js
>>
>> URL:
>> http://svn.apache.org/viewvc/lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/LenyaOverlayManager.js?rev=761231&r1=761230&r2=761231&view=diff
>>
>> ==============================================================================
>>
>> ---
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/LenyaOverlayManager.js
>> (original)
>> +++
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/LenyaOverlayManager.js
>> Thu Apr 2 10:15:07 2009
>> @@ -1,4 +1,6 @@
>> /*
>> + * Copyright 2008-2011 Wired Inference GmbH Zuerich
>> + *
>> * Licensed to the Apache Software Foundation (ASF) under one or more
>> * contributor license agreements. See the NOTICE file distributed
>> with
>> * this work for additional information regarding copyright ownership.
>>
>> Modified:
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/browser/LenyaEditorButtonPopupShowingListener.js
>>
>> URL:
>> http://svn.apache.org/viewvc/lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/browser/LenyaEditorButtonPopupShowingListener.js?rev=761231&r1=761230&r2=761231&view=diff
>>
>> ==============================================================================
>>
>> ---
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/browser/LenyaEditorButtonPopupShowingListener.js
>> (original)
>> +++
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/browser/LenyaEditorButtonPopupShowingListener.js
>> Thu Apr 2 10:15:07 2009
>> @@ -1,4 +1,6 @@
>> /*
>> + * Copyright 2008-2011 Wired Inference GmbH Zuerich
>> + *
>> * Licensed to the Apache Software Foundation (ASF) under one or more
>> * contributor license agreements. See the NOTICE file distributed
>> with
>> * this work for additional information regarding copyright ownership.
>>
>> Modified:
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/browser/browserOverlay.xul
>>
>> URL:
>> http://svn.apache.org/viewvc/lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/browser/browserOverlay.xul?rev=761231&r1=761230&r2=761231&view=diff
>>
>> ==============================================================================
>>
>> ---
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/browser/browserOverlay.xul
>> (original)
>> +++
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/browser/browserOverlay.xul
>> Thu Apr 2 10:15:07 2009
>> @@ -1,5 +1,7 @@
>> <?xml version="1.0"?>
>> <!--
>> + Copyright 2008-2011 Wired Inference GmbH Zuerich
>> +
>> Licensed to the Apache Software Foundation (ASF) under one or more
>> contributor license agreements. See the NOTICE file distributed with
>> this work for additional information regarding copyright ownership.
>>
>> Modified:
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/lenyaOverlay.xul
>>
>> URL:
>> http://svn.apache.org/viewvc/lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/lenyaOverlay.xul?rev=761231&r1=761230&r2=761231&view=diff
>>
>> ==============================================================================
>>
>> ---
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/lenyaOverlay.xul
>> (original)
>> +++
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/chrome/content/lenyaOverlay.xul
>> Thu Apr 2 10:15:07 2009
>> @@ -1,5 +1,7 @@
>> <?xml version="1.0"?>
>> <!--
>> + Copyright 2008-2011 Wired Inference GmbH Zuerich
>> + Licensed to the Apache Software Foundation (ASF) under one or more
>> contributor license agreements. See the NOTICE file distributed with
>> this work for additional information regarding copyright ownership.
>>
>> Modified:
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/install.rdf
>>
>> URL:
>> http://svn.apache.org/viewvc/lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/install.rdf?rev=761231&r1=761230&r2=761231&view=diff
>>
>> ==============================================================================
>>
>> ---
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/install.rdf
>> (original)
>> +++
>> lenya/contributions/2_0_X/external/firedocs/firedocs-lenya/trunk/src/extension/install.rdf
>> Thu Apr 2 10:15:07 2009
>> @@ -1,5 +1,7 @@
>> <?xml version="1.0" encoding="ISO-8859-1"?>
>> <!--
>> + Copyright 2008-2011 Wired Inference GmbH Zuerich
>> + Licensed to the Apache Software Foundation (ASF) under one or more
>> contributor license agreements. See the NOTICE file distributed with
>> this work for additional information regarding copyright ownership.
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
>> For additional commands, e-mail: commits-help@lenya.apache.org
>>
>>
--
Andreas Hartmann, CTO
BeCompany GmbH
http://www.becompany.ch
Tel.: +41 (0) 43 818 57 01
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: Copyright for Firedocs Add-on (was: svn commit: r761231)
Posted by Thomas Comiotto <th...@id.uzh.ch>.
>
>
> Thomas, is it OK for you if we remove the copyright notice
> "Copyright 2008-2011 Wired Inference GmbH Zuerich" from the source
> files and add it to a separate NOTICE file instead?
>
Sure.
Thomas
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Copyright for Firedocs Add-on (was: svn commit: r761231)
Posted by Andreas Hartmann <an...@apache.org>.
Andreas Hartmann schrieb:
> Michael Wechner schrieb:
>> You might want to check with Apache legal if this is actually possible.
>>
>> AFAIK the ASF requires to obtain the copyright if stuff is being
>> checked in and distributed by the ASF.
>
> Thanks for the hint! I'll investigate this immediately.
You're totally right, the copyright must be moved to a separate NOTICE file:
http://www.apache.org/legal/src-headers.html
<quote>
If the source file is submitted with a copyright notice included in it,
the copyright owner (or owner's agent) must either:
1. remove such notices, or
2. move them to the NOTICE file associated with each applicable
project release, or
3. provide written permission for the ASF to make such removal or
relocation of the notices.
</quote>
Thomas, is it OK for you if we remove the copyright notice "Copyright
2008-2011 Wired Inference GmbH Zuerich" from the source files and add it
to a separate NOTICE file instead?
Thanks!
-- Andreas
--
Andreas Hartmann, CTO
BeCompany GmbH
http://www.becompany.ch
Tel.: +41 (0) 43 818 57 01
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org