You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2006/12/24 09:38:01 UTC
svn commit: r490003 - in /jackrabbit/trunk: jackrabbit-api/LICENSE.txt
jackrabbit-jca/LICENSE.txt jackrabbit-jca/NOTICE.txt
jackrabbit-jcr-commons/LICENSE.txt jackrabbit-jcr-tests/LICENSE.txt
jackrabbit-webapp/LICENSE.txt jackrabbit-webapp/NOTICE.txt
Author: jukka
Date: Sun Dec 24 00:38:01 2006
New Revision: 490003
URL: http://svn.apache.org/viewvc?view=rev&rev=490003
Log:
JCR-612: Correct placement of the XPath parser license notices
Modified:
jackrabbit/trunk/jackrabbit-api/LICENSE.txt
jackrabbit/trunk/jackrabbit-jca/LICENSE.txt
jackrabbit/trunk/jackrabbit-jca/NOTICE.txt
jackrabbit/trunk/jackrabbit-jcr-commons/LICENSE.txt
jackrabbit/trunk/jackrabbit-jcr-tests/LICENSE.txt
jackrabbit/trunk/jackrabbit-webapp/LICENSE.txt
jackrabbit/trunk/jackrabbit-webapp/NOTICE.txt
Modified: jackrabbit/trunk/jackrabbit-api/LICENSE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-api/LICENSE.txt?view=diff&rev=490003&r1=490002&r2=490003
==============================================================================
--- jackrabbit/trunk/jackrabbit-api/LICENSE.txt (original)
+++ jackrabbit/trunk/jackrabbit-api/LICENSE.txt Sun Dec 24 00:38:01 2006
@@ -200,40 +200,3 @@
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.
-
-
-
-APACHE JACKRABBIT SUBCOMPONENTS:
-
-Apache Jackrabbit includes an XPath parser subcomponent with separate
-copyright notices and license terms. Your use of the source code for
-this subcomponent is subject to the terms and conditions of the
-following licenses.
-
-<!--
- * Copyright (c) 2002 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
--->
-
-<!--
-Copyright (c) 2002 W3C(r) (http://www.w3.org/) (MIT (http://www.lcs.mit.edu/),
-INRIA (http://www.inria.fr/), Keio (http://www.keio.ac.jp/)),
-All Rights Reserved.
-See http://www.w3.org/Consortium/Legal/ipr-notice-20000612#Copyright.
-W3C liability
-(http://www.w3.org/Consortium/Legal/ipr-notice-20000612#Legal_Disclaimer),
-trademark
-(http://www.w3.org/Consortium/Legal/ipr-notice-20000612#W3C_Trademarks),
-document use
-(http://www.w3.org/Consortium/Legal/copyright-documents-19990405),
-and software licensing rules
-(http://www.w3.org/Consortium/Legal/copyright-software-19980720)
-apply.
--->
Modified: jackrabbit/trunk/jackrabbit-jca/LICENSE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jca/LICENSE.txt?view=diff&rev=490003&r1=490002&r2=490003
==============================================================================
--- jackrabbit/trunk/jackrabbit-jca/LICENSE.txt (original)
+++ jackrabbit/trunk/jackrabbit-jca/LICENSE.txt Sun Dec 24 00:38:01 2006
@@ -200,3 +200,40 @@
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.
+
+
+
+APACHE JACKRABBIT SUBCOMPONENTS:
+
+Apache Jackrabbit includes an XPath parser subcomponent with separate
+copyright notices and license terms. Your use of the source code for
+this subcomponent is subject to the terms and conditions of the
+following licenses.
+
+<!--
+ * Copyright (c) 2002 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
+-->
+
+<!--
+Copyright (c) 2002 W3C(r) (http://www.w3.org/) (MIT (http://www.lcs.mit.edu/),
+INRIA (http://www.inria.fr/), Keio (http://www.keio.ac.jp/)),
+All Rights Reserved.
+See http://www.w3.org/Consortium/Legal/ipr-notice-20000612#Copyright.
+W3C liability
+(http://www.w3.org/Consortium/Legal/ipr-notice-20000612#Legal_Disclaimer),
+trademark
+(http://www.w3.org/Consortium/Legal/ipr-notice-20000612#W3C_Trademarks),
+document use
+(http://www.w3.org/Consortium/Legal/copyright-documents-19990405),
+and software licensing rules
+(http://www.w3.org/Consortium/Legal/copyright-software-19980720)
+apply.
+-->
Modified: jackrabbit/trunk/jackrabbit-jca/NOTICE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jca/NOTICE.txt?view=diff&rev=490003&r1=490002&r2=490003
==============================================================================
--- jackrabbit/trunk/jackrabbit-jca/NOTICE.txt (original)
+++ jackrabbit/trunk/jackrabbit-jca/NOTICE.txt Sun Dec 24 00:38:01 2006
@@ -3,3 +3,13 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+
+Based on source code originally developed by
+Day Software (http://www.day.com/).
+
+This product also includes:
+
+- XPath grammar and parser from the W3C
+ Copyright (c) 2002 World Wide Web Consortium,
+ (Massachusetts Institute of Technology, Institut National de
+ Recherche en Informatique et en Automatique, Keio University).
Modified: jackrabbit/trunk/jackrabbit-jcr-commons/LICENSE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-commons/LICENSE.txt?view=diff&rev=490003&r1=490002&r2=490003
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-commons/LICENSE.txt (original)
+++ jackrabbit/trunk/jackrabbit-jcr-commons/LICENSE.txt Sun Dec 24 00:38:01 2006
@@ -200,40 +200,3 @@
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.
-
-
-
-APACHE JACKRABBIT SUBCOMPONENTS:
-
-Apache Jackrabbit includes an XPath parser subcomponent with separate
-copyright notices and license terms. Your use of the source code for
-this subcomponent is subject to the terms and conditions of the
-following licenses.
-
-<!--
- * Copyright (c) 2002 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
--->
-
-<!--
-Copyright (c) 2002 W3C(r) (http://www.w3.org/) (MIT (http://www.lcs.mit.edu/),
-INRIA (http://www.inria.fr/), Keio (http://www.keio.ac.jp/)),
-All Rights Reserved.
-See http://www.w3.org/Consortium/Legal/ipr-notice-20000612#Copyright.
-W3C liability
-(http://www.w3.org/Consortium/Legal/ipr-notice-20000612#Legal_Disclaimer),
-trademark
-(http://www.w3.org/Consortium/Legal/ipr-notice-20000612#W3C_Trademarks),
-document use
-(http://www.w3.org/Consortium/Legal/copyright-documents-19990405),
-and software licensing rules
-(http://www.w3.org/Consortium/Legal/copyright-software-19980720)
-apply.
--->
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/LICENSE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/LICENSE.txt?view=diff&rev=490003&r1=490002&r2=490003
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/LICENSE.txt (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/LICENSE.txt Sun Dec 24 00:38:01 2006
@@ -200,40 +200,3 @@
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.
-
-
-
-APACHE JACKRABBIT SUBCOMPONENTS:
-
-Apache Jackrabbit includes an XPath parser subcomponent with separate
-copyright notices and license terms. Your use of the source code for
-this subcomponent is subject to the terms and conditions of the
-following licenses.
-
-<!--
- * Copyright (c) 2002 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
--->
-
-<!--
-Copyright (c) 2002 W3C(r) (http://www.w3.org/) (MIT (http://www.lcs.mit.edu/),
-INRIA (http://www.inria.fr/), Keio (http://www.keio.ac.jp/)),
-All Rights Reserved.
-See http://www.w3.org/Consortium/Legal/ipr-notice-20000612#Copyright.
-W3C liability
-(http://www.w3.org/Consortium/Legal/ipr-notice-20000612#Legal_Disclaimer),
-trademark
-(http://www.w3.org/Consortium/Legal/ipr-notice-20000612#W3C_Trademarks),
-document use
-(http://www.w3.org/Consortium/Legal/copyright-documents-19990405),
-and software licensing rules
-(http://www.w3.org/Consortium/Legal/copyright-software-19980720)
-apply.
--->
Modified: jackrabbit/trunk/jackrabbit-webapp/LICENSE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/LICENSE.txt?view=diff&rev=490003&r1=490002&r2=490003
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/LICENSE.txt (original)
+++ jackrabbit/trunk/jackrabbit-webapp/LICENSE.txt Sun Dec 24 00:38:01 2006
@@ -200,3 +200,40 @@
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.
+
+
+
+APACHE JACKRABBIT SUBCOMPONENTS:
+
+Apache Jackrabbit includes an XPath parser subcomponent with separate
+copyright notices and license terms. Your use of the source code for
+this subcomponent is subject to the terms and conditions of the
+following licenses.
+
+<!--
+ * Copyright (c) 2002 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
+-->
+
+<!--
+Copyright (c) 2002 W3C(r) (http://www.w3.org/) (MIT (http://www.lcs.mit.edu/),
+INRIA (http://www.inria.fr/), Keio (http://www.keio.ac.jp/)),
+All Rights Reserved.
+See http://www.w3.org/Consortium/Legal/ipr-notice-20000612#Copyright.
+W3C liability
+(http://www.w3.org/Consortium/Legal/ipr-notice-20000612#Legal_Disclaimer),
+trademark
+(http://www.w3.org/Consortium/Legal/ipr-notice-20000612#W3C_Trademarks),
+document use
+(http://www.w3.org/Consortium/Legal/copyright-documents-19990405),
+and software licensing rules
+(http://www.w3.org/Consortium/Legal/copyright-software-19980720)
+apply.
+-->
Modified: jackrabbit/trunk/jackrabbit-webapp/NOTICE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/NOTICE.txt?view=diff&rev=490003&r1=490002&r2=490003
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/NOTICE.txt (original)
+++ jackrabbit/trunk/jackrabbit-webapp/NOTICE.txt Sun Dec 24 00:38:01 2006
@@ -6,3 +6,10 @@
Based on source code originally developed by
Day Software (http://www.day.com/).
+
+This product also includes:
+
+- XPath grammar and parser from the W3C
+ Copyright (c) 2002 World Wide Web Consortium,
+ (Massachusetts Institute of Technology, Institut National de
+ Recherche en Informatique et en Automatique, Keio University).