You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by gn...@apache.org on 2010/02/19 23:46:50 UTC
svn commit: r912021 - in /incubator/aries/trunk/transaction: ./ src/
transaction-blueprint/ transaction-blueprint/src/
transaction-blueprint/src/main/ transaction-blueprint/src/main/java/
transaction-blueprint/src/main/java/org/ transaction-blueprint/s...
Author: gnodet
Date: Fri Feb 19 22:46:48 2010
New Revision: 912021
URL: http://svn.apache.org/viewvc?rev=912021&view=rev
Log:
ARIES-152: split the transaction manager from the declarative transaction support
Added:
incubator/aries/trunk/transaction/pom.xml
incubator/aries/trunk/transaction/transaction-blueprint/
incubator/aries/trunk/transaction/transaction-blueprint/pom.xml
- copied, changed from r912004, incubator/aries/trunk/transaction/pom.xml
incubator/aries/trunk/transaction/transaction-blueprint/src/
incubator/aries/trunk/transaction/transaction-blueprint/src/main/
incubator/aries/trunk/transaction/transaction-blueprint/src/main/java/
incubator/aries/trunk/transaction/transaction-blueprint/src/main/java/org/
incubator/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/
incubator/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/
incubator/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/
incubator/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TransactionStrategy.java
- copied unchanged from r912004, incubator/aries/trunk/transaction/src/main/java/org/apache/aries/transaction/TransactionStrategy.java
incubator/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxComponentMetaDataHelper.java
- copied unchanged from r912004, incubator/aries/trunk/transaction/src/main/java/org/apache/aries/transaction/TxComponentMetaDataHelper.java
incubator/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxComponentMetaDataHelperImpl.java
- copied unchanged from r912004, incubator/aries/trunk/transaction/src/main/java/org/apache/aries/transaction/TxComponentMetaDataHelperImpl.java
incubator/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java
- copied unchanged from r912004, incubator/aries/trunk/transaction/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java
incubator/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/exception/
incubator/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/exception/TransactionRollbackException.java
- copied unchanged from r912004, incubator/aries/trunk/transaction/src/main/java/org/apache/aries/transaction/exception/TransactionRollbackException.java
incubator/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/
incubator/aries/trunk/transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxElementHandler.java
- copied unchanged from r912004, incubator/aries/trunk/transaction/src/main/java/org/apache/aries/transaction/parsing/TxElementHandler.java
incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/
incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/OSGI-INF/
- copied from r912004, incubator/aries/trunk/transaction/src/main/resources/OSGI-INF/
incubator/aries/trunk/transaction/transaction-blueprint/src/main/resources/org/
- copied from r912004, incubator/aries/trunk/transaction/src/main/resources/org/
incubator/aries/trunk/transaction/transaction-blueprint/src/test/
- copied from r912004, incubator/aries/trunk/transaction/src/test/
incubator/aries/trunk/transaction/transaction-manager/
incubator/aries/trunk/transaction/transaction-manager/pom.xml
- copied, changed from r912004, incubator/aries/trunk/transaction/pom.xml
incubator/aries/trunk/transaction/transaction-manager/src/
- copied from r912004, incubator/aries/trunk/transaction/src/
Removed:
incubator/aries/trunk/transaction/src/
incubator/aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/TransactionStrategy.java
incubator/aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/TxComponentMetaDataHelper.java
incubator/aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/TxComponentMetaDataHelperImpl.java
incubator/aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java
incubator/aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/exception/TransactionRollbackException.java
incubator/aries/trunk/transaction/transaction-manager/src/main/java/org/apache/aries/transaction/parsing/TxElementHandler.java
incubator/aries/trunk/transaction/transaction-manager/src/main/resources/OSGI-INF/
incubator/aries/trunk/transaction/transaction-manager/src/main/resources/org/
incubator/aries/trunk/transaction/transaction-manager/src/test/
Added: incubator/aries/trunk/transaction/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/pom.xml?rev=912021&view=auto
==============================================================================
--- incubator/aries/trunk/transaction/pom.xml (added)
+++ incubator/aries/trunk/transaction/pom.xml Fri Feb 19 22:46:48 2010
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<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.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>1.0.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.aries.transaction</groupId>
+ <artifactId>transaction</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Aries Transaction</name>
+
+ <modules>
+ <module>transaction-manager</module>
+ <module>transaction-blueprint</module>
+ </modules>
+
+</project>
Copied: incubator/aries/trunk/transaction/transaction-blueprint/pom.xml (from r912004, incubator/aries/trunk/transaction/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/pom.xml?p2=incubator/aries/trunk/transaction/transaction-blueprint/pom.xml&p1=incubator/aries/trunk/transaction/pom.xml&r1=912004&r2=912021&rev=912021&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/pom.xml (original)
+++ incubator/aries/trunk/transaction/transaction-blueprint/pom.xml Fri Feb 19 22:46:48 2010
@@ -20,16 +20,16 @@
<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.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
+ <groupId>org.apache.aries.transaction</groupId>
+ <artifactId>transaction</artifactId>
<version>1.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries.transaction</groupId>
- <artifactId>org.apache.aries.transaction</artifactId>
+ <artifactId>org.apache.aries.transaction.blueprint</artifactId>
<packaging>bundle</packaging>
- <name>Apache Aries Transaction</name>
+ <name>Apache Aries Transaction Blueprint</name>
<properties>
<geronimo-transaction-version>2.1.3</geronimo-transaction-version>
@@ -48,22 +48,11 @@
<version>4.2.0</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>2.1.2</version>
- </dependency>
- <dependency>
- <groupId>org.objectweb.howl</groupId>
- <artifactId>howl</artifactId>
- <version>1.0.1-1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>2.5.6</version>
- <optional>true</optional>
- </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1.1</version>
+ </dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
@@ -96,25 +85,7 @@
</dependencies>
<build>
- <resources>
- <resource>
- <targetPath>OSGI-INF/blueprint</targetPath>
- <filtering>false</filtering>
- <directory>${basedir}/src/main/resources/OSGI-INF/blueprint</directory>
- <includes>
- <include>*.xml</include>
- </includes>
- </resource>
- <resource>
- <targetPath>org/apache/aries/transaction/parsing</targetPath>
- <filtering>false</filtering>
- <directory>${basedir}/src/main/resources/org/apache/aries/transaction/parsing</directory>
- <includes>
- <include>*.xsd</include>
- </includes>
- </resource>
- </resources>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -123,149 +94,22 @@
<configuration>
<instructions>
<Import-Package>
- org.springframework.*;resolution:=optional,
- !org.apache.geronimo.transaction*,
- javax.resource.spi;version="1.5";resolution:=optional,
org.osgi.framework;version="1.5",
org.osgi.service.cm;version="[1.2.0,2.0.0)",
*
</Import-Package>
<Export-Package>
- org.apache.geronimo.transaction*;version="${geronimo-transaction-version}",
- javax.transaction*;version="1.1",
org.apache.aries.transaction.exception
</Export-Package>
<Private-Package>
- org.objectweb.howl.log*,
org.apache.aries.transaction,
org.apache.aries.transaction.parsing
</Private-Package>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Activator>org.apache.aries.transaction.Activator</Bundle-Activator>
- <Export-Service>javax.transaction.TransactionManager,javax.transaction.TransactionSynchronizationRegistry,javax.transaction.UserTransaction,org.apache.geronimo.transaction.manager.RecoverableTransactionManager</Export-Service>
- <Include-Resource>
- {maven-resources},
- javax/resource/spi/XATerminator.class=target/classes/javax/resource/spi/XATerminator.class
- </Include-Resource>
+ <Export-Service></Export-Service>
</instructions>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <classifier>sources</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>org.objectweb.howl</groupId>
- <artifactId>howl</artifactId>
- <classifier>sources</classifier>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/sources</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <configuration>
- <tasks>
- <copy todir="${project.build.directory}/sources">
- <fileset dir="${basedir}/src/main/java" />
- </copy>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!--<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>package1</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <minmemory>128m</minmemory>
- <maxmemory>512m</maxmemory>
- <sourcepath>${project.build.directory}/sources</sourcepath>
- </configuration>
- </execution>
- </executions>
- </plugin> -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <includes>
- <include>org.apache.geronimo.components:geronimo-transaction</include>
- <include>org.objectweb.howl:howl</include>
- <include>${project.groupId}:${project.artifactId}</include>
- </includes>
- </artifactSet>
- <filters>
- <filter>
- <artifact>org.apache.geronimo.components:geronimo-transaction</artifact>
- <excludes>
- <exclude>org/**</exclude>
- </excludes>
- </filter>
- <filter>
- <artifact>org.objectweb.howl:howl</artifact>
- <excludes>
- <exclude>org/**</exclude>
- </excludes>
- </filter>
- </filters>
- <createSourcesJar>true</createSourcesJar>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <createDependencyReducedPom>true</createDependencyReducedPom>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
Copied: incubator/aries/trunk/transaction/transaction-manager/pom.xml (from r912004, incubator/aries/trunk/transaction/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-manager/pom.xml?p2=incubator/aries/trunk/transaction/transaction-manager/pom.xml&p1=incubator/aries/trunk/transaction/pom.xml&r1=912004&r2=912021&rev=912021&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/pom.xml (original)
+++ incubator/aries/trunk/transaction/transaction-manager/pom.xml Fri Feb 19 22:46:48 2010
@@ -20,16 +20,16 @@
<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.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
+ <groupId>org.apache.aries.transaction</groupId>
+ <artifactId>transaction</artifactId>
<version>1.0.0-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries.transaction</groupId>
- <artifactId>org.apache.aries.transaction</artifactId>
+ <artifactId>org.apache.aries.transaction.manager</artifactId>
<packaging>bundle</packaging>
- <name>Apache Aries Transaction</name>
+ <name>Apache Aries Transaction Manager</name>
<properties>
<geronimo-transaction-version>2.1.3</geronimo-transaction-version>
@@ -64,35 +64,6 @@
<version>2.5.6</version>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint</artifactId>
- <version>${version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.testsupport</groupId>
- <artifactId>org.apache.aries.testsupport.unit</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.6</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.6</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -126,19 +97,17 @@
org.springframework.*;resolution:=optional,
!org.apache.geronimo.transaction*,
javax.resource.spi;version="1.5";resolution:=optional,
- org.osgi.framework;version="1.5",
+ org.osgi.framework;version="1.4",
org.osgi.service.cm;version="[1.2.0,2.0.0)",
*
</Import-Package>
<Export-Package>
org.apache.geronimo.transaction*;version="${geronimo-transaction-version}",
- javax.transaction*;version="1.1",
- org.apache.aries.transaction.exception
+ javax.transaction*;version="1.1"
</Export-Package>
<Private-Package>
org.objectweb.howl.log*,
- org.apache.aries.transaction,
- org.apache.aries.transaction.parsing
+ org.apache.aries.transaction
</Private-Package>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.apache.aries.transaction.Activator</Bundle-Activator>