You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2011/09/16 11:44:17 UTC
svn commit: r1171477 - in /incubator/jena/Jena2/ARQ/trunk: ./ Grammar/
Grammar/Archive/ Grammar/JSON/ binTemplates/
Author: andy
Date: Fri Sep 16 09:44:15 2011
New Revision: 1171477
URL: http://svn.apache.org/viewvc?rev=1171477&view=rev
Log:
Tidy up: remove development intemediary material, remove/refile old stuff.
Partial preparation for Apache release process.
Added:
incubator/jena/Jena2/ARQ/trunk/DEPENDENCIES
incubator/jena/Jena2/ARQ/trunk/DISCLAIMER
incubator/jena/Jena2/ARQ/trunk/Grammar/Archive/sparql_10-REC.jj
- copied, changed from r1171431, incubator/jena/Jena2/ARQ/trunk/Grammar/sparql-cr.jj
incubator/jena/Jena2/ARQ/trunk/Grammar/JSON/
incubator/jena/Jena2/ARQ/trunk/Grammar/JSON/json (contents, props changed)
- copied, changed from r1171431, incubator/jena/Jena2/ARQ/trunk/Grammar/json
incubator/jena/Jena2/ARQ/trunk/Grammar/JSON/json.jj
- copied unchanged from r1171431, incubator/jena/Jena2/ARQ/trunk/Grammar/json.jj
incubator/jena/Jena2/ARQ/trunk/LICENSE
incubator/jena/Jena2/ARQ/trunk/NOTICE
Modified:
incubator/jena/Jena2/ARQ/trunk/Copyright.txt
incubator/jena/Jena2/ARQ/trunk/Grammar/ (props changed)
incubator/jena/Jena2/ARQ/trunk/Grammar/AFS_json_notes.txt
incubator/jena/Jena2/ARQ/trunk/Grammar/Archive/grammar-update
incubator/jena/Jena2/ARQ/trunk/Grammar/Archive/sparql-update-submission.jj
incubator/jena/Jena2/ARQ/trunk/Grammar/Archive/sparql-update.jj
incubator/jena/Jena2/ARQ/trunk/Grammar/Archive/sparql-update.txt
incubator/jena/Jena2/ARQ/trunk/Grammar/Archive/sparql-update2html
incubator/jena/Jena2/ARQ/trunk/Grammar/Archive/update-submission.jj
incubator/jena/Jena2/ARQ/trunk/Grammar/Notes
incubator/jena/Jena2/ARQ/trunk/Grammar/Q.arq
incubator/jena/Jena2/ARQ/trunk/Grammar/grammarExtracts
incubator/jena/Jena2/ARQ/trunk/Grammar/jj2html
incubator/jena/Jena2/ARQ/trunk/Grammar/json
incubator/jena/Jena2/ARQ/trunk/Grammar/json-extra.jj
incubator/jena/Jena2/ARQ/trunk/Grammar/json.jj
incubator/jena/Jena2/ARQ/trunk/Grammar/sparql-cr.jj
incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_10.txt
incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.txt
incubator/jena/Jena2/ARQ/trunk/README.txt
incubator/jena/Jena2/ARQ/trunk/binTemplates/arq_cmd
incubator/jena/Jena2/ARQ/trunk/binTemplates/cmd_template
incubator/jena/Jena2/ARQ/trunk/binTemplates/riot_cmd
incubator/jena/Jena2/ARQ/trunk/data
incubator/jena/Jena2/ARQ/trunk/dataset.ttl
incubator/jena/Jena2/ARQ/trunk/desc.ttl
Added: incubator/jena/Jena2/ARQ/trunk/DEPENDENCIES
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/DEPENDENCIES?rev=1171477&view=auto
==============================================================================
(empty)
Added: incubator/jena/Jena2/ARQ/trunk/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/DISCLAIMER?rev=1171477&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/DISCLAIMER (added)
+++ incubator/jena/Jena2/ARQ/trunk/DISCLAIMER Fri Sep 16 09:44:15 2011
@@ -0,0 +1,15 @@
+Apache Jena is an effort undergoing incubation at the Apache Software
+Foundation (ASF), sponsored by the Apache Incubator PMC.
+
+Incubation is required of all newly accepted projects until a further review
+indicates that the infrastructure, communications, and decision making process
+have stabilized in a manner consistent with other successful ASF projects.
+
+While incubation status is not necessarily a reflection of the completeness
+or stability of the code, it does indicate that the project has yet to be
+fully endorsed by the ASF.
+
+For more information about the incubation status of the Jena project you
+can go to the following page:
+
+http://incubator.apache.org/jena/
Propchange: incubator/jena/Jena2/ARQ/trunk/Grammar/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Sep 16 09:44:15 2011
@@ -1,15 +1,13 @@
-CheckPoints
-
tmp
-DAWG
-
arq.txt
prefix.txt
sparql-dev.txt
-X.html
+sparql_10.txt
-Y.html
+sparql_11.txt
+
+arq.txt
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/AFS_json_notes.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/AFS_json_notes.txt?rev=1171477&r1=1171476&r2=1171477&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/AFS_json_notes.txt (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/AFS_json_notes.txt Fri Sep 16 09:44:15 2011
@@ -1,4 +1,4 @@
-Problems: the lexer has moved ahread too far and so:
+Problems: the lexer has moved ahead too far and so:
JSON
{ "abc" : "def" }
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/Archive/sparql-update-submission.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/Archive/sparql-update-submission.jj?rev=1171477&r1=1171476&r2=1171477&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/Archive/sparql-update-submission.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/Archive/sparql-update-submission.jj Fri Sep 16 09:44:15 2011
@@ -1,9 +1,9 @@
-// ARQ/SPARQL 1.1 Grammar - native syntax for the query engine
+// Grammar for
+// http://www.w3.org/Submission/SPARQL-Update/
#if 0
// (Run through cpp -P -C first)
#endif
-
#if !defined(ARQ) && !defined(SPARQL_11)
#error Please define one of ARQ and SPARQL_11
#endif
Copied: incubator/jena/Jena2/ARQ/trunk/Grammar/Archive/sparql_10-REC.jj (from r1171431, incubator/jena/Jena2/ARQ/trunk/Grammar/sparql-cr.jj)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/Archive/sparql_10-REC.jj?p2=incubator/jena/Jena2/ARQ/trunk/Grammar/Archive/sparql_10-REC.jj&p1=incubator/jena/Jena2/ARQ/trunk/Grammar/sparql-cr.jj&r1=1171431&r2=1171477&rev=1171477&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/sparql-cr.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/Archive/sparql_10-REC.jj Fri Sep 16 09:44:15 2011
@@ -8,6 +8,9 @@
// example java1.2-a.jj grammer in JavaCC distribution
// Much modifed over time.
+// This is the grammar used to produce the SPARQL 1.0 W3C Recommendation
+// Frozen at W3C Candidate Recommendation.
+
options
{
JAVA_UNICODE_ESCAPE = true ;
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/Archive/update-submission.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/Archive/update-submission.jj?rev=1171477&r1=1171476&r2=1171477&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/Archive/update-submission.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/Archive/update-submission.jj Fri Sep 16 09:44:15 2011
@@ -1,5 +1,5 @@
-SPARQl/Update sumission - just the submission part.
-
+SPARQL/Update sumission - just the submission part.
+ http://www.w3.org/Submission/SPARQL-Update/
// --------
// [done] INSERT/DELETE DATA [INTO? or FROM? <uri>] {} => INSERT/DELETE DATA { GRAPH <uri> {}}
Copied: incubator/jena/Jena2/ARQ/trunk/Grammar/JSON/json (from r1171431, incubator/jena/Jena2/ARQ/trunk/Grammar/json)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/JSON/json?p2=incubator/jena/Jena2/ARQ/trunk/Grammar/JSON/json&p1=incubator/jena/Jena2/ARQ/trunk/Grammar/json&r1=1171431&r2=1171477&rev=1171477&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/json (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/JSON/json Fri Sep 16 09:44:15 2011
@@ -94,7 +94,6 @@ for G in "$@"
json)
dos2unix < "$GRAMMAR" | cpp -P -C | unix2dos > parser.jj
grammar parser.jj $PKG JSON_Parser
- #grammar json.jj atlas/json/io/parserjavacc/javacc JSON_Parser
[ "$RC" = 0 ] && rm -f parser.jj
;;
*) echo "**** Unknown grammar: $G" 1>&2
Propchange: incubator/jena/Jena2/ARQ/trunk/Grammar/JSON/json
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/Notes
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/Notes?rev=1171477&r1=1171476&r2=1171477&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/Notes (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/Notes Fri Sep 16 09:44:15 2011
@@ -1,26 +1,24 @@
==== The Grammars
+See Archive for old, historical material.
master.jj - Template for SPARQL and ARQ
cpp input to produce sparql.jj or arq.jj
-sparql_10.jj - The DAWG working group syntax
- This should be exactly the grammar in the DAWG rec.
- Generates com.hp.hpl.jena.query.parser.sparql_10.SPARQLParser
-
sparql_11.jj - The SPARQL working group syntax
This should be exactly the grammar in the SPARQL rec.
Generates com.hp.hpl.jena.query.parser.sparql_11.SPARQLParser
-
arq.jj - The native query language of the query engine
Generates com.hp.hpl.jena.query.parser.arq.ARQParser
-sparql-alt.jj
- Old grammar - the DAWG grammar until March 2005 when it changed from
- RDQL style triples to being more N3/Turtle-like.
- DEPRECATED
-rdql-arq.jjt
+sparql_10.jj - SPARQL 1.0, but updated to match internal chnages in ARQ.
+ This should produce the grammar in the SPARQ 1.0/DAWG rec.
+ Generates com.hp.hpl.jena.query.parser.sparql_10.SPARQLParser
+
+Archive/sparql_10-REC.jj is original for the SPARQL 1.0 specification.
+
+Archive/rdql-arq.jjt
RDQL for the ARQ query engine.
Generates com.hp.hpl.jena.query.parser.rdql.RDQLParser
@@ -31,24 +29,16 @@ Note this runs cpp over master.jj to pro
==== Making the HTML
-sparql_N.txt is produced by "grammar"
+sparql_N.txt is produced by "grammar", used to make HTML.
+We don't use jjdoc to produce HTML but instead get jjdoc to produce
+its text form and process that, toegther with a hand-managed
+token.txt file.
-Run "jj2tokens sparql_11.jj > tokens.txt"
-Manually tidy, noting which to inline
+== Tokens
-# this knowns which files to use
-jj2html arq.txt tokens.txt
-
-============================
-
-javacc:
-
-(cd tmp ; javacc -FORCE_LA_CHECK=true ../sparql.jj ; rm * )
-
-==========================
-Yacker:
-Get text
-Remove /* IRI comment */
-Insert @terminals
-Fix all \ (around ECHAR)
+Run "jj2tokens sparql_11.jj > tokens.txt" to get a first pass at a tokens file.
+Manually tidy, noting which to inline
+Produce HTML suiatble for inclusion in the SPARQL recomendations.
+Includes some hand-craft tidying up.
+ jj2html arq.txt tokens.txt
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/grammarExtracts
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/grammarExtracts?rev=1171477&r1=1171476&r2=1171477&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/grammarExtracts (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/grammarExtracts Fri Sep 16 09:44:15 2011
@@ -13,7 +13,6 @@ $DOC = 1 ;
if ( $DOC )
{
-
print <<'EOF'
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/jj2html
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/jj2html?rev=1171477&r1=1171476&r2=1171477&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/jj2html (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/jj2html Fri Sep 16 09:44:15 2011
@@ -22,10 +22,6 @@ $TABLE = 1 ;
$grammarFile = $ARGV[0] ;
$tokensFile = $ARGV[1] ;
-## $grammarFile = 's.txt' ;
-## $tokensFile = 't.txt' ;
-
-
$grammar = &readFile($grammarFile) ;
$tokens = &readFile($tokensFile) ;
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/json-extra.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/json-extra.jj?rev=1171477&r1=1171476&r2=1171477&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/json-extra.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/json-extra.jj Fri Sep 16 09:44:15 2011
@@ -1,5 +1,5 @@
/* Grammar extract - JSON tokens, parser state <JSON> */
-
+// For use in adding JSON { .. } WHERE { ... } to SPARQL
// Do \ u inside JavaCC??
Added: incubator/jena/Jena2/ARQ/trunk/LICENSE
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/LICENSE?rev=1171477&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/LICENSE (added)
+++ incubator/jena/Jena2/ARQ/trunk/LICENSE Fri Sep 16 09:44:15 2011
@@ -0,0 +1,202 @@
+
+ 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.
Added: incubator/jena/Jena2/ARQ/trunk/NOTICE
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/NOTICE?rev=1171477&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/NOTICE (added)
+++ incubator/jena/Jena2/ARQ/trunk/NOTICE Fri Sep 16 09:44:15 2011
@@ -0,0 +1,13 @@
+Apache Jena - ARQ module
+Copyright 2011 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software were originally based on the following:
+
+ - Copyright 2004, 2005, 2006, 2007, 2008, 2009 Hewlett-Packard Development Company, LP
+ - Copyright 2010, 2011 Epimorphics Ltd.
+ - Copyright 2010, 2011 Talis Systems Ltd.
+
+These have been licensened to the Apache Software Foundation under a software grant.
Modified: incubator/jena/Jena2/ARQ/trunk/README.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/README.txt?rev=1171477&r1=1171476&r2=1171477&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/README.txt (original)
+++ incubator/jena/Jena2/ARQ/trunk/README.txt Fri Sep 16 09:44:15 2011
@@ -3,7 +3,8 @@ ARQ <http://jena.hpl.hp.com/ARQ>
A query processor for Jena that implements SPARQL
-Website: http://jena.hpl.hp.com/ARQ
+Website: http://incubator.apache.org/jena/ARQ
+Old ARQ website: http://openjena.org/ARQ
ARQ is a complete implementation of SPARQL that can query any Jena model
or graph, including ones stored in databases.
@@ -11,16 +12,17 @@ or graph, including ones stored in datab
Download
--------
-Releases : SourceForge, Project Jena : Package ARQ
+Old Releases : SourceForge, Project Jena : Package ARQ
http://sourceforge.net/project/showfiles.php?group_id=40417&package_id=143808
-Also available via anonymous SVN:
-https://jena.svn.sourceforge.net/svnroot/jena/ARQ/
+Also available via SVN:
+https://svn.apache.org/repos/asf/incubator/jena/
Maven:
GroupId: com.hp.hpl.jena
ArtifactId: arq
+(migrating to Aapche)
Release repository: http://jena.hpl.hp.com/repo
Mirrored to http://repo1.maven.org/
Development repo: http://jena.hpl.hp.com/repo-dev
@@ -38,7 +40,7 @@ http://www.sparql.org/validator.html
Documentation
-------------
-Included in the download in doc/index.html and online at http://jena.sf.net/ARQ
+Included in the download in doc/index.html and online at http://openjena.org/ARQ
Installation
------------
@@ -135,7 +137,7 @@ Support and Questions
---------------------
Comments and questions about ARQ to the Jena mailing list
- jena-dev@groups.yahoo.com
+ jena-users@incubator.apache.org
General questions and comments on SPARQL to jena-dev or
public-sparql-dev@w3.org
Modified: incubator/jena/Jena2/ARQ/trunk/binTemplates/arq_cmd
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/binTemplates/arq_cmd?rev=1171477&r1=1171476&r2=1171477&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/binTemplates/arq_cmd (original)
+++ incubator/jena/Jena2/ARQ/trunk/binTemplates/arq_cmd Fri Sep 16 09:44:15 2011
@@ -1,4 +1,5 @@
#!/bin/bash
+# Command template for an arq.* command.
if [ "$ARQROOT" = "" ]
then
Modified: incubator/jena/Jena2/ARQ/trunk/binTemplates/cmd_template
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/binTemplates/cmd_template?rev=1171477&r1=1171476&r2=1171477&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/binTemplates/cmd_template (original)
+++ incubator/jena/Jena2/ARQ/trunk/binTemplates/cmd_template Fri Sep 16 09:44:15 2011
@@ -1,5 +1,9 @@
#!/bin/bash
+# This is the template for putting in any command path directory.
+# It redirects to the comannd of the same name in $ARQROOT/bin
+
CMD="$(basename $0)"
-export ARQROOT=${ARQROOT:-~/Projects/ARQ}
+[ "$ARQROOT" = "" ] && { echo "ARQROOT not set" 1>&2 ; exit 1 ; }
+#export ARQROOT=${ARQROOT:-~/Projects/ARQ}
exec "$ARQROOT/bin/$CMD" "$@"
Modified: incubator/jena/Jena2/ARQ/trunk/binTemplates/riot_cmd
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/binTemplates/riot_cmd?rev=1171477&r1=1171476&r2=1171477&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/binTemplates/riot_cmd (original)
+++ incubator/jena/Jena2/ARQ/trunk/binTemplates/riot_cmd Fri Sep 16 09:44:15 2011
@@ -1,4 +1,5 @@
#!/bin/bash
+# Command template for an riotcmd.* command.
if [ "$ARQROOT" = "" ]
then