You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wave-commits@incubator.apache.org by wi...@apache.org on 2016/04/29 11:26:37 UTC
incubator-wave git commit: removed redundent dual license form
license files
Repository: incubator-wave
Updated Branches:
refs/heads/wavy a392df868 -> 5ea16aa7b
removed redundent dual license form 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/5ea16aa7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/5ea16aa7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/5ea16aa7
Branch: refs/heads/wavy
Commit: 5ea16aa7b36bd0ed04ba7603471b23aab2d0d685
Parents: a392df8
Author: wisebaldone <wi...@apache.org>
Authored: Fri Apr 29 19:26:22 2016 +1000
Committer: wisebaldone <wi...@apache.org>
Committed: Fri Apr 29 19:26:22 2016 +1000
----------------------------------------------------------------------
TODO.md | 14 ++++++++++++++
client/README.md | 15 ++-------------
client/android/LICENSE | 33 ---------------------------------
client/ios/LICENSE | 33 ---------------------------------
client/web/LICENSE | 33 ---------------------------------
editor/LICENSE | 33 ---------------------------------
server/LICENSE | 33 ---------------------------------
website/README.md | 7 ++++++-
8 files changed, 22 insertions(+), 179 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/5ea16aa7/TODO.md
----------------------------------------------------------------------
diff --git a/TODO.md b/TODO.md
new file mode 100644
index 0000000..ba98293
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,14 @@
+While the project is being setup a few todo's will be added and removed here
+to track tasks which must be completed before full development can start.
+
+# Apache Related
+- Intergrate Apache Rat & Whisker with Bazel
+
+# Project Related
+- Create initial Android base
+- Create initial Ios base
+- create initial editor base
+- create initial webclient base
+- create initial notepad base (single wave doc, used to test editor)
+- Add testing for editor
+- Add testing for webclient
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/5ea16aa7/client/README.md
----------------------------------------------------------------------
diff --git a/client/README.md b/client/README.md
index 4c75209..73643e8 100644
--- a/client/README.md
+++ b/client/README.md
@@ -1,15 +1,4 @@
# Apache Wave Clients
-This is the home of the Apache Wave clients, for more info on the clients see the individual readme's
-
-## Dev Install
-
-please see the individual readme's in the sub folders below.
-
-## Build Tasks
-
-please see the individual readme's in the sub folders below.
-
-## More Info
-
-link to relevant info for finding out more (website, cwiki, other)
\ No newline at end of file
+Each client included here is for use with the Conversation document type. They
+implement the original use case that Google Wave was built for.
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/5ea16aa7/client/android/LICENSE
----------------------------------------------------------------------
diff --git a/client/android/LICENSE b/client/android/LICENSE
index 6bf7059..04ae24b 100644
--- a/client/android/LICENSE
+++ b/client/android/LICENSE
@@ -199,36 +199,3 @@
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.
-
-***THE FOLLOWING LICENSE APPLIES TO***
-- Protobuf Descriptors located at /src/google/protobuf/descriptor.proto
-
-Protocol Buffers - Google's data interchange format
-Copyright 2008 Google Inc. All rights reserved.
-http://code.google.com/p/protobuf/
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
- * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/5ea16aa7/client/ios/LICENSE
----------------------------------------------------------------------
diff --git a/client/ios/LICENSE b/client/ios/LICENSE
index 6bf7059..04ae24b 100644
--- a/client/ios/LICENSE
+++ b/client/ios/LICENSE
@@ -199,36 +199,3 @@
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.
-
-***THE FOLLOWING LICENSE APPLIES TO***
-- Protobuf Descriptors located at /src/google/protobuf/descriptor.proto
-
-Protocol Buffers - Google's data interchange format
-Copyright 2008 Google Inc. All rights reserved.
-http://code.google.com/p/protobuf/
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
- * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/5ea16aa7/client/web/LICENSE
----------------------------------------------------------------------
diff --git a/client/web/LICENSE b/client/web/LICENSE
index 6bf7059..04ae24b 100644
--- a/client/web/LICENSE
+++ b/client/web/LICENSE
@@ -199,36 +199,3 @@
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.
-
-***THE FOLLOWING LICENSE APPLIES TO***
-- Protobuf Descriptors located at /src/google/protobuf/descriptor.proto
-
-Protocol Buffers - Google's data interchange format
-Copyright 2008 Google Inc. All rights reserved.
-http://code.google.com/p/protobuf/
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
- * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/5ea16aa7/editor/LICENSE
----------------------------------------------------------------------
diff --git a/editor/LICENSE b/editor/LICENSE
index 6bf7059..04ae24b 100644
--- a/editor/LICENSE
+++ b/editor/LICENSE
@@ -199,36 +199,3 @@
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.
-
-***THE FOLLOWING LICENSE APPLIES TO***
-- Protobuf Descriptors located at /src/google/protobuf/descriptor.proto
-
-Protocol Buffers - Google's data interchange format
-Copyright 2008 Google Inc. All rights reserved.
-http://code.google.com/p/protobuf/
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
- * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/5ea16aa7/server/LICENSE
----------------------------------------------------------------------
diff --git a/server/LICENSE b/server/LICENSE
index 6bf7059..04ae24b 100644
--- a/server/LICENSE
+++ b/server/LICENSE
@@ -199,36 +199,3 @@
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.
-
-***THE FOLLOWING LICENSE APPLIES TO***
-- Protobuf Descriptors located at /src/google/protobuf/descriptor.proto
-
-Protocol Buffers - Google's data interchange format
-Copyright 2008 Google Inc. All rights reserved.
-http://code.google.com/p/protobuf/
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
- * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/5ea16aa7/website/README.md
----------------------------------------------------------------------
diff --git a/website/README.md b/website/README.md
index 123e878..8d5068f 100644
--- a/website/README.md
+++ b/website/README.md
@@ -13,7 +13,12 @@ be these README's.
Required:
- Ruby v2.3.0+
-- Middleman [install](https://middlemanapp.com/basics/install/)
+- Middleman [manual install](https://middlemanapp.com/basics/install/)
+
+Instructions:
+
+To install middleman automatically the bazel task //website:install can be run
+which will install the gems that have been defined in the website repo.
## Build Tasks