[jboss-cvs] JBossAS SVN: r101615 - in projects/snowdrop/branches/1_0: build and 15 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Feb 28 12:03:57 EST 2010
Author: marius.bogoevici
Date: 2010-02-28 12:03:56 -0500 (Sun, 28 Feb 2010)
New Revision: 101615
Added:
projects/snowdrop/branches/1_0/transaction/
projects/snowdrop/branches/1_0/transaction/pom.xml
projects/snowdrop/branches/1_0/transaction/src/
projects/snowdrop/branches/1_0/transaction/src/main/
projects/snowdrop/branches/1_0/transaction/src/main/java/
projects/snowdrop/branches/1_0/transaction/src/main/java/org/
projects/snowdrop/branches/1_0/transaction/src/main/java/org/jboss/
projects/snowdrop/branches/1_0/transaction/src/main/java/org/jboss/spring/
projects/snowdrop/branches/1_0/transaction/src/main/java/org/jboss/spring/transactions/
projects/snowdrop/branches/1_0/transaction/src/main/java/org/jboss/spring/transactions/ExistingTransactionAwareTransactionFactory.java
Modified:
projects/snowdrop/branches/1_0/build/pom.xml
projects/snowdrop/branches/1_0/cluster/pom.xml
projects/snowdrop/branches/1_0/deployer-assembly/pom.xml
projects/snowdrop/branches/1_0/deployer-assembly/src/assembly/deployer.xml
projects/snowdrop/branches/1_0/deployers/pom.xml
projects/snowdrop/branches/1_0/facade/pom.xml
projects/snowdrop/branches/1_0/pom.xml
projects/snowdrop/branches/1_0/vfs/pom.xml
projects/snowdrop/branches/1_0/weaving/pom.xml
Log:
Adding transaction module
Modified: projects/snowdrop/branches/1_0/build/pom.xml
===================================================================
--- projects/snowdrop/branches/1_0/build/pom.xml 2010-02-28 14:17:46 UTC (rev 101614)
+++ projects/snowdrop/branches/1_0/build/pom.xml 2010-02-28 17:03:56 UTC (rev 101615)
@@ -9,7 +9,7 @@
<artifactId>snowdrop</artifactId>
<packaging>pom</packaging>
<name>Snowdrop - Distribution</name>
- <url>http://www.jboss.com/products/jbossmc</url>
+ <url>http://www.jboss.org/snowdrop</url>
<description>Snowdrop Distribution</description>
<profiles>
Modified: projects/snowdrop/branches/1_0/cluster/pom.xml
===================================================================
--- projects/snowdrop/branches/1_0/cluster/pom.xml 2010-02-28 14:17:46 UTC (rev 101614)
+++ projects/snowdrop/branches/1_0/cluster/pom.xml 2010-02-28 17:03:56 UTC (rev 101615)
@@ -9,7 +9,7 @@
<artifactId>snowdrop-cluster</artifactId>
<packaging>jar</packaging>
<name>Snowdrop - Cluster</name>
- <url>http://www.jboss.org/jbossmc</url>
+ <url>http://www.jboss.org/snowdrop</url>
<description>Snowdrop - Cluster</description>
<dependencies>
@@ -17,6 +17,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.cache</groupId>
Modified: projects/snowdrop/branches/1_0/deployer-assembly/pom.xml
===================================================================
--- projects/snowdrop/branches/1_0/deployer-assembly/pom.xml 2010-02-28 14:17:46 UTC (rev 101614)
+++ projects/snowdrop/branches/1_0/deployer-assembly/pom.xml 2010-02-28 17:03:56 UTC (rev 101615)
@@ -64,6 +64,11 @@
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-weaving</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>${version.spring}</version>
+ </dependency>
</dependencies>
</project>
Modified: projects/snowdrop/branches/1_0/deployer-assembly/src/assembly/deployer.xml
===================================================================
--- projects/snowdrop/branches/1_0/deployer-assembly/src/assembly/deployer.xml 2010-02-28 14:17:46 UTC (rev 101614)
+++ projects/snowdrop/branches/1_0/deployer-assembly/src/assembly/deployer.xml 2010-02-28 17:03:56 UTC (rev 101615)
@@ -22,5 +22,13 @@
<exclude>*:commons-logging:*</exclude>
</excludes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <includes>
+ <include>org.springframework:spring</include>
+ </includes>
+ </dependencySet>
</dependencySets>
</assembly>
\ No newline at end of file
Modified: projects/snowdrop/branches/1_0/deployers/pom.xml
===================================================================
--- projects/snowdrop/branches/1_0/deployers/pom.xml 2010-02-28 14:17:46 UTC (rev 101614)
+++ projects/snowdrop/branches/1_0/deployers/pom.xml 2010-02-28 17:03:56 UTC (rev 101615)
@@ -9,20 +9,9 @@
<artifactId>snowdrop-deployers</artifactId>
<packaging>jar</packaging>
<name>Snowdrop - Deployers</name>
- <url>http://www.jboss.org/jbossmc</url>
+ <url>http://www.jboss.org/snowdrop</url>
<description>Snowdrop - Deployers</description>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>META-INF/spring-deployers-jboss-beans.xml</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
-
+
<dependencies>
<dependency>
<groupId>org.jboss.snowdrop</groupId>
@@ -82,14 +71,17 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
+ <optional>true</optional>
</dependency>
</dependencies>
Modified: projects/snowdrop/branches/1_0/facade/pom.xml
===================================================================
--- projects/snowdrop/branches/1_0/facade/pom.xml 2010-02-28 14:17:46 UTC (rev 101614)
+++ projects/snowdrop/branches/1_0/facade/pom.xml 2010-02-28 17:03:56 UTC (rev 101615)
@@ -9,7 +9,7 @@
<artifactId>snowdrop-facade</artifactId>
<packaging>jar</packaging>
<name>Snowdrop - Facade</name>
- <url>http://www.jboss.org/jbossmc</url>
+ <url>http://www.jboss.org/snowdrop</url>
<description>Snowdrop - Facade</description>
<dependencies>
@@ -29,14 +29,17 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <optional>true</optional>
</dependency>
</dependencies>
Modified: projects/snowdrop/branches/1_0/pom.xml
===================================================================
--- projects/snowdrop/branches/1_0/pom.xml 2010-02-28 14:17:46 UTC (rev 101614)
+++ projects/snowdrop/branches/1_0/pom.xml 2010-02-28 17:03:56 UTC (rev 101615)
@@ -23,10 +23,11 @@
<module>cluster</module>
<module>deployers</module>
<module>facade</module>
+ <module>utils</module>
<module>vfs</module>
<module>weaving</module>
<module>build</module>
- <module>deployer-assembly</module>
+ <module>deployer-assembly</module>
</modules>
<properties>
@@ -176,6 +177,12 @@
</dependency>
<dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-dependency</artifactId>
<version>${version.jboss.microcontainer}</version>
@@ -195,12 +202,6 @@
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>snowdrop</artifactId>
- <version>${version.jboss.microcontainer}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-guice-int</artifactId>
<version>${version.jboss.microcontainer}</version>
<scope>provided</scope>
@@ -376,6 +377,11 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>${version.spring}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${version.spring}</version>
</dependency>
Added: projects/snowdrop/branches/1_0/transaction/pom.xml
===================================================================
--- projects/snowdrop/branches/1_0/transaction/pom.xml (rev 0)
+++ projects/snowdrop/branches/1_0/transaction/pom.xml 2010-02-28 17:03:56 UTC (rev 101615)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>snowdrop-parent</artifactId>
+ <groupId>org.jboss.snowdrop</groupId>
+ <version>1.0.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>snowdrop-utils</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <name>Snowdrop - Transaction</name>
+ <description>Snowdrop - Transaction</description>
+ <url>http://www.jboss.org/snowdrop</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: projects/snowdrop/branches/1_0/transaction/src/main/java/org/jboss/spring/transactions/ExistingTransactionAwareTransactionFactory.java
===================================================================
--- projects/snowdrop/branches/1_0/transaction/src/main/java/org/jboss/spring/transactions/ExistingTransactionAwareTransactionFactory.java (rev 0)
+++ projects/snowdrop/branches/1_0/transaction/src/main/java/org/jboss/spring/transactions/ExistingTransactionAwareTransactionFactory.java 2010-02-28 17:03:56 UTC (rev 101615)
@@ -0,0 +1,52 @@
+package org.jboss.spring.transactions;
+
+import javax.transaction.NotSupportedException;
+import javax.transaction.Status;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+
+import org.springframework.transaction.jta.JtaTransactionManager;
+import org.springframework.transaction.jta.TransactionFactory;
+
+/**
+ * A {@link org.springframework.transaction.jta.TransactionFactory} implementation that
+ * will check for an existing JTA transaction before creating a new one.
+ *
+ * To be used in JCA/JMS scenarios, where Spring will try to create a transaction
+ * before processing the message (although JBoss creates one already).
+ *
+ * @author Marius Bogoevici
+ */
+public class ExistingTransactionAwareTransactionFactory implements TransactionFactory
+{
+
+ private JtaTransactionManager wrappedJtaTransactionManager;
+
+
+ public JtaTransactionManager getWrappedJtaTransactionManager()
+ {
+ return wrappedJtaTransactionManager;
+ }
+
+ public void setWrappedJtaTransactionManager(JtaTransactionManager wrappedJtaTransactionManager)
+ {
+ this.wrappedJtaTransactionManager = wrappedJtaTransactionManager;
+ }
+
+ public Transaction createTransaction(String name, int timeout)
+ throws NotSupportedException, SystemException
+ {
+ Transaction transaction = this.getWrappedJtaTransactionManager().getTransactionManager().getTransaction();
+
+ if (transaction != null && (transaction.getStatus() != Status.STATUS_NO_TRANSACTION))
+ {
+ return transaction;
+ }
+ else
+ {
+ return getWrappedJtaTransactionManager().createTransaction(name, timeout);
+ }
+ }
+
+
+}
\ No newline at end of file
Modified: projects/snowdrop/branches/1_0/vfs/pom.xml
===================================================================
--- projects/snowdrop/branches/1_0/vfs/pom.xml 2010-02-28 14:17:46 UTC (rev 101614)
+++ projects/snowdrop/branches/1_0/vfs/pom.xml 2010-02-28 17:03:56 UTC (rev 101615)
@@ -25,22 +25,27 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: projects/snowdrop/branches/1_0/weaving/pom.xml
===================================================================
--- projects/snowdrop/branches/1_0/weaving/pom.xml 2010-02-28 14:17:46 UTC (rev 101614)
+++ projects/snowdrop/branches/1_0/weaving/pom.xml 2010-02-28 17:03:56 UTC (rev 101615)
@@ -9,7 +9,7 @@
<artifactId>snowdrop-weaving</artifactId>
<packaging>jar</packaging>
<name>Snowdrop - Weaving</name>
- <url>http://www.jboss.org/jbossmc</url>
+ <url>http://www.jboss.org/snowdrop</url>
<description>Snowdrop - Weaving</description>
<dependencies>
@@ -29,10 +29,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
+ <optional>true</optional>
</dependency>
</dependencies>
</project>
More information about the jboss-cvs-commits
mailing list