apache · Alfusainey · Jan 23, 2013 · Jan 23, 2013 · Jan 23, 2013 · Jan 24, 2013
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,8 @@
+target
+.classpath
+.project
+.settings
+*.iml
+*.ipr
+*.iws
+.idea
diff --git a/HEADER.txt b/HEADER.txt
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -200,3 +200,65 @@
    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 parts with separate copyright notices and license
+terms. Your use of these subcomponents is subject to the terms and conditions
+of the following licenses:
+
+    XPath 2.0/XQuery 1.0 Parser:
+    http://www.w3.org/2002/11/xquery-xpath-applets/xgrammar.zip
+
+    Copyright (C) 2002 World Wide Web Consortium, (Massachusetts Institute of
+    Technology, European Research Consortium for Informatics and Mathematics,
+    Keio University). All Rights Reserved.
+
+    This work is distributed under the W3C(R) Software License 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.
+
+    W3C(R) SOFTWARE NOTICE AND LICENSE
+    http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+    This work (and included software, documentation such as READMEs, or
+    other related items) is being provided by the copyright holders under
+    the following license. By obtaining, using and/or copying this work,
+    you (the licensee) agree that you have read, understood, and will comply
+    with the following terms and conditions.
+
+    Permission to copy, modify, and distribute this software and its
+    documentation, with or without modification, for any purpose and
+    without fee or royalty is hereby granted, provided that you include
+    the following on ALL copies of the software and documentation or
+    portions thereof, including modifications:
+
+       1. The full text of this NOTICE in a location viewable to users
+          of the redistributed or derivative work.
+
+       2. Any pre-existing intellectual property disclaimers, notices,
+          or terms and conditions. If none exist, the W3C Software Short
+          Notice should be included (hypertext is preferred, text is
+          permitted) within the body of any redistributed or derivative code.
+
+       3. Notice of any changes or modifications to the files, including
+          the date changes were made. (We recommend you provide URIs to the
+          location from which the code is derived.)
+
+    THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT
+    HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+    INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS
+    FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR
+    DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+    TRADEMARKS OR OTHER RIGHTS.
+
+    COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
+    OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
+    DOCUMENTATION.
+
+    The name and trademarks of copyright holders may NOT be used in
+    advertising or publicity pertaining to the software without specific,
+    written prior permission. Title to copyright in this software and
+    any associated documentation will at all times remain with
+    copyright holders.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -1,15 +1,8 @@
-This product includes software developed by
+Apache Jackrabbit
+Copyright 2013 The Apache Software Foundation
+
+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 contains a preliminary implementation of the
-Content Repository for Java Technology API, as specified by
-
-    http://www.jcp.org/en/jsr/detail?id=170
-
-that is not in final form and will change in the future.
-Implementations prior to final publication of JSR 170
-are not considered compliant with JSR 170 and cannot be
-advertised as such.
+Day Software (http://www.day.com/).
diff --git a/README.txt b/README.txt
@@ -1,110 +1,79 @@
-=======================================================================
-Welcome to Apache Jackrabbit  <http://incubator.apache.org/jackrabbit/>
-=======================================================================
+=============================================================
+Welcome to Apache Jackrabbit  <http://jackrabbit.apache.org/>
+=============================================================
 
-License (see also LICENSE.txt)
-==============================
-
-Copyright 2004-2005 The Apache Software Foundation or its licensors,
-                    as applicable.
-
-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.
-
-
-Getting Started
-===============
+Apache Jackrabbit is a fully conforming implementation of the
+Content Repository for Java Technology API (JCR, specified in
+JSR 170 and 283).
 
-Apache Jackrabbit is an effort undergoing incubation at the
-Apache Software Foundation. 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.  The incubation status is recorded at
+A content repository is a hierarchical content store with support
+for structured and unstructured content, full text search,
+versioning, transactions, observation, and more.
 
-   http://incubator.apache.org/projects/jackrabbit.html
+Apache Jackrabbit is a project of the Apache Software Foundation.
 
-Mailing Lists
--------------
+Building Jackrabbit
+===================
 
-To get involved with the Jackrabbit project, start by having a
-look at our website (link at top of page) and join our mailing
-lists by sending an empty message to
+You can build Jackrabbit like this:
 
-   jackrabbit-dev-subscribe     :at: incubator.apache.org
-and
-   jackrabbit-commits-subscribe :at: incubator.apache.org
+    mvn clean install
 
-and the dev mailing list archives can be found at
+You need Maven 2.1 (or higher, Maven 3 recommended) with Java 6 (or higher)
+for the build. For more instructions, please see the documentation at:
 
-   http://incubator.apache.org/mail/jackrabbit-dev/
+   http://jackrabbit.apache.org/building-jackrabbit.html
 
+License (see also LICENSE.txt)
+==============================
 
-Downloading
------------
+Collective work: Copyright 2013 The Apache Software Foundation.
 
-The Jackrabbit source code is available via Subversion at
+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
 
-   https://svn.apache.org/repos/asf/incubator/jackrabbit/trunk
+     http://www.apache.org/licenses/LICENSE-2.0
 
-and anonymous access is available at
+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://svn.apache.org/repos/asf/incubator/jackrabbit/trunk
+Mailing Lists
+=============
 
-or with viewcvs at
+To get involved with the Apache Jackrabbit project, start by having a
+look at our website and joining our mailing lists. For more details about
+Jackrabbit mailing lists as well as links to list archives, please see:
 
-   http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/
+   http://jackrabbit.apache.org/mailing-lists.html
 
-Once you have a copy of the source code tree, you can use Apache Maven
+Latest development
+==================
 
-   http://maven.apache.org/
+The latest Jackrabbit source code is available via Subversion at
 
-to build the project.  After installing Maven 1.0, be sure to download the
-latest release of the Ant plugin (1.8.1 or later) using a command like
+   https://svn.apache.org/repos/asf/jackrabbit/trunk/
 
-   maven plugin:download -DgroupId=maven \
-         -DartifactId=maven-ant-plugin -Dversion=1.8.1
+or with ViewVC at
 
-before running one of the maven commands listed at
+   https://svn.apache.org/viewvc/jackrabbit/trunk/
 
-   http://maven.apache.org/start/use.html
+To checkout the main Jackrabbit source tree, run
 
-to build the Jackrabbit project and/or documentation.
+   svn checkout https://svn.apache.org/repos/asf/jackrabbit/trunk jackrabbit
 
-NOTE: JDK 1.5 users need to download xalan.jar and place it in
-$MAVEN_HOME/lib/endorsed to build the Jackrabbit sources. The
-reason for this workaround is explained in
+If you use Git, you can clone Jackrabbit with
 
-   http://issues.apache.org/jira/browse/JCR-46
+   git clone git://git.apache.org/jackrabbit.git
 
 Credits
 =======
 
-who                     what
---------------------    -----------------------------------------------
-Roy Fielding            incubation
-Stefan Guggisberg       core, data model, persistence, nodetypes, misc.
-David Nuescheler        architecture, api
-Dominique Pfister       transactions
-Peeter Piegaze          api
-Tim Reilly              mavenize
-Marcel Reutegger        observation, query
-Tobias Strasser         versioning
-
-
-Changes
-=======
-
-See <http://incubator.apache.org/jackrabbit/changelog-report.html>
+See http://jackrabbit.apache.org/jackrabbit-team.html for the list of 
+Jackrabbit committers and main contributors.