[jboss-cvs] JBossAS SVN: r111378 - in projects/jboss-jca/trunk: core/src/main/java/org/jboss/jca/core/spi/transaction/xa and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon May 16 08:36:41 EDT 2011
Author: jesper.pedersen
Date: 2011-05-16 08:36:40 -0400 (Mon, 16 May 2011)
New Revision: 111378
Modified:
projects/jboss-jca/trunk/build.xml
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/spi/transaction/xa/XidWrapper.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceWrapperImpl.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/XidWrapperImpl.java
projects/jboss-jca/trunk/ivy.xml
Log:
[JBJCA-572] [JBJCA-576] Use JTA 1.1 sematics (Part 2)
Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml 2011-05-16 05:03:52 UTC (rev 111377)
+++ projects/jboss-jca/trunk/build.xml 2011-05-16 12:36:40 UTC (rev 111378)
@@ -103,7 +103,6 @@
<property name="version.hornetq" value="2.2.2.Final"/>
<property name="version.javassist" value="3.14.0-GA"/>
<property name="version.jboss.common" value="2.2.17.GA"/>
- <property name="version.jboss.integration" value="5.1.0.CR1"/>
<property name="version.jboss.jaspi.api" value="1.0.0.Final"/>
<property name="version.jboss.jms.api" value="1.0.0.Beta1"/>
<property name="version.jboss.logging" value="3.0.0.Beta5"/>
@@ -119,6 +118,7 @@
<property name="version.jboss.stdio" value="1.0.0.CR3"/>
<property name="version.jboss.threads" value="2.0.0.CR7"/>
<property name="version.jboss.ts" value="4.15.0.Final"/>
+ <property name="version.jboss.ts.spi" value="7.0.0.CR1"/>
<property name="version.jdepend" value="2.9.1"/>
<property name="version.jetty" value="7.4.0.v20110414"/>
<property name="version.jetty.servlet" value="6.1.14"/>
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/spi/transaction/xa/XidWrapper.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/spi/transaction/xa/XidWrapper.java 2011-05-16 05:03:52 UTC (rev 111377)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/spi/transaction/xa/XidWrapper.java 2011-05-16 12:36:40 UTC (rev 111378)
@@ -21,8 +21,6 @@
*/
package org.jboss.jca.core.spi.transaction.xa;
-import java.io.Serializable;
-
import javax.transaction.xa.Xid;
/**
@@ -31,7 +29,7 @@
* @author <a href="jesper.pedersen at jboss.org">Jesper Pedersen</a>
* @version $Revision: 85945 $
*/
-public interface XidWrapper extends Serializable, Xid
+public interface XidWrapper extends Xid
{
/**
* Get the JNDI name
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceWrapperImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceWrapperImpl.java 2011-05-16 05:03:52 UTC (rev 111377)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceWrapperImpl.java 2011-05-16 12:36:40 UTC (rev 111378)
@@ -38,9 +38,6 @@
public class XAResourceWrapperImpl implements org.jboss.jca.core.spi.transaction.xa.XAResourceWrapper,
org.jboss.tm.XAResourceWrapper
{
- /** Serial version UID */
- private static final long serialVersionUID = 2147435420748633848L;
-
/** Log instance */
private static Logger log = Logger.getLogger(XAResourceWrapperImpl.class);
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/XidWrapperImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/XidWrapperImpl.java 2011-05-16 05:03:52 UTC (rev 111377)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/tx/jbossts/XidWrapperImpl.java 2011-05-16 12:36:40 UTC (rev 111378)
@@ -35,9 +35,6 @@
*/
public class XidWrapperImpl implements XidWrapper
{
- /** The serialVersionUID */
- private static final long serialVersionUID = 3223859423961011795L;
-
/** The formatId */
private int formatId;
Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml 2011-05-16 05:03:52 UTC (rev 111377)
+++ projects/jboss-jca/trunk/ivy.xml 2011-05-16 12:36:40 UTC (rev 111378)
@@ -139,6 +139,7 @@
</dependency>
<dependency org="org.javassist" name="javassist" rev="${version.javassist}" conf="common,ironjacamar-depchain"/>
<dependency org="org.jboss" name="jboss-common-core" rev="${version.jboss.common}" conf="common,ironjacamar-common-impl,ironjacamar-core-impl,ironjacamar-depchain"/>
+ <dependency org="org.jboss" name="jboss-transaction-spi" rev="${version.jboss.ts.spi}" conf="common,ironjacamar-core-api,ironjacamar-core-impl,ironjacamar-depchain"/>
<dependency org="org.jboss.apiviz" name="apiviz" rev="${version.apiviz}" conf="tools"/>
<dependency org="org.jboss.arquillian" name="arquillian-api" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
<dependency org="org.jboss.arquillian" name="arquillian-impl-base" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
@@ -146,7 +147,6 @@
<dependency org="org.jboss.arquillian" name="arquillian-spi" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
<dependency org="org.jboss.arquillian.protocol" name="arquillian-protocol-local" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
<dependency org="org.jboss.arquillian.testenricher" name="arquillian-testenricher-resource" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
- <dependency org="org.jboss.integration" name="jboss-transaction-spi" rev="${version.jboss.integration}" conf="common,ironjacamar-core-api,ironjacamar-core-impl,ironjacamar-depchain"/>
<dependency org="org.jboss.jbossts" name="jbossjta" rev="${version.jboss.ts}" conf="common,ironjacamar-depchain"/>
<dependency org="org.jboss.jbossts" name="jbossjta-integration" rev="${version.jboss.ts}" conf="common,ironjacamar-depchain"/>
<dependency org="org.jboss.naming" name="jnpserver" rev="${version.jboss.naming}" conf="common,ironjacamar-depchain"/>
@@ -165,13 +165,13 @@
<dependency org="org.mortbay.jetty" name="jsp-api-2.1-glassfish" rev="${version.jetty.glassfish}" conf="jetty"/>
<dependency org="org.mortbay.jetty" name="servlet-api-2.5" rev="${version.jetty.servlet}" conf="jetty"/>
<dependency org="org.picketbox" name="picketbox" rev="${version.jboss.picketbox}" conf="common,ironjacamar-depchain"/>
- <dependency org="org.rhq" name="rhq-core-plugin-api" rev="${version.rhq}" conf="rhq"/>
<dependency org="org.rhq" name="rhq-core-client-api" rev="${version.rhq}" conf="rhq"/>
+ <dependency org="org.rhq" name="rhq-core-comm-api" rev="${version.rhq}" conf="rhq"/>
<dependency org="org.rhq" name="rhq-core-domain" rev="${version.rhq}" conf="rhq"/>
<dependency org="org.rhq" name="rhq-core-native-system" rev="${version.rhq}" conf="rhq"/>
+ <dependency org="org.rhq" name="rhq-core-plugin-api" rev="${version.rhq}" conf="rhq"/>
+ <dependency org="org.rhq" name="rhq-core-plugin-container" rev="${version.rhq}" conf="rhq"/>
<dependency org="org.rhq" name="rhq-core-util" rev="${version.rhq}" conf="rhq"/>
- <dependency org="org.rhq" name="rhq-core-plugin-container" rev="${version.rhq}" conf="rhq"/>
- <dependency org="org.rhq" name="rhq-core-comm-api" rev="${version.rhq}" conf="rhq"/>
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="${version.slf4j}" conf="common,ironjacamar-depchain"/>
<dependency org="org.slf4j" name="slf4j-api" rev="${version.slf4j}" conf="common,ironjacamar-depchain"/>
</dependencies>
More information about the jboss-cvs-commits
mailing list