jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r901176 - in /jackrabbit/trunk: ./ jackrabbit-jcr-rmi/ jackrabbit-jcr-servlet/ jackrabbit-parent/ jackrabbit-spi2jcr/ jackrabbit-spi2jcr/src/test/java/org/apache/jackrabbit/spi2jcr/ jackrabbit-webapp/ jackrabbit-webapp/src/main/java/org/apa...
Date Wed, 20 Jan 2010 13:11:11 GMT
Author: jukka
Date: Wed Jan 20 13:11:10 2010
New Revision: 901176

URL: http://svn.apache.org/viewvc?rev=901176&view=rev
Log:
JCR-2470: Include to jackrabbit-jcr-rmi and jackrabbit-jcr-servlet in main trunk

Update the project setup to better integrate the jcr-rmi and jcr-servlet components.

Removed:
    jackrabbit/trunk/jackrabbit-jcr-rmi/LICENSE.txt
    jackrabbit/trunk/jackrabbit-jcr-rmi/NOTICE.txt
    jackrabbit/trunk/jackrabbit-jcr-rmi/RELEASE-NOTES.txt
    jackrabbit/trunk/jackrabbit-jcr-servlet/LICENSE.txt
    jackrabbit/trunk/jackrabbit-jcr-servlet/NOTICE.txt
    jackrabbit/trunk/jackrabbit-spi2jcr/src/test/java/org/apache/jackrabbit/spi2jcr/RMIRepositoryStub.java
Modified:
    jackrabbit/trunk/RELEASE-NOTES.txt
    jackrabbit/trunk/jackrabbit-jcr-rmi/README.txt
    jackrabbit/trunk/jackrabbit-jcr-servlet/README.txt
    jackrabbit/trunk/jackrabbit-parent/pom.xml
    jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml
    jackrabbit/trunk/jackrabbit-webapp/pom.xml
    jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java

Modified: jackrabbit/trunk/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/RELEASE-NOTES.txt?rev=901176&r1=901175&r2=901176&view=diff
==============================================================================
--- jackrabbit/trunk/RELEASE-NOTES.txt (original)
+++ jackrabbit/trunk/RELEASE-NOTES.txt Wed Jan 20 13:11:10 2010
@@ -17,7 +17,8 @@
 
   * Upgrade to JCR 2.0. This Jackrabbit release implements and is based
     on the official JCR 2.0 API. All of the features required by the
-    JSR 283 specification have been implemented.
+    JSR 283 specification have been implemented. Note that the remote
+    access layers (RMI and WebDAV) only support a subset of JCR 2.0.
 
   * Upgrade to Java 5. All of Jackrabbit (except the jcr-tests component)
     now requires Java 5 as the base platform. Java 1.4 environments are no
@@ -28,9 +29,9 @@
     that had been deprecated during the 1.x release cycle.
 
   * Separate JCR Commons components. Many of the general-purpose JCR
-    components like JCR-RMI and OCM are now developed and released
-    separately from the Jackrabbit content repository. See the individual
-    components for their most recent releases.
+    components like OCM are now developed and released separately from
+    the Jackrabbit content repository. See the individual components
+    for their most recent releases.
 
   * Database connection pooling is now available for all database backends.
 
@@ -47,6 +48,11 @@
     required for 10R1 and earlier anymore. If you need that use the new
     Oracle9FileSystem.
 
+  * Modified support of XA transactions over RMI. Instead of implementing
+    the org.apache.jackrabbit.api.XASession interface, JCR-RMI now makes the
+    client session implement the javax.transaction.xa.XAResource interface
+    directly whenever the server session does so.
+
 For more detailed information about all the changes in this and other
 Jackrabbit releases, please see the Jackrabbit issue tracker at
 

Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/README.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/README.txt?rev=901176&r1=901175&r2=901176&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/README.txt (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/README.txt Wed Jan 20 13:11:10 2010
@@ -1,44 +1,8 @@
 ===================================================
 Apache Jackrabbit JCR-RMI
-<http://jackrabbit.apache.org/commons/jcr-rmi.html>
 ===================================================
 
 JCR-RMI is a transparent Remote Method Invocation (RMI) layer for JCR.
 The layer makes it possible to remotely access JCR content repositories
 and is compatible with all JCR implementations.
 
-JCR-RMI is a part of the JCR Commons subproject of Apache Jackrabbit.
-Jackrabbit is a project of the Apache Software Foundation.
-
-Build instructions
-==================
-
-To build JCR-RMI, run the following command in this directory:
-
-    mvn clean install
-
-You need Java 5 (or higher) and Maven 2.0.9 (or higher) to do this.
-
-After the build finishes successfully, you can find the compiled JCR-RMI
-component in ./target/. The component will also have been installed
-in your local Maven repository.
-
-License (see also LICENSE.txt)
-==============================
-
-Collective work: Copyright 2010 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.

Modified: jackrabbit/trunk/jackrabbit-jcr-servlet/README.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-servlet/README.txt?rev=901176&r1=901175&r2=901176&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-servlet/README.txt (original)
+++ jackrabbit/trunk/jackrabbit-jcr-servlet/README.txt Wed Jan 20 13:11:10 2010
@@ -1,44 +1,8 @@
 =======================================================
 Apache Jackrabbit JCR Servlets
-<http://jackrabbit.apache.org/commons/jcr-servlet.html>
 =======================================================
 
 JCR Servlets is a collection of servlets and other classes designed to
 make it easier to use Jackrabbit and other JCR content repositories in
 web applications.
 
-JCR Servlets is a part of the JCR Commons subproject of Apache Jackrabbit.
-Jackrabbit is a project of the Apache Software Foundation.
-
-Build instructions
-==================
-
-To build JCR Servlets, run the following command in this directory:
-
-    mvn clean install
-
-You need Java 1.4 (or higher) and Maven 2.0.9 (or higher) to do this.
-
-After the build finishes successfully, you can find the compiled JCR Servlets
-component in ./target/. The component will also have been installed in your
-local Maven repository.
-
-License (see also LICENSE.txt)
-==============================
-
-Collective work: Copyright 2009 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.

Modified: jackrabbit/trunk/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-parent/pom.xml?rev=901176&r1=901175&r2=901176&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-parent/pom.xml Wed Jan 20 13:11:10 2010
@@ -194,16 +194,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.jackrabbit</groupId>
-        <artifactId>jackrabbit-jcr-rmi</artifactId>
-        <version>1.5.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.jackrabbit</groupId>
-        <artifactId>jackrabbit-jcr-servlet</artifactId>
-        <version>1.5.2</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.jackrabbit</groupId>
         <artifactId>jackrabbit-jcr-benchmark</artifactId>
         <version>1.5.0</version>
       </dependency>

Modified: jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml?rev=901176&r1=901175&r2=901176&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml Wed Jan 20 13:11:10 2010
@@ -137,11 +137,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
-      <artifactId>jackrabbit-jcr-rmi</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr2spi</artifactId>
       <version>2.1-SNAPSHOT</version>
       <classifier>tests</classifier>

Modified: jackrabbit/trunk/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/pom.xml?rev=901176&r1=901175&r2=901176&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-webapp/pom.xml Wed Jan 20 13:11:10 2010
@@ -52,10 +52,12 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-servlet</artifactId>
+      <version>2.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-rmi</artifactId>
+      <version>2.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java?rev=901176&r1=901175&r2=901176&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java
(original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java
Wed Jan 20 13:11:10 2010
@@ -20,8 +20,8 @@
 import org.apache.jackrabbit.commons.repository.RepositoryFactory;
 import org.apache.jackrabbit.core.RepositoryImpl;
 import org.apache.jackrabbit.core.config.RepositoryConfig;
-import org.apache.jackrabbit.rmi.jackrabbit.JackrabbitServerAdapterFactory;
 import org.apache.jackrabbit.rmi.server.RemoteAdapterFactory;
+import org.apache.jackrabbit.rmi.server.ServerAdapterFactory;
 import org.apache.jackrabbit.servlet.AbstractRepositoryServlet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -654,8 +654,8 @@
      */
     protected static class RMIRemoteFactoryDelegater extends RemoteFactoryDelegater {
 
-    	private static final RemoteAdapterFactory FACTORY =
-    		new JackrabbitServerAdapterFactory();
+        private static final RemoteAdapterFactory FACTORY =
+            new ServerAdapterFactory();
 
         public Remote createRemoteRepository(Repository repository)
                 throws RemoteException {



Mime
View raw message