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/10/11 17:07:28 UTC
svn commit: r1181828 - in /incubator/jena/Jena2/ARQ/trunk:
Grammar/JSON/json.jj Grammar/arq.jj Grammar/master.jj Grammar/sparql_10.jj
Grammar/sparql_11.jj NOTICE doc/license.html doc/styles/site.css
doc/styles/tutorial.css
Author: andy
Date: Tue Oct 11 15:07:27 2011
New Revision: 1181828
URL: http://svn.apache.org/viewvc?rev=1181828&view=rev
Log:
Update license in non-java files.
Modified:
incubator/jena/Jena2/ARQ/trunk/Grammar/JSON/json.jj
incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj
incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj
incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_10.jj
incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj
incubator/jena/Jena2/ARQ/trunk/NOTICE
incubator/jena/Jena2/ARQ/trunk/doc/license.html
incubator/jena/Jena2/ARQ/trunk/doc/styles/site.css
incubator/jena/Jena2/ARQ/trunk/doc/styles/tutorial.css
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/JSON/json.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/JSON/json.jj?rev=1181828&r1=1181827&r2=1181828&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/JSON/json.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/JSON/json.jj Tue Oct 11 15:07:27 2011
@@ -237,32 +237,6 @@ void Null() : { Token t ; }
t = <NULL> { valueNull(t.beginLine, t.beginColumn) ; }
}
-
-/*
- * (c) Copyright 2008 Hewlett-Packard Development Company, LP
- *
- * 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 name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
/*
# Local Variables:
# tab-width: 4
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj?rev=1181828&r1=1181827&r2=1181828&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj Tue Oct 11 15:07:27 2011
@@ -1854,33 +1854,6 @@ TOKEN:
<#UNKNOWN: (~[" ","\t","\n","\r","\f" ])+ >
}
/*
- * (c) Copyright 2004, 2005, 2006, 2007, 2008 Hewlett-Packard Development Company, LP
- * (c) Copyright 2010 Talis Systems Ltd.
- * (c) Copyright 2010, 2011 Epimorphics Ltd.
- *
- * 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 name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-/*
# Local Variables:
# tab-width: 4
# indent-tabs-mode: nil
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj?rev=1181828&r1=1181827&r2=1181828&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj Tue Oct 11 15:07:27 2011
@@ -2353,33 +2353,6 @@ TOKEN:
}
/*
- * (c) Copyright 2004, 2005, 2006, 2007, 2008 Hewlett-Packard Development Company, LP
- * (c) Copyright 2010 Talis Systems Ltd.
- * (c) Copyright 2010, 2011 Epimorphics Ltd.
- *
- * 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 name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-/*
# Local Variables:
# tab-width: 4
# indent-tabs-mode: nil
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_10.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_10.jj?rev=1181828&r1=1181827&r2=1181828&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_10.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_10.jj Tue Oct 11 15:07:27 2011
@@ -25,11 +25,6 @@
// #if defined(SPARQL_10)
// #define SPARQL
// #endif
-// Author: Andy Seaborne andy.seaborne@hp.com
-// (c) Copyright 2004, 2005, 2006, 2007, 2008, 2009 Hewlett-Packard Development Company, LP
-// All rights reserved.
-// See end of file for details.
-//
// Constraint expression is derived from Java :
// example java1.2-a.jj grammer in JavaCC distribution
// Much modifed over time.
@@ -1155,31 +1150,6 @@ TOKEN:
}
/*
- * (c) Copyright 2004, 2005, 2006, 2007, 2008 Hewlett-Packard Development Company, LP
- *
- * 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 name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-/*
# Local Variables:
# tab-width: 4
# indent-tabs-mode: nil
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj?rev=1181828&r1=1181827&r2=1181828&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj Tue Oct 11 15:07:27 2011
@@ -1734,33 +1734,6 @@ TOKEN:
<#UNKNOWN: (~[" ","\t","\n","\r","\f" ])+ >
}
/*
- * (c) Copyright 2004, 2005, 2006, 2007, 2008 Hewlett-Packard Development Company, LP
- * (c) Copyright 2010 Talis Systems Ltd.
- * (c) Copyright 2010, 2011 Epimorphics Ltd.
- *
- * 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 name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-/*
# Local Variables:
# tab-width: 4
# indent-tabs-mode: nil
Modified: incubator/jena/Jena2/ARQ/trunk/NOTICE
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/NOTICE?rev=1181828&r1=1181827&r2=1181828&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/NOTICE (original)
+++ incubator/jena/Jena2/ARQ/trunk/NOTICE Tue Oct 11 15:07:27 2011
@@ -10,4 +10,4 @@ Portions of this software were originall
- Copyright 2010, 2011 Epimorphics Ltd.
- Copyright 2010, 2011 Talis Systems Ltd.
-These have been licensed to the Apache Software Foundation under a software grant.
+These have been licensed to the Apache Software Foundation under software grants.
Modified: incubator/jena/Jena2/ARQ/trunk/doc/license.html
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/doc/license.html?rev=1181828&r1=1181827&r2=1181828&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/doc/license.html (original)
+++ incubator/jena/Jena2/ARQ/trunk/doc/license.html Tue Oct 11 15:07:27 2011
@@ -22,35 +22,22 @@ pre.license {
<h1>ARQ - License</h1>
<pre class="license">
- (c) Copyright 2004, 2005, 2006, 2007, 2008, 2009 Hewlett-Packard Development Company, LP
- (c) Copyright 2010 Talis Systems Ltd
- 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 name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ 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.
</pre>
-<hr/>
-<p>Jena includes software developed by the Apache Software Foundation
-(<a href="http://www.apache.org/">http://www.apache.org/</a>).</p>
<p>Jena is built on top of other sub-systems which we gratefully
acknowledge: <a href="Licenses/index.html">details of these systems and their version numbers</a>.
Modified: incubator/jena/Jena2/ARQ/trunk/doc/styles/site.css
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/doc/styles/site.css?rev=1181828&r1=1181827&r2=1181828&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/doc/styles/site.css (original)
+++ incubator/jena/Jena2/ARQ/trunk/doc/styles/site.css Tue Oct 11 15:07:27 2011
@@ -1,3 +1 @@
-/* (c) Copyright 2005 Hewlett-Packard Development Company LP */
-
@import url(doc.css) ;
Modified: incubator/jena/Jena2/ARQ/trunk/doc/styles/tutorial.css
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/doc/styles/tutorial.css?rev=1181828&r1=1181827&r2=1181828&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/doc/styles/tutorial.css (original)
+++ incubator/jena/Jena2/ARQ/trunk/doc/styles/tutorial.css Tue Oct 11 15:07:27 2011
@@ -1,5 +1,3 @@
-/* Need to understand CSS2 inheritance */
-
body {
font-family: Verdana, Arial, Helvetica, sans-serif ;
font-size: 10pt ;