You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/10/14 21:26:02 UTC
svn commit: r584589 - in /incubator/servicemix/branches/servicemix-4.0: ./
transaction/ transaction/src/ transaction/src/main/
transaction/src/main/resources/ transaction/src/main/resources/META-INF/
transaction/src/main/resources/META-INF/spring/
Author: gnodet
Date: Sun Oct 14 12:26:01 2007
New Revision: 584589
URL: http://svn.apache.org/viewvc?rev=584589&view=rev
Log:
Add transaction module to expose a transaction manager is the OSGi registry
Added:
incubator/servicemix/branches/servicemix-4.0/transaction/ (with props)
incubator/servicemix/branches/servicemix-4.0/transaction/pom.xml
incubator/servicemix/branches/servicemix-4.0/transaction/src/
incubator/servicemix/branches/servicemix-4.0/transaction/src/main/
incubator/servicemix/branches/servicemix-4.0/transaction/src/main/resources/
incubator/servicemix/branches/servicemix-4.0/transaction/src/main/resources/META-INF/
incubator/servicemix/branches/servicemix-4.0/transaction/src/main/resources/META-INF/spring/
incubator/servicemix/branches/servicemix-4.0/transaction/src/main/resources/META-INF/spring/servicemix-tx.xml
Modified:
incubator/servicemix/branches/servicemix-4.0/pom.xml
Modified: incubator/servicemix/branches/servicemix-4.0/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/pom.xml?rev=584589&r1=584588&r2=584589&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/pom.xml Sun Oct 14 12:26:01 2007
@@ -36,6 +36,7 @@
<module>bundles</module>
<module>jbi</module>
<module>gshell</module>
+ <module>transaction</module>
<module>examples</module>
<module>itests</module>
<module>main</module>
Propchange: incubator/servicemix/branches/servicemix-4.0/transaction/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Oct 14 12:26:01 2007
@@ -0,0 +1,2 @@
+target
+runner
Added: incubator/servicemix/branches/servicemix-4.0/transaction/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/transaction/pom.xml?rev=584589&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/transaction/pom.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/transaction/pom.xml Sun Oct 14 12:26:01 2007
@@ -0,0 +1,156 @@
+<?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/maven-v4_0_0.xsd">
+
+<!--
+
+ 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.
+-->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix</artifactId>
+ <version>4.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>org.apache.servicemix.transaction</artifactId>
+ <packaging>bundle</packaging>
+ <version>4.0-SNAPSHOT</version>
+ <name>org.apache.servicemix.transaction</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jencks</groupId>
+ <artifactId>jencks</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.objectweb.howl</groupId>
+ <artifactId>howl</artifactId>
+ <version>1.0.1-1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${felix.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Import-Package></Import-Package>
+ <DynamicImport-Package>*</DynamicImport-Package>
+ <Private-Package>
+ org.apache.geronimo.transaction*,
+ org.apache.geronimo.connector*,
+ org.objectweb.howl*,
+ org.jencks*,
+ </Private-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <configuration>
+ <includeProjectDependencies>false</includeProjectDependencies>
+ <includePluginDependencies>true</includePluginDependencies>
+ <executableDependency>
+ <groupId>org.ops4j.pax.runner</groupId>
+ <artifactId>pax-runner</artifactId>
+ </executableDependency>
+ <mainClass>org.ops4j.pax.runner.Run</mainClass>
+ <arguments>
+ <argument>--vmOptions=-Dbundles.configuration.location=${basedir}/src/test/configs</argument>
+ <argument>--console</argument>
+ <argument>mvn:org.apache.felix/org.apache.felix.configadmin/0.9.0-SNAPSHOT</argument>
+ <argument>mvn:org.ops4j.pax.confman/pax-confman-propsloader/0.3.0-SNAPSHOT</argument>
+ <argument>mvn:org.ops4j.pax.logging/pax-logging-api/0.9.7-SNAPSHOT</argument>
+ <argument>mvn:org.ops4j.pax.logging/pax-logging-service/0.9.7-SNAPSHOT</argument>
+ <argument>mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</argument>
+ <argument>mvn:org.springframework.osgi/spring-osgi-extender/${spring.osgi.version}</argument>
+ <argument>mvn:org.springframework.osgi/spring-osgi-io/${spring.osgi.version}</argument>
+ <argument>mvn:org.springframework/spring-aop/${spring.version}</argument>
+ <argument>mvn:org.springframework/spring-beans/${spring.version}</argument>
+ <argument>mvn:org.springframework/spring-context/${spring.version}</argument>
+ <argument>mvn:org.springframework/spring-core/${spring.version}</argument>
+ <argument>mvn:org.springframework/spring-tx/${spring.version}</argument>
+ <argument>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0-${project.version}</argument>
+ <argument>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/2.1_3-${project.version}</argument>
+ <argument>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1-SNAPSHOT</argument>
+ <argument>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/2.0-SNAPSHOT</argument>
+ <argument>mvn:org.apache.servicemix/org.apache.servicemix.transaction/${project.version}</argument>
+ </arguments>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.ops4j.pax.runner</groupId>
+ <artifactId>pax-runner</artifactId>
+ <version>0.5.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+
+</project>
Added: incubator/servicemix/branches/servicemix-4.0/transaction/src/main/resources/META-INF/spring/servicemix-tx.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/transaction/src/main/resources/META-INF/spring/servicemix-tx.xml?rev=584589&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/transaction/src/main/resources/META-INF/spring/servicemix-tx.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/transaction/src/main/resources/META-INF/spring/servicemix-tx.xml Sun Oct 14 12:26:01 2007
@@ -0,0 +1,55 @@
+<?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.
+
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:osgi="http://www.springframework.org/schema/osgi"
+ xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util.xsd
+ http://www.springframework.org/schema/osgi
+ http://www.springframework.org/schema/osgi/spring-osgi-1.0-m3.xsd
+ http://www.springframework.org/schema/osgi-compendium
+ http://www.springframework.org/schema/osgi/spring-osgi-compendium.xsd">
+
+ <!-- Transaction Manager -->
+ <bean id="transactionManager" class="org.jencks.factory.TransactionManagerFactoryBean">
+ <property name="defaultTransactionTimeoutSeconds" value="${defaultTransactionTimeoutSeconds}" />
+ <property name="transactionLogDir" value="${transactionLogDir}" />
+ </bean>
+
+ <osgi:service ref="transactionManager">
+ <osgi:interfaces>
+ <value>javax.transaction.TransactionManager</value>
+ <value>org.springframework.transaction.PlatformTransactionManager</value>
+ </osgi:interfaces>
+ </osgi:service>
+
+ <osgix:property-placeholder persistent-id="org.apache.servicemix.transaction">
+ <osgix:default-properties>
+ <prop key="defaultTransactionTimeoutSeconds">600</prop>
+ <prop key="transactionLogDir">data/txlog/</prop>
+ </osgix:default-properties>
+ </osgix:property-placeholder>
+
+</beans>
\ No newline at end of file