Author: al
Date: Tue Aug 27 19:21:06 2013
New Revision: 1517935
URL: http://svn.apache.org/r1517935
Log:
Seperate LICENSE+NOTICE to .src, .bin
Added:
incubator/wave/branches/wave-0.4-release/LICENSE.bin
- copied, changed from r1517934,
incubator/wave/branches/wave-0.4-release/LICENSE
incubator/wave/branches/wave-0.4-release/LICENSE.src
- copied, changed from r1517934,
incubator/wave/branches/wave-0.4-release/LICENSE
incubator/wave/branches/wave-0.4-release/NOTICE.bin
- copied, changed from r1517934,
incubator/wave/branches/wave-0.4-release/NOTICE
incubator/wave/branches/wave-0.4-release/NOTICE.src
- copied, changed from r1517934,
incubator/wave/branches/wave-0.4-release/NOTICE
Removed:
incubator/wave/branches/wave-0.4-release/LICENSE
incubator/wave/branches/wave-0.4-release/NOTICE
Modified:
incubator/wave/branches/wave-0.4-release/build.xml
Copied: incubator/wave/branches/wave-0.4-release/LICENSE.bin (from r1517934,
incubator/wave/branches/wave-0.4-release/LICENSE)
URL:
http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/LICENSE.bin?p2=incubator/wave/branches/wave-0.4-release/LICENSE.bin&p1=incubator/wave/branches/wave-0.4-release/LICENSE&r1=1517934&r2=1517935&rev=1517935&view=diff
==============================================================================
(empty)
Copied: incubator/wave/branches/wave-0.4-release/LICENSE.src (from r1517934,
incubator/wave/branches/wave-0.4-release/LICENSE)
URL:
http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/LICENSE.src?p2=incubator/wave/branches/wave-0.4-release/LICENSE.src&p1=incubator/wave/branches/wave-0.4-release/LICENSE&r1=1517934&r2=1517935&rev=1517935&view=diff
==============================================================================
--- incubator/wave/branches/wave-0.4-release/LICENSE (original)
+++ incubator/wave/branches/wave-0.4-release/LICENSE.src Tue Aug 27 19:21:06
2013
@@ -1,4 +1,3 @@
-
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -201,12 +200,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-***FOLLOWING LICENSE APPLIES TO***
--The OAuth python library located at /src/python/api/oauth/
--the wave Socket.IO servlet located at
/src/org/waveprotocol/box/server/rpc/AbstractWaveSocketIOServlet.java
--the Socket.IO library located at /third_party/runtime/socketio
--WebSocket located at /third_party/runtime/websocket
--mockito located at /third_party/test/mockito
+***THE FOLLOWING LICENSE APPLIES TO***
+- The OAuth python library located at /src/python/api/oauth/
+ Copyright (c) 2007 Andy Smith
The MIT License
@@ -228,138 +224,57 @@ LIABILITY, WHETHER IN AN ACTION OF CONTR
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-***FOLLOWING LICENSE APPLIES TO***
--jsr305 located at /third_party/runtime/jsr305
--hamcrest located at /third_party/test/hamcrest
-
-http://www.opensource.org/licenses/bsd-license.php
-
-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 the JSR305 expert group 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.
-
-***THE FOLLOWING LICENSE APPLIES TO***
--XPP3 located at /third_party/runtime/xpp3
-
-Indiana University Extreme! Lab Software License
-
-Version 1.1.1
-
-Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
-2. 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.
-
-3. The end-user documentation included with the redistribution, if any,
- must include the following acknowledgment:
-
- "This product includes software developed by the Indiana University
- Extreme! Lab (http://www.extreme.indiana.edu/)."
-
-Alternately, this acknowledgment may appear in the software itself,
-if and wherever such third-party acknowledgments normally appear.
-
-4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab"
-must not be used to endorse or promote products derived from this
-software without prior written permission. For written permission,
-please contact http://www.extreme.indiana.edu/.
-
-5. Products derived from this software may not use "Indiana Univeristy"
-name nor may "Indiana Univeristy" appear in their name, without prior
-written permission of the Indiana University.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED 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 AUTHORS, COPYRIGHT HOLDERS OR ITS 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.
-
***THE FOLLOWING LICENSE APPLIES TO***
--SimpleJSON located at /src/python/api/simplejson/
+- SimpleJSON located at /src/python/api/simplejson/
+ Copyright (c) 2006 Bob Ippolito
-Copyright (c) 2006 Bob Ippolito
-
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
-
+
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
-
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
***THE FOLLOWING LICENSE APPLIES TO***
--Protobuf Descriptors located at /src/google/protobuf/descriptor.proto
+- 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
+
+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
+ * 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
+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
+"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
+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
+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
+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
Copied: incubator/wave/branches/wave-0.4-release/NOTICE.bin (from r1517934,
incubator/wave/branches/wave-0.4-release/NOTICE)
URL:
http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/NOTICE.bin?p2=incubator/wave/branches/wave-0.4-release/NOTICE.bin&p1=incubator/wave/branches/wave-0.4-release/NOTICE&r1=1517934&r2=1517935&rev=1517935&view=diff
==============================================================================
(empty)
Copied: incubator/wave/branches/wave-0.4-release/NOTICE.src (from r1517934,
incubator/wave/branches/wave-0.4-release/NOTICE)
URL:
http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/NOTICE.src?p2=incubator/wave/branches/wave-0.4-release/NOTICE.src&p1=incubator/wave/branches/wave-0.4-release/NOTICE&r1=1517934&r2=1517935&rev=1517935&view=diff
==============================================================================
--- incubator/wave/branches/wave-0.4-release/NOTICE (original)
+++ incubator/wave/branches/wave-0.4-release/NOTICE.src Tue Aug 27 19:21:06 2013
@@ -6,12 +6,3 @@
Portions of this software were developed at Google Inc. and
have been kindly donated to the Apache Software Foundation.
-
- This product includes software developed at
- The DOM4J Project (http://dom4j.sourceforg.net).
-
- This product includes software developed by the
- JDOM Project (http://www.jdom.org/).
-
- This product includes software developed by
- Joda.org (http://www.joda.org/).
Modified: incubator/wave/branches/wave-0.4-release/build.xml
URL:
http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/build.xml?rev=1517935&r1=1517934&r2=1517935&view=diff
==============================================================================
--- incubator/wave/branches/wave-0.4-release/build.xml (original)
+++ incubator/wave/branches/wave-0.4-release/build.xml Tue Aug 27 19:21:06 2013
@@ -773,6 +773,8 @@
<target name="release-src" description="Creates unsigned tar+zip for server
source release">
<delete file="${dist.dir}/${release.src.path}.tar.bz2" />
<delete file="${dist.dir}/${release.src.path}.zip" />
+ <copy file="LICENSE.src" tofile="LICENSE" />
+ <copy file="NOTICE.src" tofile="NOTICE" />
<tar destfile="${dist.dir}/${release.src.path}.tar" longfile="gnu">
<!-- Include everything except built stuff in tree -->
<tarfileset dir="." prefix="${release.src.path}">
@@ -782,6 +784,8 @@
<exclude name="test_out/" />
<exclude name="third_party/" />
<exclude name="war/webclient/" />
+ <exclude name="LICENSE.*" />
+ <exclude name="NOTICE.*" />
</tarfileset>
<!-- Setup permissions -->
<tarfileset dir="." prefix="${release.src.path}" filemode="755">
@@ -797,11 +801,15 @@
<tarfileset src="${dist.dir}/${release.src.path}.tar" />
</zip>
<delete file="${dist.dir}/${release.src.path}.tar" />
+ <delete file="LICENSE" />
+ <delete file="NOTICE" />
</target>
<target name="release-bin" depends="dist" description="Creates unsigned
tar+zip for server binary release">
<delete file="${dist.dir}/${release.bin.path}.tar.bz2"/>
<delete file="${dist.dir}/${release.bin.path}.zip"/>
+ <copy file="LICENSE.bin" tofile="LICENSE" />
+ <copy file="NOTICE.bin" tofile="NOTICE" />
<tar destfile="${dist.dir}/${release.bin.path}.tar" longfile="gnu">
<!-- Actual jars -->
<tarfileset dir="${dist.dir}" includes="*.jar"
prefix="${release.bin.path}/dist" />
@@ -844,6 +852,8 @@
<tarfileset src="${dist.dir}/${release.bin.path}.tar" />
</zip>
<delete file="${dist.dir}/${release.bin.path}.tar"/>
+ <delete file="LICENSE" />
+ <delete file="NOTICE" />
</target>
<!-- TODO: re-use these when the api code is useful again -->
