MARMOTTA-475: All snorql removed.
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/237f356e Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/237f356e Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/237f356e Branch: refs/heads/ldp Commit: 237f356e77daeef763bca3bd806186e116c62649 Parents: ac18b4a Author: Jakob Frank <[email protected]> Authored: Tue Mar 25 15:38:56 2014 +0100 Committer: Jakob Frank <[email protected]> Committed: Tue Mar 25 15:38:56 2014 +0100 ---------------------------------------------------------------------- LICENSE.txt | 62 - NOTICE.txt | 6 - extras/webjars/pom.xml | 1 - extras/webjars/snorql/pom.xml | 110 - .../webjars/snorql/src/main/resources/LICENSE | 202 - extras/webjars/snorql/src/main/resources/README | 11 - .../webjars/snorql/src/main/resources/link.png | Bin 165 -> 0 bytes .../snorql/src/main/resources/namespaces.js | 14 - .../snorql/src/main/resources/prototype.js | 4221 ------------------ .../snorql/src/main/resources/rdf_flyer.24.gif | Bin 330 -> 0 bytes .../src/main/resources/scriptaculous/builder.js | 136 - .../main/resources/scriptaculous/controls.js | 965 ---- .../main/resources/scriptaculous/dragdrop.js | 974 ---- .../src/main/resources/scriptaculous/effects.js | 1122 ----- .../resources/scriptaculous/scriptaculous.js | 58 - .../src/main/resources/scriptaculous/slider.js | 275 -- .../src/main/resources/scriptaculous/sound.js | 55 - .../main/resources/scriptaculous/unittest.js | 568 --- .../webjars/snorql/src/main/resources/snorql.js | 579 --- .../webjars/snorql/src/main/resources/sparql.js | 490 -- .../webjars/snorql/src/main/resources/style.css | 85 - .../snorql/src/main/resources/xml-to-html.xsl | 183 - .../src/main/resources/installer/LICENSE.txt | 63 - .../src/main/webapp/META-INF/LICENSE | 62 - parent/pom.xml | 6 - .../src/main/resources/web/admin/about.html | 2 +- .../src/main/resources/web/admin/about.html | 2 +- .../security-profile.restricted.properties | 2 +- .../security-profile.standard.properties | 2 +- .../sparql/webservices/SparqlWebService.java | 131 +- .../src/main/resources/META-INF/LICENSE | 65 +- 31 files changed, 29 insertions(+), 10423 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/237f356e/LICENSE.txt ---------------------------------------------------------------------- diff --git a/LICENSE.txt b/LICENSE.txt index 14812b7..0c55469 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -241,68 +241,6 @@ For the strftime component, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -For the D2R Snorql component, - - located at: - extras/webjars/snorql/src/main/resources/ - - Copyright (c) 2007 Richard Cyganiak, http://www4.wiwiss.fu-berlin.de/bizer/d2r-server/ - with some minor modifications for Apache Marmotta. - - D2R Snorql is provided under the Apache License, version 2.0. - - -For the script.aculo.us component, - - located at: - extras/webjars/snorql/src/main/resources/scriptaculous/ - - Copyright (c) 2010 Thomas Fuchs, http://script.aculo.us - - 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. - - -For the Prototype component, - - located at: - extras/webjars/snorql/src/main/resources/ - - Copyright (c) 2010 Sam Stephenson, http://prototypejs.org - - 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. - Apache Marmotta 3rd party source code: ===================================== http://git-wip-us.apache.org/repos/asf/marmotta/blob/237f356e/NOTICE.txt ---------------------------------------------------------------------- diff --git a/NOTICE.txt b/NOTICE.txt index 3c6bfbb..e06ea17 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -12,12 +12,6 @@ These have been licensed to the Apache Software Foundation under a software gran This product also includes some third-party source components: - * The module extras/webjars/snorql constains a adapted version of the D2R - Snorql library, which was originally created by Richard Cyganaik for the D2R - Server project (http://www4.wiwiss.fu-berlin.de/bizer/d2r-server/). It is - licensed under the Apache Software License 2.0. The original source code is - available from http://github.com/kurtjx/SNORQL - * The module commons/marmotta-commons contains a modified and reduced version of the Javolution library. Javolution has copyright (c) 2012, Javolution and is licensed under BSD license. The original source code is available from http://git-wip-us.apache.org/repos/asf/marmotta/blob/237f356e/extras/webjars/pom.xml ---------------------------------------------------------------------- diff --git a/extras/webjars/pom.xml b/extras/webjars/pom.xml index 704280b..e428f3f 100644 --- a/extras/webjars/pom.xml +++ b/extras/webjars/pom.xml @@ -47,7 +47,6 @@ </build> <modules> - <module>snorql</module> <module>codemirror</module> <module>strftime</module> </modules> http://git-wip-us.apache.org/repos/asf/marmotta/blob/237f356e/extras/webjars/snorql/pom.xml ---------------------------------------------------------------------- diff --git a/extras/webjars/snorql/pom.xml b/extras/webjars/snorql/pom.xml deleted file mode 100644 index 8268746..0000000 --- a/extras/webjars/snorql/pom.xml +++ /dev/null @@ -1,110 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ 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. - --> - -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.marmotta</groupId> - <artifactId>marmotta-parent</artifactId> - <version>3.2.0-SNAPSHOT</version> - <relativePath>../../../parent/</relativePath> - </parent> - - <name>Marmotta WebJar: SNORQL</name> - <groupId>org.apache.marmotta.webjars</groupId> - <artifactId>snorql</artifactId> - <packaging>jar</packaging> - - <properties> - <webjar.version>1.0</webjar.version> - </properties> - - <build> - <plugins> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>yuicompressor-maven-plugin</artifactId> - <executions> - <execution> - <id>assemble-javascript</id> - <goals> - <goal>aggregate</goal> - </goals> - <configuration> - <sourceDirectory>${project.basedir}/src/main/resources</sourceDirectory> - <output>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${webjar.version}/snorql.js</output> - <includes> - <include>prototype.js</include> - <include>scriptaculous/scriptaculous.js</include> - <include>scriptaculous/builder.js</include> - <include>scriptaculous/effects.js</include> - <include>scriptaculous/dragdrop.js</include> - <include>scriptaculous/controls.js</include> - <include>scriptaculous/slider.js</include> - <include>scriptaculous/sound.js</include> - <include>snorql.js</include> - <include>sparql.js</include> - <include>namespaces.js</include> - </includes> - </configuration> - </execution> - <execution> - <id>assemble-css</id> - <goals> - <goal>aggregate-css</goal> - </goals> - <configuration> - <sourceDirectory>${project.basedir}/src/main/resources</sourceDirectory> - <output>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${webjar.version}/snorql.css</output> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <!-- these are "extras", so they come from 3rd parties, no RAT check! --> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <exclude>src/**</exclude> - </excludes> - </configuration> - </plugin> - <plugin> - <groupId>org.zeroturnaround</groupId> - <artifactId>jrebel-maven-plugin</artifactId> - <configuration> - <relativePath>../../../</relativePath> - </configuration> - </plugin> - </plugins> - <resources> - <resource> - <directory>src/main/resources</directory> - <excludes> - <exclude>**/*.js</exclude> - <exclude>**/*.css</exclude> - </excludes> - <filtering>false</filtering> - <targetPath>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${webjar.version}</targetPath> - </resource> - </resources> - </build> - -</project> http://git-wip-us.apache.org/repos/asf/marmotta/blob/237f356e/extras/webjars/snorql/src/main/resources/LICENSE ---------------------------------------------------------------------- diff --git a/extras/webjars/snorql/src/main/resources/LICENSE b/extras/webjars/snorql/src/main/resources/LICENSE deleted file mode 100644 index d645695..0000000 --- a/extras/webjars/snorql/src/main/resources/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. http://git-wip-us.apache.org/repos/asf/marmotta/blob/237f356e/extras/webjars/snorql/src/main/resources/README ---------------------------------------------------------------------- diff --git a/extras/webjars/snorql/src/main/resources/README b/extras/webjars/snorql/src/main/resources/README deleted file mode 100644 index 87a5827..0000000 --- a/extras/webjars/snorql/src/main/resources/README +++ /dev/null @@ -1,11 +0,0 @@ -SNORQL is an AJAXy front-end for exploring RDF SPARQL endpoints - -It was originally created by Richard Cyganaik ( http://richard.cyganiak.de/ ) -for the D2R server project ( http://www4.wiwiss.fu-berlin.de/bizer/d2r-server/ ). - -SNORQL can be used with just about any SPARQL endpoint that supports JSON. To -use SNORQL simply put the ./snorql directory somwhere sensible in the Apache -web directory and modify ./snorql/snorql.js to conform with your setup. You -can also modify the pre-defined namespaces in ./snorql/namespaces.js - -SNORQL is licensed under Apache-2 license (see ./LICENSE ). \ No newline at end of file http://git-wip-us.apache.org/repos/asf/marmotta/blob/237f356e/extras/webjars/snorql/src/main/resources/link.png ---------------------------------------------------------------------- diff --git a/extras/webjars/snorql/src/main/resources/link.png b/extras/webjars/snorql/src/main/resources/link.png deleted file mode 100644 index 419c06f..0000000 Binary files a/extras/webjars/snorql/src/main/resources/link.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/marmotta/blob/237f356e/extras/webjars/snorql/src/main/resources/namespaces.js ---------------------------------------------------------------------- diff --git a/extras/webjars/snorql/src/main/resources/namespaces.js b/extras/webjars/snorql/src/main/resources/namespaces.js deleted file mode 100644 index ccd6f55..0000000 --- a/extras/webjars/snorql/src/main/resources/namespaces.js +++ /dev/null @@ -1,14 +0,0 @@ -var D2R_namespacePrefixes = { - rdf: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#', - rdfs: 'http://www.w3.org/2000/01/rdf-schema#', - owl: 'http://www.w3.org/2002/07/owl#', - skos: 'http://www.w3.org/2004/02/skos/core#', - dc: 'http://purl.org/dc/elements/1.1/', - dcterms: 'http://purl.org/dc/terms/', - foaf: 'http://xmlns.com/foaf/0.1/', - sim: 'http://purl.org/ontology/similarity/', - mo: 'http://purl.org/ontology/mo/', - ov: 'http://open.vocab.org/terms/', - xsd: 'http://www.w3.org/2001/XMLSchema#', -}; -
