Yes, I have. See http://s.apache.org/qx6 for the progress made. I've found the docs you got in the foundation records (under CCLAs not under software grants) and we now know that they do function as a grant (think grant covers existing code and CCLA covers future activity of employed contributors).
I'm not sure that that grants us the right to remove the headers, let's see if we get an answer to that. Upayavira On Mon, Sep 24, 2012, at 10:35 PM, Angus Turner wrote: > So you've sent one to legal-discuss? (just confirming) > > > > On 25/09/2012, at 7:33 AM, Upayavira <u...@odoko.co.uk> wrote: > > > Oops, just sent one there... :-) > > > > Let's see if we get something back. > > > > Upayavira > > > > On Mon, Sep 24, 2012, at 09:28 PM, Angus Turner wrote: > >> Hey Guys, > >> I've gotten the original documents back from Dan, it seems to was just > >> the > >> standard CCLA. I plan to write an email to legal-discuss now to sort this > >> out. I've made progress on a number of other fronts with the 3rd party > >> libraries so i'll write up a status email after this is sorted out. > >> Thanks > >> Angus Turner > >> h...@theangus.org > >> > >> > >> > >> On Mon, Sep 24, 2012 at 6:54 PM, Angus Turner <h...@theangus.org> wrote: > >> > >>> Yeah I can do that. I'm inclined to think that they can go, as elsewhere > >>> in the code base it's just 'Copyright 2011 Google'. It'd be great to get > >>> the original agreements between Google and Apache to see what the terms > >>> were, which would also help to answer the question. I'd prefer to find > >>> them > >>> before I go to legal-discuss, so we have more to give them. > >>> > >>> I don't think the plain 'Copyright Google 2011' can be removed however... > >>> > >>> So can someone weigh in on what the original agreements were? Whether > >>> Google gave the code to Apache or just licensed it... > >>> > >>> I've emailed Dan Peterson as per a suggestion from Upayavira, so we'll see > >>> where that gets us re: this issue. > >>> > >>> Thanks > >>> Angus Turner > >>> h...@theangus.org > >>> > >>> > >>> > >>> On Sat, Sep 22, 2012 at 7:27 AM, Upayavira <u...@odoko.co.uk> wrote: > >>> > >>>> I'm inclined to agree, but it would be wise for someone to subscribe to > >>>> legal-discuss@a.o and ask there. Angus, would you be willing to do that? > >>>> > >>>> The question really is whether we have the right to do that, and it > >>>> depends upon the documentation that Google have provided - i.e. did they > >>>> sign a software grant for Wave? I don't recall the terms on which the > >>>> code was given to Apache, and we're gonna have to clarify that before we > >>>> can decide whether we can remove the Google copyright headers. > >>>> > >>>> Upayavira > >>>> > >>>> On Fri, Sep 21, 2012, at 05:11 PM, Yuri Zelikov wrote: > >>>>> > >>>>> > >>>>>> On Sept. 21, 2012, 3:54 p.m., Yuri Zelikov wrote: > >>>>>>> @Ali, is this patch ready? If so, can you commit it? > >>>>>> > >>>>>> Ali Lown wrote: > >>>>>> As Angus says at the end: "Just waiting for someone to weigh in > >>>> re: Google Headers" > >>>>>> TLDR: Should we still be keeping the "(C) Google" headers when we > >>>> have the Apache headers as well? > >>>>> > >>>>> I guess we should replace the Google headers with Apache headers. > >>>>> > >>>>> > >>>>> - Yuri > >>>>> > >>>>> > >>>>> ----------------------------------------------------------- > >>>>> This is an automatically generated e-mail. To reply, visit: > >>>>> https://reviews.apache.org/r/7077/#review11776 > >>>>> ----------------------------------------------------------- > >>>>> > >>>>> > >>>>> On Sept. 14, 2012, 9:45 p.m., Angus Turner wrote: > >>>>>> > >>>>>> ----------------------------------------------------------- > >>>>>> This is an automatically generated e-mail. To reply, visit: > >>>>>> https://reviews.apache.org/r/7077/ > >>>>>> ----------------------------------------------------------- > >>>>>> > >>>>>> (Updated Sept. 14, 2012, 9:45 p.m.) > >>>>>> > >>>>>> > >>>>>> Review request for wave. > >>>>>> > >>>>>> > >>>>>> Description > >>>>>> ------- > >>>>>> > >>>>>> Patch ensuring all the code headers are right, as well as the license > >>>> and notice files. > >>>>>> > >>>>>> > >>>>>> Diffs > >>>>>> ----- > >>>>>> > >>>>>> /COPYING 1384205 > >>>>>> /DISCLAIMER PRE-CREATION > >>>>>> /NOTICES PRE-CREATION > >>>>>> /build-proto.properties.example 1384205 > >>>>>> /build.properties 1384205 > >>>>>> /check-certificates.sh 1384205 > >>>>>> /make_cert.sh 1384205 > >>>>>> /platforms/ubuntu/daemon-script.sh 1384205 > >>>>>> /platforms/ubuntu/server-wrapper.sh 1384205 > >>>>>> /process-script-args.sh 1384205 > >>>>>> /proto_src/org/waveprotocol/box/common/comms/WaveClientRpc.java > >>>> 1384205 > >>>>>> /proto_src/org/waveprotocol/box/profile/ProfilesProto.java 1384205 > >>>>>> /proto_src/org/waveprotocol/box/search/SearchProto.java 1384205 > >>>>>> > >>>> /proto_src/org/waveprotocol/box/server/persistence/protos/ProtoAccountStoreData.java > >>>> 1384205 > >>>>>> > >>>> /proto_src/org/waveprotocol/box/server/persistence/protos/ProtoDeltaStoreData.java > >>>> 1384205 > >>>>>> /proto_src/org/waveprotocol/box/server/rpc/Rpc.java 1384205 > >>>>>> /proto_src/org/waveprotocol/protobuf/Extensions.java 1384205 > >>>>>> > >>>> /proto_src/org/waveprotocol/wave/concurrencycontrol/ClientServer.java > >>>> 1384205 > >>>>>> /proto_src/org/waveprotocol/wave/diff/Diff.java 1384205 > >>>>>> > >>>> /proto_src/org/waveprotocol/wave/federation/FederationErrorProto.java > >>>> 1384205 > >>>>>> /proto_src/org/waveprotocol/wave/federation/Proto.java 1384205 > >>>>>> /run-export.sh 1384205 > >>>>>> /run-import.sh 1384205 > >>>>>> /run-server.sh 1384205 > >>>>>> /server.config.example 1384205 > >>>>>> /server.federation.config.example 1384205 > >>>>>> /spec/waveid/Makefile 1384205 > >>>>>> /spec/waveid/waveidspec.html 1384205 > >>>>>> /src/org/waveprotocol/box/common/comms/waveclient-rpc.proto 1384205 > >>>>>> /src/org/waveprotocol/box/profile/profiles.proto 1384205 > >>>>>> /src/org/waveprotocol/box/search/search.proto 1384205 > >>>>>> /src/org/waveprotocol/box/server/frontend/WaveViewSubscription.java > >>>> 1384205 > >>>>>> /src/org/waveprotocol/box/server/gxp/AuthenticationPage.gxp 1384205 > >>>>>> /src/org/waveprotocol/box/server/gxp/OAuthAuthorizeTokenPage.gxp > >>>> 1384205 > >>>>>> /src/org/waveprotocol/box/server/gxp/RobotRegistrationPage.gxp > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/box/server/gxp/RobotRegistrationSuccessPage.gxp > >>>> 1384205 > >>>>>> /src/org/waveprotocol/box/server/gxp/TopBar.gxp 1384205 > >>>>>> /src/org/waveprotocol/box/server/gxp/UserRegistrationPage.gxp > >>>> 1384205 > >>>>>> /src/org/waveprotocol/box/server/gxp/WaveClientPage.gxp 1384205 > >>>>>> > >>>> /src/org/waveprotocol/box/server/persistence/protos/account-store.proto > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/box/server/persistence/protos/delta-store.proto > >>>> 1384205 > >>>>>> /src/org/waveprotocol/box/server/rpc/rpc.proto 1384205 > >>>>>> /src/org/waveprotocol/box/webclient/search/Search.css 1384205 > >>>>>> /src/org/waveprotocol/box/webclient/search/SearchPanel.css 1384205 > >>>>>> /src/org/waveprotocol/box/webclient/search/mock/digest.css 1384205 > >>>>>> /src/org/waveprotocol/box/webclient/widget/frame/FramedPanel.css > >>>> 1384205 > >>>>>> /src/org/waveprotocol/box/webclient/widget/loading/Loading.css > >>>> 1384205 > >>>>>> /src/org/waveprotocol/protobuf/extensions.proto 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/api/api.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/api/beans.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/api/enum.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/api/interface.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/builder/beans.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/builder/buildField.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/builder/class.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/builder/fieldDeclaration.st > >>>> 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/builder/importUtil.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/builder/imports.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/gson/class.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/gson/clearField.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/gson/fromGsonField.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/gson/fromGsonFieldInner.st > >>>> 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/gson/importUtil.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/gson/imports.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/gson/toGsonField.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/gson/toGsonFieldInner.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/jso/beans.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/jso/class.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/jso/importUtil.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/jso/imports.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/pojo/addHashCode.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/pojo/beans.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/pojo/class.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/pojo/clearField.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/pojo/copyField.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/pojo/fieldDeclaration.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/pojo/importUtil.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/pojo/imports.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/pojo/returnFalseIfNotEqual.st > >>>> 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/proto/beans.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/proto/class.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/proto/copyField.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/proto/enumHelpers.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/proto/fromGsonField.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/proto/importUtil.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/proto/imports.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/proto/messageHelpers.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/proto/splitPoint.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/proto/toGsonField.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/util/addHashCode.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/util/class.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/util/imports.st 1384205 > >>>>>> /src/org/waveprotocol/pst/templates/util/returnFalseIfNotEqual.st > >>>> 1384205 > >>>>>> /src/org/waveprotocol/wave/client/debug/logger/Logger.css 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/doodad/attachment/render/Thumbnail.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/doodad/experimental/htmltemplate/secureStyles.css > >>>> 1384205 > >>>>>> /src/org/waveprotocol/wave/client/doodad/form/button/Button.css > >>>> 1384205 > >>>>>> /src/org/waveprotocol/wave/client/doodad/form/check/CheckBase.css > >>>> 1384205 > >>>>>> /src/org/waveprotocol/wave/client/doodad/form/check/Label.css > >>>> 1384205 > >>>>>> /src/org/waveprotocol/wave/client/doodad/form/input/Input.css > >>>> 1384205 > >>>>>> /src/org/waveprotocol/wave/client/doodad/form/input/Password.css > >>>> 1384205 > >>>>>> /src/org/waveprotocol/wave/client/doodad/selection/CaretMarker.css > >>>> 1384205 > >>>>>> /src/org/waveprotocol/wave/client/editor/Editor.css 1384205 > >>>>>> /src/org/waveprotocol/wave/client/editor/content/Default.css 1384205 > >>>>>> /src/org/waveprotocol/wave/client/editor/extract/Extract.css 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/editor/harness/public/EditorTest.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/editor/harness/public/EditorTest.html > >>>> 1384205 > >>>>>> /src/org/waveprotocol/wave/client/editor/impl/DiffManager.css > >>>> 1384205 > >>>>>> /src/org/waveprotocol/wave/client/editor/sugg/Suggestion.css 1384205 > >>>>>> /src/org/waveprotocol/wave/client/gadget/renderer/Gadget.css 1384205 > >>>>>> /src/org/waveprotocol/wave/client/scheduler/knobs/knobs.css 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/testing/public/UndercurrentHarness.html > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/wavepanel/impl/edit/KeepFocusInView.java > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/attachment/AttachmentPopupWidget.css > >>>> 1384205 > >>>>>> /src/org/waveprotocol/wave/client/wavepanel/view/dom/full/Blip.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/wavepanel/view/dom/full/BlipLinkPopupWidget.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/wavepanel/view/dom/full/Collapsible.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/wavepanel/view/dom/full/ContinuationIndicator.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/wavepanel/view/dom/full/Conversation.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/wavepanel/view/dom/full/FocusFrame.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/wavepanel/view/dom/full/FocusFrameIE.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/wavepanel/view/dom/full/Participants.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/wavepanel/view/dom/full/ReplyBox.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/wavepanel/view/dom/full/RootThread.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/wavepanel/view/dom/full/mock/blip.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/wavepanel/view/dom/full/mock/blip.html > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/wavepanel/view/dom/full/mock/focus.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/wavepanel/view/dom/full/mock/ie_inline_thread.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/wavepanel/view/dom/full/mock/ie_inline_thread.html > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/wavepanel/view/dom/full/mock/inline_thread.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/wavepanel/view/dom/full/mock/inline_thread.html > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/wavepanel/view/dom/full/mock/participation.html > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/wavepanel/view/dom/full/mock/tmp_inline_thread.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/wavepanel/view/dom/full/mock/tmp_inline_thread.html > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/widget/button/icon/IconButtonTemplate.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/widget/button/icon/IconButtonTemplate1.css > >>>> 1384205 > >>>>>> /src/org/waveprotocol/wave/client/widget/button/text/TextButton.css > >>>> 1384205 > >>>>>> /src/org/waveprotocol/wave/client/widget/menu/Menu.css 1384205 > >>>>>> /src/org/waveprotocol/wave/client/widget/popup/DesktopTitleBar.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/widget/popup/DesktopUniversalPopup.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/widget/popup/MobileUniversalPopup.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/widget/popup/desktopchrome/DesktopPopupChrome.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/widget/popup/desktopchrome/DropdownPopupChrome.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/widget/profile/ProfilePopupWidget.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/widget/progress/ProgressWidget.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/widget/toolbar/SubmenuToolbarWidget.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/widget/toolbar/ToplevelToolbarWidget.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/widget/toolbar/buttons/HorizontalToolbarButtonWidget.css > >>>> 1384205 > >>>>>> > >>>> /src/org/waveprotocol/wave/client/widget/toolbar/buttons/VerticalToolbarButtonWidget.css > >>>> 1384205 > >>>>>> /src/org/waveprotocol/wave/communication/proto/Int52.java 1384205 > >>>>>> /src/org/waveprotocol/wave/concurrencycontrol/clientserver.proto > >>>> 1384205 > >>>>>> /src/org/waveprotocol/wave/diff/diff.proto 1384205 > >>>>>> /src/org/waveprotocol/wave/federation/federation.protodevel 1384205 > >>>>>> /src/org/waveprotocol/wave/federation/federation_error.protodevel > >>>> 1384205 > >>>>>> /test/com/google/wave/api/AttachmentRobotTest.java 1384205 > >>>>>> /test/org/waveprotocol/box/common/ExceptionalIteratorTest.java > >>>> 1384205 > >>>>>> /test/org/waveprotocol/box/server/robots/RobotsTestBase.java 1384205 > >>>>>> /test/org/waveprotocol/box/server/rpc/WebSocketChannelTest.java > >>>> 1384205 > >>>>>> /test/org/waveprotocol/wave/client/doodad/link/LinkTest.java 1384205 > >>>>>> > >>>> /test/org/waveprotocol/wave/client/wavepanel/impl/diff/DiffControllerTest.java > >>>> 1384205 > >>>>>> /tools/eclipse.sh 1384205 > >>>>>> /war/static/auth.css 1384205 > >>>>>> /whitepapers/Makefile 1384205 > >>>>>> > >>>>>> Diff: https://reviews.apache.org/r/7077/diff/ > >>>>>> > >>>>>> > >>>>>> Testing > >>>>>> ------- > >>>>>> > >>>>>> n/a > >>>>>> > >>>>>> > >>>>>> Thanks, > >>>>>> > >>>>>> Angus Turner > >>>>>> > >>>>>> > >>>>> > >>>> > >>> > >>>