You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@any23.apache.org by le...@apache.org on 2013/05/29 03:43:13 UTC
[1/2] git commit: ANY23-158 Fix discrepancies with 0.8.0 RC1
Updated Branches:
refs/heads/master 8ebdd067e -> 4a35ec186
ANY23-158 Fix discrepancies with 0.8.0 RC1
Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/b875b18d
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/b875b18d
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/b875b18d
Branch: refs/heads/master
Commit: b875b18dff066062754a150dcd02229ca5604dc5
Parents: bbca626
Author: lewismc <le...@gmail.com>
Authored: Tue May 21 12:42:14 2013 -0700
Committer: lewismc <le...@gmail.com>
Committed: Tue May 21 12:42:14 2013 -0700
----------------------------------------------------------------------
LICENSE.txt | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
NOTICE.txt | 6 +++++
2 files changed, 73 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/any23/blob/b875b18d/DISCLAIMER.txt
----------------------------------------------------------------------
diff --git a/DISCLAIMER.txt b/DISCLAIMER.txt
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/any23/blob/b875b18d/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index d645695..560739e 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -200,3 +200,70 @@
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 files contain code from the jQuery Foundation (http://jquery.com)
+
+./service/src/main/resources/form.html
+./service/src/main/webapp/resources/js/bootstrap-modal.js
+./service/src/main/webapp/resources/js/jquery-1.7.2.min.js
+./plugins/html-scraper/target/test-classes/org/apache/any23/plugin/htmlscraper/html-scraper-extractor-test.html
+./test-resources/src/test/resources/application/xhtml/blank-file-header.xhtml
+./test-resources/src/test/resources/microformats/hcard/infinite-loop.html
+./test-resources/src/test/resources/microformats/hcard/linkedin-michelemostarda.html
+./test-resources/src/test/resources/html/rdfa/drupal-test-frontpage.html
+./test-resources/src/test/resources/html/rdfa/drupal-test-frontpage.html
+
+ Copyright 2013 jQuery Foundation and other contributors
+ http://jquery.com/
+
+ 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 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, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE 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.
+
+----------------------------------------------------------------------------------------
+
+This software contains inclusions of source from OpenRDF Sesame which is licensed
+under a BSD-style license
+
+ Copyright Aduna (http://www.aduna-software.com/) 2001-2013
+ All rights reserved.
+
+ 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 copyright holder 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/any23/blob/b875b18d/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index abc108b..a7d9202 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -4,3 +4,9 @@ Copyright 2008-2011 Digital Enterprise Research Institute (DERI)
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
+
+This product includes software developed by the jQuery
+Foundation (http://jquery.org/) under an MIT license.
+
+This product includes source developed by OpenRDF Sesame
+(http://www.openrdf.org/) under a BSD-style license.
[2/2] git commit: Merge branch 'ANY23-158'
Posted by le...@apache.org.
Merge branch 'ANY23-158'
Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/4a35ec18
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/4a35ec18
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/4a35ec18
Branch: refs/heads/master
Commit: 4a35ec1863585f730198a3b44182e99f3cf65547
Parents: 8ebdd06 b875b18
Author: lewismc <le...@gmail.com>
Authored: Tue May 28 18:42:22 2013 -0700
Committer: lewismc <le...@gmail.com>
Committed: Tue May 28 18:42:22 2013 -0700
----------------------------------------------------------------------
LICENSE.txt | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
NOTICE.txt | 6 +++++
2 files changed, 73 insertions(+), 0 deletions(-)
----------------------------------------------------------------------