You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2007/08/22 11:38:11 UTC

svn commit: r568530 - in /jackrabbit/trunk: ./ contrib/spi/ jackrabbit-spi-commons/ jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/value/ jackrabbit-spi/

Author: angela
Date: Wed Aug 22 02:38:10 2007
New Revision: 568530

URL: http://svn.apache.org/viewvc?rev=568530&view=rev
Log:
JCR-1070 Promotion of SPI from Contrib (jackrabbit-spi, jackrabbit-commons-spi)
JCR-788  Upgrade to Lucene 2.2 (adjusted dependency in spi contrib. the outdated dependency in caused build to fail)

Added:
    jackrabbit/trunk/jackrabbit-spi/
      - copied from r568039, jackrabbit/trunk/contrib/spi/spi/
    jackrabbit/trunk/jackrabbit-spi-commons/
      - copied from r568039, jackrabbit/trunk/contrib/spi/commons/
    jackrabbit/trunk/jackrabbit-spi-commons/LICENSE.txt   (with props)
    jackrabbit/trunk/jackrabbit-spi-commons/NOTICE.txt   (with props)
    jackrabbit/trunk/jackrabbit-spi-commons/README.txt   (with props)
    jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/value/QValueFactoryImpl.java
      - copied unchanged from r568172, jackrabbit/trunk/contrib/spi/commons/src/main/java/org/apache/jackrabbit/value/QValueFactoryImpl.java
    jackrabbit/trunk/jackrabbit-spi/LICENSE.txt   (with props)
    jackrabbit/trunk/jackrabbit-spi/NOTICE.txt   (with props)
    jackrabbit/trunk/jackrabbit-spi/README.txt   (with props)
Modified:
    jackrabbit/trunk/contrib/spi/README.txt
    jackrabbit/trunk/contrib/spi/pom.xml
    jackrabbit/trunk/jackrabbit-spi-commons/pom.xml
    jackrabbit/trunk/jackrabbit-spi/pom.xml
    jackrabbit/trunk/pom.xml

Modified: jackrabbit/trunk/contrib/spi/README.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/README.txt?rev=568530&r1=568529&r2=568530&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/README.txt (original)
+++ jackrabbit/trunk/contrib/spi/README.txt Wed Aug 22 02:38:10 2007
@@ -27,8 +27,8 @@
 Introduction
 ===============================================================================
 
-This contribution within the Jackrabbit project contains a Service Provider
-Interface (SPI) and example implementations:
+This contribution within the Jackrabbit project contains example 
+implementations for Jackrabbit SPI:
 
 - SPI2JCR : implements the SPI on top of JCR (e.g. Jackrabbit)
 - SPI2DAV : SPI implementation on top of WebDAV connecting to a Jackrabbit Jcr-Server.
@@ -46,47 +46,13 @@
   JCR -> SPI -> WebDAV -> JCR
 
 
-
-Aim of the SPI
-===============================================================================
-
-The goal of JSR-170 was to specify an API that is easy to use and intuitive 
-for a java "application" developer. This means that the API is designed to 
-cover the needs of the "consumer" of the API.
-Having an additional SPI layer would allow to cover network protocol mappings 
-in an abstract manner and also lower the bar for a JCR implementation.
-
-The SPI is layered underneith the transient space, and is not designed
-to be used by the application programmer directly. 
-Instead it is implemented by a "repository server" (still missing) and used 
-by a "repository client" (JCR2SPI) which exposes the JCR API to the
-application programmer.
-
-The original design goal was to define a mostly flat, non-"object oriented" 
-API. The reasons for this are:
-
-(1) Defined support of a client/server architecture
-A flat SPI-API lends itself to protocol mappings to protocols 
-like WebDAV, SOAP or others in a straightforward yet meaningful way.
-An SPI allows that a repository client and a repository server 
-can interact without explicitely specifying protocol mappings.
-
-(2) Implementation Support
-Drawing the boundaries between the repository client and the
-repository server allows repository implementation to implement
-only the "server" portion and leverage existing generic 
-(opensource) clients for things like the "transient space" etc.
-This should ease the implementation of the JSR-170 api.
- 
-
-
 Requirements
 ===============================================================================
 
 This project assumes that you have already successfully compiled and 
-installed the Jackrabbit commons module as well as the Jackrabbit
-Jcr-Server into your maven repository. If this is not the case, go back
-to your jackrabbit directory and build it.
+installed the Jackrabbit SPI, SPI commons and JCR commons module as well 
+as the Jackrabbit Jcr-Server into your maven repository. If this is not the case, 
+go back to your jackrabbit directory and build it.
 NOTE: Jackrabbit is built using Maven2.
 
 > cd ../../

Modified: jackrabbit/trunk/contrib/spi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/pom.xml?rev=568530&r1=568529&r2=568530&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/pom.xml (original)
+++ jackrabbit/trunk/contrib/spi/pom.xml Wed Aug 22 02:38:10 2007
@@ -35,8 +35,6 @@
   <packaging>pom</packaging>
   
   <modules>
-    <module>spi</module>
-    <module>commons</module>
     <module>jcr2spi</module>
     <module>spi2jcr</module>
     <module>spi2dav</module>
@@ -47,16 +45,6 @@
     <module>spi-logger</module>
     -->
   </modules>
-  <!--
-  <modules>
-    <module>jackrabbit-spi-spi</module>
-    <module>jackrabbit-spi-commons</module>
-    <module>jackrabbit-spi-jcr2spi</module>
-    <module>jackrabbit-spi-spi2jcr</module>
-    <module>jackrabbit-spi-spi-rmi</module>
-    <module>jackrabbit-test-client</module>
-  </modules>
-  -->
 
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/trunk/contrib/spi</connection>
@@ -255,7 +243,7 @@
       <dependency>
         <groupId>org.apache.lucene</groupId>
         <artifactId>lucene-core</artifactId>
-        <version>2.0.0</version>
+        <version>2.2.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.derby</groupId>

Added: jackrabbit/trunk/jackrabbit-spi-commons/LICENSE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/LICENSE.txt?rev=568530&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/LICENSE.txt (added)
+++ jackrabbit/trunk/jackrabbit-spi-commons/LICENSE.txt Wed Aug 22 02:38:10 2007
@@ -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.

Propchange: jackrabbit/trunk/jackrabbit-spi-commons/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/trunk/jackrabbit-spi-commons/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = author date id revision

Added: jackrabbit/trunk/jackrabbit-spi-commons/NOTICE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/NOTICE.txt?rev=568530&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/NOTICE.txt (added)
+++ jackrabbit/trunk/jackrabbit-spi-commons/NOTICE.txt Wed Aug 22 02:38:10 2007
@@ -0,0 +1,8 @@
+Apache Jackrabbit
+Copyright 2007 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/).

Propchange: jackrabbit/trunk/jackrabbit-spi-commons/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/trunk/jackrabbit-spi-commons/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = author date id revision

Added: jackrabbit/trunk/jackrabbit-spi-commons/README.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/README.txt?rev=568530&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/README.txt (added)
+++ jackrabbit/trunk/jackrabbit-spi-commons/README.txt Wed Aug 22 02:38:10 2007
@@ -0,0 +1,62 @@
+=================================
+Welcome to Jackrabbit SPI Commons
+=================================
+
+This is the SPI Commons component of the Apache Jackrabbit project.
+This component contains generic utility classes that might be used
+to build an SPI implementation.
+In addition this component provides utilities used to convert JCR
+name and path Strings as well as values to their corresponding SPI 
+representation.
+
+See the Apache Jackrabbit web site (http://jackrabbit.apache.org/)
+for documentation and other information. You are welcome to join the
+Jackrabbit mailing lists (http://jackrabbit.apache.org/mail-lists.html)
+to discuss this compoment and to use the Jackrabbit issue tracker
+(http://issues.apache.org/jira/browse/JCR) to report issues or request
+new features.
+
+Apache Jackrabbit is a project of the Apache Software Foundation
+(http://www.apache.org).
+
+
+License (see also LICENSE.txt)
+==============================
+
+Collective work: Copyright 2007 The Apache Software Foundation.
+
+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.
+
+
+Getting Started
+===============
+
+This compoment uses a Maven 2 (http://maven.apache.org/) build
+environment. If you have Maven 2 installed, you can compile and
+package the jacrabbit-spi-commons jar using the following command:
+
+    mvn package
+
+See the Maven 2 documentation for other build features.
+
+The latest source code for this compoment is available in the
+Subversion (http://subversion.tigris.org/) source repository of
+the Apache Software Foundation. If you have Subversion installed,
+you can checkout the latest source using the following command:
+
+    svn checkout http://svn.apache.org/repos/asf/jackrabbit/trunk/jackrabbit-spi-commons
+
+See the Subversion documentation for other source control features.

Propchange: jackrabbit/trunk/jackrabbit-spi-commons/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/trunk/jackrabbit-spi-commons/README.txt
------------------------------------------------------------------------------
    svn:keywords = author date id revision

Modified: jackrabbit/trunk/jackrabbit-spi-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/pom.xml?rev=568530&r1=568039&r2=568530&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/pom.xml Wed Aug 22 02:38:10 2007
@@ -28,21 +28,21 @@
 <!-- ====================================================================== -->
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
-    <artifactId>jackrabbit-spi-contrib</artifactId>
+    <artifactId>jackrabbit</artifactId>
     <version>1.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>jackrabbit-spi-commons</artifactId>
-  <name>SPI Commons</name>
+  <name>Jackrabbit SPI Commons</name>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/jackrabbit/trunk/contrib/spi/commons
+      scm:svn:http://svn.apache.org/repos/asf/jackrabbit/trunk/jackrabbit-spi-commons
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/jackrabbit/trunk/contrib/spi/commons
+      scm:svn:https://svn.apache.org/repos/asf/jackrabbit/trunk/jackrabbit-spi-commons
     </developerConnection>
-    <url>http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/commons</url>
+    <url>http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons</url>
   </scm>
 
   <build>
@@ -62,9 +62,9 @@
       <artifactId>jackrabbit-spi</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.apache.jackrabbit</groupId>
-        <artifactId>jackrabbit-jcr-commons</artifactId>
-      </dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-jcr-commons</artifactId>
+    </dependency>
     <dependency>
       <groupId>javax.jcr</groupId>
       <artifactId>jcr</artifactId>

Added: jackrabbit/trunk/jackrabbit-spi/LICENSE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/LICENSE.txt?rev=568530&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/LICENSE.txt (added)
+++ jackrabbit/trunk/jackrabbit-spi/LICENSE.txt Wed Aug 22 02:38:10 2007
@@ -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.

Propchange: jackrabbit/trunk/jackrabbit-spi/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/trunk/jackrabbit-spi/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = author date id revision

Added: jackrabbit/trunk/jackrabbit-spi/NOTICE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/NOTICE.txt?rev=568530&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/NOTICE.txt (added)
+++ jackrabbit/trunk/jackrabbit-spi/NOTICE.txt Wed Aug 22 02:38:10 2007
@@ -0,0 +1,8 @@
+Apache Jackrabbit
+Copyright 2007 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/).

Propchange: jackrabbit/trunk/jackrabbit-spi/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/trunk/jackrabbit-spi/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = author date id revision

Added: jackrabbit/trunk/jackrabbit-spi/README.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/README.txt?rev=568530&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/README.txt (added)
+++ jackrabbit/trunk/jackrabbit-spi/README.txt Wed Aug 22 02:38:10 2007
@@ -0,0 +1,73 @@
+=========================
+Welcome to Jackrabbit SPI
+=========================
+
+This is the SPI component of the Apache Jackrabbit project.
+
+The SPI defines a layer within a JSR-170 implementation that separates
+the transient space from the persistent layer. The main goals were:
+
+(1) Defined support of a client/server architecture
+A flat SPI-API lends itself to protocol mappings to protocols 
+like WebDAV, SOAP or others in a straightforward yet meaningful way.
+An SPI allows that a repository client and a repository server 
+can interact without explicitely specifying protocol mappings.
+
+(2) Implementation Support
+Drawing the boundaries between the repository client and the
+repository server allows repository implementation to implement
+only the "server" portion and leverage existing generic 
+(opensource) clients for things like the "transient space" etc.
+This should ease the implementation of the JSR-170 api.
+
+See the Apache Jackrabbit web site (http://jackrabbit.apache.org/)
+for documentation and other information. You are welcome to join the
+Jackrabbit mailing lists (http://jackrabbit.apache.org/mail-lists.html)
+to discuss this compoment and to use the Jackrabbit issue tracker
+(http://issues.apache.org/jira/browse/JCR) to report issues or request
+new features.
+
+Apache Jackrabbit is a project of the Apache Software Foundation
+(http://www.apache.org).
+
+
+License (see also LICENSE.txt)
+==============================
+
+Collective work: Copyright 2007 The Apache Software Foundation.
+
+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.
+
+
+Getting Started
+===============
+
+This compoment uses a Maven 2 (http://maven.apache.org/) build
+environment. If you have Maven 2 installed, you can compile and
+package the jacrabbit-spi jar using the following command:
+
+    mvn package
+
+See the Maven 2 documentation for other build features.
+
+The latest source code for this compoment is available in the
+Subversion (http://subversion.tigris.org/) source repository of
+the Apache Software Foundation. If you have Subversion installed,
+you can checkout the latest source using the following command:
+
+    svn checkout http://svn.apache.org/repos/asf/jackrabbit/trunk/jackrabbit-spi
+
+See the Subversion documentation for other source control features.

Propchange: jackrabbit/trunk/jackrabbit-spi/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/trunk/jackrabbit-spi/README.txt
------------------------------------------------------------------------------
    svn:keywords = author date id revision

Modified: jackrabbit/trunk/jackrabbit-spi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/pom.xml?rev=568530&r1=568039&r2=568530&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-spi/pom.xml Wed Aug 22 02:38:10 2007
@@ -28,21 +28,21 @@
 <!-- ====================================================================== -->
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
-    <artifactId>jackrabbit-spi-contrib</artifactId>
+    <artifactId>jackrabbit</artifactId>
     <version>1.4-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>jackrabbit-spi</artifactId>
-  <name>Service Provider Interface (SPI)</name>
+  <name>Jackrabbit SPI</name>
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/jackrabbit/trunk/contrib/spi/spi
+      scm:svn:http://svn.apache.org/repos/asf/jackrabbit/trunk/jackrabbit-spi
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/jackrabbit/trunk/contrib/spi/spi
+      scm:svn:https://svn.apache.org/repos/asf/jackrabbit/trunk/jackrabbit-spi
     </developerConnection>
-    <url>http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/spi</url>
+    <url>http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi</url>
   </scm>
 
   <build>

Modified: jackrabbit/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/pom.xml?rev=568530&r1=568529&r2=568530&view=diff
==============================================================================
--- jackrabbit/trunk/pom.xml (original)
+++ jackrabbit/trunk/pom.xml Wed Aug 22 02:38:10 2007
@@ -66,6 +66,8 @@
     <module>jackrabbit-classloader</module>
     <module>jackrabbit-webapp</module>
     <module>jackrabbit-jca</module>
+    <module>jackrabbit-spi</module>
+    <module>jackrabbit-spi-commons</module>
   </modules>
 
   <build>
@@ -698,6 +700,16 @@
       <dependency>
         <groupId>org.apache.jackrabbit</groupId>
         <artifactId>jackrabbit-jcr-server</artifactId>
+        <version>1.4-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.jackrabbit</groupId>
+        <artifactId>jackrabbit-spi</artifactId>
+        <version>1.4-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.jackrabbit</groupId>
+        <artifactId>jackrabbit-spi-commons</artifactId>
         <version>1.4-SNAPSHOT</version>
       </dependency>
       <dependency>