[jboss-cvs] JBossAS SVN: r77062 - in projects/ejb3/tags: jboss-ejb3-transactions-0.13.4 and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 14 06:20:19 EDT 2008
Author: ALRubinger
Date: 2008-08-14 06:20:19 -0400 (Thu, 14 Aug 2008)
New Revision: 77062
Added:
projects/ejb3/tags/jboss-ejb3-transactions-0.13.4/
projects/ejb3/tags/jboss-ejb3-transactions-0.13.4/pom.xml
projects/ejb3/tags/jboss-ejb3-transactions-0.13.4/src/main/java/org/jboss/ejb3/tx/Ejb3TxPolicy.java
Removed:
projects/ejb3/tags/jboss-ejb3-transactions-0.13.4/pom.xml
projects/ejb3/tags/jboss-ejb3-transactions-0.13.4/src/main/java/org/jboss/ejb3/tx/Ejb3TxPolicy.java
Log:
[maven-release-plugin] copy for tag jboss-ejb3-transactions-0.13.4
Copied: projects/ejb3/tags/jboss-ejb3-transactions-0.13.4 (from rev 77044, projects/ejb3/trunk/transactions)
Deleted: projects/ejb3/tags/jboss-ejb3-transactions-0.13.4/pom.xml
===================================================================
--- projects/ejb3/trunk/transactions/pom.xml 2008-08-14 00:20:29 UTC (rev 77044)
+++ projects/ejb3/tags/jboss-ejb3-transactions-0.13.4/pom.xml 2008-08-14 10:20:19 UTC (rev 77062)
@@ -1,157 +0,0 @@
-<!--
- vi:ts=2:sw=2:expandtab
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-build</artifactId>
- <version>0.13.9</version>
- <relativePath>../build/pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-ejb3-transactions</artifactId>
- <version>0.13.4-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>JBoss EJB 3.0 Transactions</name>
- <url>http://www.jboss.org</url>
- <description>
- The JBoss EJB 3 Transactions component implements all functionality
- specified in Chapter 13 (Support for Transactions) of the EJB 3.0
- specification.
- </description>
-
- <dependencies>
- <!-- Internal -->
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-metadata</artifactId>
- <version>0.12.1</version>
- </dependency>
-
- <!-- External -->
- <dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>jboss-aop-deployer-jdk50</artifactId>
- <version>2.0.0.CR8</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.aspects</groupId>
- <artifactId>jboss-current-invocation-aspects</artifactId>
- <version>1.0.0.CR1</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-transaction-spi</artifactId>
- <version>5.0.0.Beta4</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnpserver</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.aspects</groupId>
- <artifactId>jboss-transaction-aspects</artifactId>
- <version>1.0.0.Beta1</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- <version>2.0.0.Beta14</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- <version>2.0.0.Beta14</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-cache</artifactId>
- <version>0.13.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-ext-api-impl</artifactId>
- <version>0.3</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-interceptors</artifactId>
- <version>0.13.2</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>2.0.0.Beta14</version>
- <scope>test</scope>
- </dependency>
- <!--
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-managed</artifactId>
- <version>2.0.0.Beta10</version>
- <scope>test</scope>
- </dependency>
- -->
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossjta</artifactId>
- <version>4.3.0.GA</version>
- <scope>test</scope>
- </dependency>
- <!-- For Eclipse Maven 2 Plugin -->
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- <version>2.0.0.Beta12</version>
- <scope>test</scope>
- </dependency>
-
- <!-- For Arjuna / JBoss Transaction -->
- <dependency>
- <groupId>apache-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.0.jboss</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>oswego-concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4-jboss-update1</version>
- </dependency>
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossts-common</artifactId>
- <version>4.3.0.GA</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
Copied: projects/ejb3/tags/jboss-ejb3-transactions-0.13.4/pom.xml (from rev 77061, projects/ejb3/trunk/transactions/pom.xml)
===================================================================
--- projects/ejb3/tags/jboss-ejb3-transactions-0.13.4/pom.xml (rev 0)
+++ projects/ejb3/tags/jboss-ejb3-transactions-0.13.4/pom.xml 2008-08-14 10:20:19 UTC (rev 77062)
@@ -0,0 +1,163 @@
+<!--
+ vi:ts=2:sw=2:expandtab
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-build</artifactId>
+ <version>0.13.9</version>
+ <relativePath>../build/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-ejb3-transactions</artifactId>
+ <version>0.13.4</version>
+ <packaging>jar</packaging>
+ <name>JBoss EJB 3.0 Transactions</name>
+ <url>http://www.jboss.org</url>
+ <description>
+ The JBoss EJB 3 Transactions component implements all functionality
+ specified in Chapter 13 (Support for Transactions) of the EJB 3.0
+ specification.
+ </description>
+
+ <dependencies>
+ <!-- Internal -->
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-metadata</artifactId>
+ <version>0.12.1</version>
+ </dependency>
+
+ <!-- External -->
+ <dependency>
+ <groupId>jboss.aop</groupId>
+ <artifactId>jboss-aop-deployer-jdk50</artifactId>
+ <version>2.0.0.CR8</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aspects</groupId>
+ <artifactId>jboss-current-invocation-aspects</artifactId>
+ <version>1.0.0.CR1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-transaction-spi</artifactId>
+ <version>5.0.0.Beta4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnpserver</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aspects</groupId>
+ <artifactId>jboss-transaction-aspects</artifactId>
+ <version>1.0.0.Beta1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <version>2.0.0.Beta14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <version>2.0.0.Beta14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-cache</artifactId>
+ <version>0.13.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-ext-api-impl</artifactId>
+ <version>0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-interceptors</artifactId>
+ <version>0.13.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>2.0.0.Beta14</version>
+ <scope>test</scope>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <version>2.0.0.Beta10</version>
+ <scope>test</scope>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossjta</artifactId>
+ <version>4.3.0.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- For Eclipse Maven 2 Plugin -->
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <version>2.0.0.Beta12</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- For Arjuna / JBoss Transaction -->
+ <dependency>
+ <groupId>apache-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.0.jboss</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4-jboss-update1</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossts-common</artifactId>
+ <version>4.3.0.GA</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/ejb3/tags/jboss-ejb3-transactions-0.13.4</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/ejb3/tags/jboss-ejb3-transactions-0.13.4</developerConnection>
+ <url>http://anonsvn.jboss.org/repos/jbossas/projects/ejb3/tags/jboss-ejb3-transactions-0.13.4</url>
+ </scm>
+</project>
Deleted: projects/ejb3/tags/jboss-ejb3-transactions-0.13.4/src/main/java/org/jboss/ejb3/tx/Ejb3TxPolicy.java
===================================================================
--- projects/ejb3/trunk/transactions/src/main/java/org/jboss/ejb3/tx/Ejb3TxPolicy.java 2008-08-14 00:20:29 UTC (rev 77044)
+++ projects/ejb3/tags/jboss-ejb3-transactions-0.13.4/src/main/java/org/jboss/ejb3/tx/Ejb3TxPolicy.java 2008-08-14 10:20:19 UTC (rev 77062)
@@ -1,133 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed 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. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.tx;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.ApplicationException;
-import javax.ejb.EJBException;
-import javax.ejb.EJBTransactionRequiredException;
-import javax.ejb.EJBTransactionRolledbackException;
-import javax.transaction.RollbackException;
-import javax.transaction.Transaction;
-
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.aop.joinpoint.MethodInvocation;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class Ejb3TxPolicy extends org.jboss.aspects.tx.TxPolicy
-{
- public void throwMandatory(Invocation invocation)
- {
- throw new EJBTransactionRequiredException(((MethodInvocation) invocation).getActualMethod().toString());
- }
-
- @Override
- public void handleEndTransactionException(Exception e)
- {
- if(e instanceof RollbackException)
- throw new EJBTransactionRolledbackException("Transaction rolled back", e);
- super.handleEndTransactionException(e);
- }
-
- public void handleExceptionInOurTx(Invocation invocation, Throwable t, Transaction tx) throws Throwable
- {
- ApplicationException ae = TxUtil.getApplicationException(t.getClass(), invocation);
- if (ae != null)
- {
- if (ae.rollback()) setRollbackOnly(tx);
- throw t;
- }
-
- // if it's neither EJBException nor RemoteException
- if(!(t instanceof EJBException || t instanceof RemoteException))
- {
- // errors and unchecked are wrapped into EJBException
- if(t instanceof Error)
- {
- t = new EJBException(formatException("Unexpected Error", t));
- }
- else if (t instanceof RuntimeException)
- {
- t = new EJBException((Exception)t);
- }
- else
- {
- // an application exception
- throw t;
- }
- }
-
- setRollbackOnly(tx);
- throw t;
- }
-
- public void handleInCallerTx(Invocation invocation, Throwable t, Transaction tx) throws Throwable
- {
- ApplicationException ae = TxUtil.getApplicationException(t.getClass(), invocation);
-
- if (ae != null)
- {
- if (ae.rollback()) setRollbackOnly(tx);
- throw t;
- }
-
- // if it's not EJBTransactionRolledbackException
- if(!(t instanceof EJBTransactionRolledbackException))
- {
- if(t instanceof Error)
- {
- t = new EJBTransactionRolledbackException(formatException("Unexpected Error", t));
- }
- else if(t instanceof RuntimeException || t instanceof RemoteException)
- {
- t = new EJBTransactionRolledbackException(t.getMessage(), (Exception) t);
- }
- else // application exception
- {
- throw t;
- }
- }
-
- setRollbackOnly(tx);
- log.error(t);
- throw t;
- }
-
- private String formatException(String msg, Throwable t)
- {
- java.io.StringWriter sw = new java.io.StringWriter();
- java.io.PrintWriter pw = new java.io.PrintWriter(sw);
- if (msg != null)
- pw.println(msg);
- if (t != null)
- {
- t.printStackTrace(pw);
- } // end of if ()
- return sw.toString();
- }
-}
Copied: projects/ejb3/tags/jboss-ejb3-transactions-0.13.4/src/main/java/org/jboss/ejb3/tx/Ejb3TxPolicy.java (from rev 77054, projects/ejb3/trunk/transactions/src/main/java/org/jboss/ejb3/tx/Ejb3TxPolicy.java)
===================================================================
--- projects/ejb3/tags/jboss-ejb3-transactions-0.13.4/src/main/java/org/jboss/ejb3/tx/Ejb3TxPolicy.java (rev 0)
+++ projects/ejb3/tags/jboss-ejb3-transactions-0.13.4/src/main/java/org/jboss/ejb3/tx/Ejb3TxPolicy.java 2008-08-14 10:20:19 UTC (rev 77062)
@@ -0,0 +1,140 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed 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. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.tx;
+
+import java.rmi.NoSuchObjectException;
+import java.rmi.RemoteException;
+
+import javax.ejb.ApplicationException;
+import javax.ejb.EJBException;
+import javax.ejb.EJBTransactionRequiredException;
+import javax.ejb.EJBTransactionRolledbackException;
+import javax.transaction.RollbackException;
+import javax.transaction.Transaction;
+
+import org.jboss.aop.joinpoint.Invocation;
+import org.jboss.aop.joinpoint.MethodInvocation;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class Ejb3TxPolicy extends org.jboss.aspects.tx.TxPolicy
+{
+ public void throwMandatory(Invocation invocation)
+ {
+ throw new EJBTransactionRequiredException(((MethodInvocation) invocation).getActualMethod().toString());
+ }
+
+ @Override
+ public void handleEndTransactionException(Exception e)
+ {
+ if(e instanceof RollbackException)
+ throw new EJBTransactionRolledbackException("Transaction rolled back", e);
+ super.handleEndTransactionException(e);
+ }
+
+ public void handleExceptionInOurTx(Invocation invocation, Throwable t, Transaction tx) throws Throwable
+ {
+ ApplicationException ae = TxUtil.getApplicationException(t.getClass(), invocation);
+ if (ae != null)
+ {
+ if (ae.rollback()) setRollbackOnly(tx);
+ throw t;
+ }
+
+ // if it's neither EJBException nor RemoteException
+ if(!(t instanceof EJBException || t instanceof RemoteException))
+ {
+ // errors and unchecked are wrapped into EJBException
+ if(t instanceof Error)
+ {
+ t = new EJBException(formatException("Unexpected Error", t));
+ }
+ else if (t instanceof RuntimeException)
+ {
+ t = new EJBException((Exception)t);
+ }
+ else
+ {
+ // an application exception
+ throw t;
+ }
+ }
+
+ setRollbackOnly(tx);
+ throw t;
+ }
+
+ public void handleInCallerTx(Invocation invocation, Throwable t, Transaction tx) throws Throwable
+ {
+ ApplicationException ae = TxUtil.getApplicationException(t.getClass(), invocation);
+
+ if (ae != null)
+ {
+ if (ae.rollback()) setRollbackOnly(tx);
+ throw t;
+ }
+
+ // if it's not EJBTransactionRolledbackException
+ if(!(t instanceof EJBTransactionRolledbackException))
+ {
+ if(t instanceof Error)
+ {
+ t = new EJBTransactionRolledbackException(formatException("Unexpected Error", t));
+ }
+ // If this is an EJBException, pass through to the caller
+ else if (t instanceof EJBException || t instanceof RemoteException)
+ {
+ // Leave Exception as-is (this is in place to handle specifically, and not
+ // as a generic RuntimeException
+ }
+ else if(t instanceof RuntimeException)
+ {
+ t = new EJBTransactionRolledbackException(t.getMessage(), (Exception) t);
+ }
+ else // application exception
+ {
+ throw t;
+ }
+ }
+
+ setRollbackOnly(tx);
+ log.error(t);
+ throw t;
+ }
+
+ private String formatException(String msg, Throwable t)
+ {
+ java.io.StringWriter sw = new java.io.StringWriter();
+ java.io.PrintWriter pw = new java.io.PrintWriter(sw);
+ if (msg != null)
+ pw.println(msg);
+ if (t != null)
+ {
+ t.printStackTrace(pw);
+ } // end of if ()
+ return sw.toString();
+ }
+}
More information about the jboss-cvs-commits
mailing list