Adds license missing license header and updates NOTICE/LICENSE files.
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/9bec8ca0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/9bec8ca0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/9bec8ca0 Branch: refs/heads/wave-0.4-rc6 Commit: 9bec8ca08eabf54e07fdf4158de2b2d4a078089e Parents: 7e3895d Author: Yuri Zelikov <[email protected]> Authored: Fri Aug 8 11:53:17 2014 +0300 Committer: Yuri Zelikov <[email protected]> Committed: Thu Aug 28 02:03:03 2014 +0300 ---------------------------------------------------------------------- LICENSE.bin | 17 ---------------- NOTICE.bin.cpgz | Bin 0 -> 384 bytes NOTICE.src | 2 +- build.properties | 2 +- .../box/common/comms/WaveClientRpc.java | 20 ++++++++++++++++++- .../waveprotocol/box/profile/ProfilesProto.java | 18 +++++++++++++++++ .../waveprotocol/box/search/SearchProto.java | 18 +++++++++++++++++ .../persistence/protos/ProtoDeltaStoreData.java | 18 +++++++++++++++++ .../org/waveprotocol/box/server/rpc/Rpc.java | 18 +++++++++++++++++ .../org/waveprotocol/protobuf/Extensions.java | 18 +++++++++++++++++ .../wave/concurrencycontrol/ClientServer.java | 18 +++++++++++++++++ proto_src/org/waveprotocol/wave/diff/Diff.java | 18 +++++++++++++++++ .../wave/federation/FederationErrorProto.java | 18 +++++++++++++++++ .../org/waveprotocol/wave/federation/Proto.java | 18 +++++++++++++++++ release/artifact-sign.sh | 19 ++++++++++++++++++ 15 files changed, 202 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/9bec8ca0/LICENSE.bin ---------------------------------------------------------------------- diff --git a/LICENSE.bin b/LICENSE.bin index 599b7d4..79e496b 100644 --- a/LICENSE.bin +++ b/LICENSE.bin @@ -1,20 +1,3 @@ -***THE FOLLOWING LICENSE APPLIES TO*** -- Apache Wave -- Apache Commons CLI, Codec, Collection, Configuration, File Upload, HTTP -Client, Lang, Logging libraries included in the generated jar files -- Google GXP, GSON, Guava, Guice included in the generated jar files -- Javax.inject included in the generated jar files -- Apache JDO2 included in the generated jar files -- Jetty Client, Continuation, HTTP, IO, Security, Server, Servlet, Servlets, -Util, Webapp, Websocket, XML are included in the generated jar files -- Joda Time library included in the generated jar files -- LibIDN Java library included in the generated jar files -- Apache Lucene Core included in the generated jar files -- Mongo Java Driver included in the generated jar files -- OAuth Java libraries included in the generated jar files -- Servlet API Specification library included in the generated jar files -- Whack XMPP Java library included in the generated jar files - Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/9bec8ca0/NOTICE.bin.cpgz ---------------------------------------------------------------------- diff --git a/NOTICE.bin.cpgz b/NOTICE.bin.cpgz new file mode 100644 index 0000000..8866de3 Binary files /dev/null and b/NOTICE.bin.cpgz differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/9bec8ca0/NOTICE.src ---------------------------------------------------------------------- diff --git a/NOTICE.src b/NOTICE.src index 75d24d4..51da160 100644 --- a/NOTICE.src +++ b/NOTICE.src @@ -1,5 +1,5 @@ Apache Wave - Copyright 2011-2013 The Apache Software Foundation + Copyright 2011-2014 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/9bec8ca0/build.properties ---------------------------------------------------------------------- diff --git a/build.properties b/build.properties index 37802f9..d572524 100644 --- a/build.properties +++ b/build.properties @@ -16,7 +16,7 @@ # under the License. # Current versions -waveinabox.version=0.5-incubating +waveinabox.version=0.6-incubating # Names name=wave-in-a-box http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/9bec8ca0/proto_src/org/waveprotocol/box/common/comms/WaveClientRpc.java ---------------------------------------------------------------------- diff --git a/proto_src/org/waveprotocol/box/common/comms/WaveClientRpc.java b/proto_src/org/waveprotocol/box/common/comms/WaveClientRpc.java index 13ba701..1519b2d 100644 --- a/proto_src/org/waveprotocol/box/common/comms/WaveClientRpc.java +++ b/proto_src/org/waveprotocol/box/common/comms/WaveClientRpc.java @@ -1,4 +1,22 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +/** + * 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. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + /// Generated by the protocol buffer compiler. DO NOT EDIT! // source: org/waveprotocol/box/common/comms/waveclient-rpc.proto package org.waveprotocol.box.common.comms; http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/9bec8ca0/proto_src/org/waveprotocol/box/profile/ProfilesProto.java ---------------------------------------------------------------------- diff --git a/proto_src/org/waveprotocol/box/profile/ProfilesProto.java b/proto_src/org/waveprotocol/box/profile/ProfilesProto.java index a760453..375d8ab 100644 --- a/proto_src/org/waveprotocol/box/profile/ProfilesProto.java +++ b/proto_src/org/waveprotocol/box/profile/ProfilesProto.java @@ -1,3 +1,21 @@ +/** + * 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. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: org/waveprotocol/box/profile/profiles.proto http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/9bec8ca0/proto_src/org/waveprotocol/box/search/SearchProto.java ---------------------------------------------------------------------- diff --git a/proto_src/org/waveprotocol/box/search/SearchProto.java b/proto_src/org/waveprotocol/box/search/SearchProto.java index c6b3e29..aa88fde 100644 --- a/proto_src/org/waveprotocol/box/search/SearchProto.java +++ b/proto_src/org/waveprotocol/box/search/SearchProto.java @@ -1,3 +1,21 @@ +/** + * 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. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: org/waveprotocol/box/search/search.proto http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/9bec8ca0/proto_src/org/waveprotocol/box/server/persistence/protos/ProtoDeltaStoreData.java ---------------------------------------------------------------------- diff --git a/proto_src/org/waveprotocol/box/server/persistence/protos/ProtoDeltaStoreData.java b/proto_src/org/waveprotocol/box/server/persistence/protos/ProtoDeltaStoreData.java index 8eb79d0..ee1c80a 100644 --- a/proto_src/org/waveprotocol/box/server/persistence/protos/ProtoDeltaStoreData.java +++ b/proto_src/org/waveprotocol/box/server/persistence/protos/ProtoDeltaStoreData.java @@ -1,3 +1,21 @@ +/** + * 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. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: org/waveprotocol/box/server/persistence/protos/delta-store.proto http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/9bec8ca0/proto_src/org/waveprotocol/box/server/rpc/Rpc.java ---------------------------------------------------------------------- diff --git a/proto_src/org/waveprotocol/box/server/rpc/Rpc.java b/proto_src/org/waveprotocol/box/server/rpc/Rpc.java index f04b769..0c4c8e5 100644 --- a/proto_src/org/waveprotocol/box/server/rpc/Rpc.java +++ b/proto_src/org/waveprotocol/box/server/rpc/Rpc.java @@ -1,3 +1,21 @@ +/** + * 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. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: org/waveprotocol/box/server/rpc/rpc.proto http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/9bec8ca0/proto_src/org/waveprotocol/protobuf/Extensions.java ---------------------------------------------------------------------- diff --git a/proto_src/org/waveprotocol/protobuf/Extensions.java b/proto_src/org/waveprotocol/protobuf/Extensions.java index ed9724a..e3ebb0c 100644 --- a/proto_src/org/waveprotocol/protobuf/Extensions.java +++ b/proto_src/org/waveprotocol/protobuf/Extensions.java @@ -1,3 +1,21 @@ +/** + * 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. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: org/waveprotocol/protobuf/extensions.proto http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/9bec8ca0/proto_src/org/waveprotocol/wave/concurrencycontrol/ClientServer.java ---------------------------------------------------------------------- diff --git a/proto_src/org/waveprotocol/wave/concurrencycontrol/ClientServer.java b/proto_src/org/waveprotocol/wave/concurrencycontrol/ClientServer.java index 2b13839..3339a93 100644 --- a/proto_src/org/waveprotocol/wave/concurrencycontrol/ClientServer.java +++ b/proto_src/org/waveprotocol/wave/concurrencycontrol/ClientServer.java @@ -1,3 +1,21 @@ +/** + * 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. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: org/waveprotocol/wave/concurrencycontrol/clientserver.proto http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/9bec8ca0/proto_src/org/waveprotocol/wave/diff/Diff.java ---------------------------------------------------------------------- diff --git a/proto_src/org/waveprotocol/wave/diff/Diff.java b/proto_src/org/waveprotocol/wave/diff/Diff.java index b8c2997..da9eafd 100644 --- a/proto_src/org/waveprotocol/wave/diff/Diff.java +++ b/proto_src/org/waveprotocol/wave/diff/Diff.java @@ -1,3 +1,21 @@ +/** + * 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. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: org/waveprotocol/wave/diff/diff.proto http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/9bec8ca0/proto_src/org/waveprotocol/wave/federation/FederationErrorProto.java ---------------------------------------------------------------------- diff --git a/proto_src/org/waveprotocol/wave/federation/FederationErrorProto.java b/proto_src/org/waveprotocol/wave/federation/FederationErrorProto.java index f87440a..5b96a18 100644 --- a/proto_src/org/waveprotocol/wave/federation/FederationErrorProto.java +++ b/proto_src/org/waveprotocol/wave/federation/FederationErrorProto.java @@ -1,3 +1,21 @@ +/** + * 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. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: org/waveprotocol/wave/federation/federation_error.protodevel http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/9bec8ca0/proto_src/org/waveprotocol/wave/federation/Proto.java ---------------------------------------------------------------------- diff --git a/proto_src/org/waveprotocol/wave/federation/Proto.java b/proto_src/org/waveprotocol/wave/federation/Proto.java index 1c29e2d..49307f9 100644 --- a/proto_src/org/waveprotocol/wave/federation/Proto.java +++ b/proto_src/org/waveprotocol/wave/federation/Proto.java @@ -1,3 +1,21 @@ +/** + * 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. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: org/waveprotocol/wave/federation/federation.protodevel http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/9bec8ca0/release/artifact-sign.sh ---------------------------------------------------------------------- diff --git a/release/artifact-sign.sh b/release/artifact-sign.sh index 2bb1b34..004d5f0 100755 --- a/release/artifact-sign.sh +++ b/release/artifact-sign.sh @@ -1,4 +1,23 @@ #!/bin/zsh + +# 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. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + #Assumes it is being run in the base directory. PRE="dist/apache-wave-"
