From commits-return-4515-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Fri Sep 07 21:04:27 2007 Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 73622 invoked from network); 7 Sep 2007 21:04:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Sep 2007 21:04:25 -0000 Received: (qmail 64249 invoked by uid 500); 7 Sep 2007 21:04:20 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 64215 invoked by uid 500); 7 Sep 2007 21:04:19 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 64206 invoked by uid 99); 7 Sep 2007 21:04:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Sep 2007 14:04:19 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Sep 2007 21:05:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 176D41A9838; Fri, 7 Sep 2007 14:04:02 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r573705 - in /jackrabbit/trunk: jackrabbit-api/src/main/java/org/apache/jackrabbit/api/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ Date: Fri, 07 Sep 2007 21:04:00 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070907210402.176D41A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Fri Sep 7 14:03:56 2007 New Revision: 573705 URL: http://svn.apache.org/viewvc?rev=573705&view=rev Log: JCR-1097: Moved o.a.j.core.XASession to o.a.j.api.XASession Added: jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/XASession.java - copied, changed from r573689, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASession.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASession.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/UserTransactionImpl.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java Copied: jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/XASession.java (from r573689, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASession.java) URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/XASession.java?p2=jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/XASession.java&p1=jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASession.java&r1=573689&r2=573705&rev=573705&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASession.java (original) +++ jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/XASession.java Fri Sep 7 14:03:56 2007 @@ -14,31 +14,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.core; +package org.apache.jackrabbit.api; import javax.jcr.Session; import javax.transaction.xa.XAResource; /** - * The XASession interface extends the capability of - * Session by adding access to a JCR repository's support for - * the Java Transaction API (JTA). + * The XASession interface extends the capability of {@link Session} by adding + * access to a JCR repository's support for the Java Transaction API (JTA). *

- * This support takes the form of a javax.transaction.xa.XAResource + * This support takes the form of a {@link javax.transaction.xa.XAResource} * object. The functionality of this object closely resembles that defined by * the standard X/Open XA Resource interface. *

* This interface is used by the transaction manager; an application does not * use it directly. + * + * @since 1.4 */ public interface XASession extends Session { /** - * Retrieves an XAResource object that the transaction manager - * will use to manage this XASession object's participation in + * Retrieves an {@link XAResource} object that the transaction manager + * will use to manage this XASession object's participation in * a distributed transaction. * - * @return the XAResource object. + * @return the {@link XAResource} object. */ XAResource getXAResource(); + } Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASession.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASession.java?rev=573705&r1=573704&r2=573705&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASession.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASession.java Fri Sep 7 14:03:56 2007 @@ -16,29 +16,8 @@ */ package org.apache.jackrabbit.core; -import javax.jcr.Session; -import javax.transaction.xa.XAResource; - /** - * The XASession interface extends the capability of - * Session by adding access to a JCR repository's support for - * the Java Transaction API (JTA). - *

- * This support takes the form of a javax.transaction.xa.XAResource - * object. The functionality of this object closely resembles that defined by - * the standard X/Open XA Resource interface. - *

- * This interface is used by the transaction manager; an application does not - * use it directly. + * @deprecated Use {@link org.apache.jackrabbit.api.XASession} instead */ -public interface XASession extends Session { - - /** - * Retrieves an XAResource object that the transaction manager - * will use to manage this XASession object's participation in - * a distributed transaction. - * - * @return the XAResource object. - */ - XAResource getXAResource(); +public interface XASession extends org.apache.jackrabbit.api.XASession { } Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/UserTransactionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/UserTransactionImpl.java?rev=573705&r1=573704&r2=573705&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/UserTransactionImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/UserTransactionImpl.java Fri Sep 7 14:03:56 2007 @@ -28,6 +28,8 @@ import javax.transaction.RollbackException; import javax.jcr.Session; +import org.apache.jackrabbit.api.XASession; + /** * Internal {@link javax.transaction.UserTransaction} implementation. */ Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java?rev=573705&r1=573704&r2=573705&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java Fri Sep 7 14:03:56 2007 @@ -33,7 +33,7 @@ /** * XATest contains the test cases for the methods - * inside {@link org.apache.jackrabbit.core.XASession}. + * inside {@link org.apache.jackrabbit.api.XASession}. */ public class XATest extends AbstractJCRTest {