You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2011/02/22 09:31:55 UTC
svn commit: r1073250 - in /geronimo/sandbox/djencks/txmanager: ./
connector-itests/ connector-itests/src/ connector-itests/src/test/
connector-itests/src/test/java/ connector-itests/src/test/java/org/
connector-itests/src/test/java/org/apache/ connecto...
Author: djencks
Date: Tue Feb 22 08:31:53 2011
New Revision: 1073250
URL: http://svn.apache.org/viewvc?rev=1073250&view=rev
Log:
move mock connector to its own bundle, start setting up an itest
Added:
geronimo/sandbox/djencks/txmanager/connector-itests/
geronimo/sandbox/djencks/txmanager/connector-itests/pom.xml (with props)
geronimo/sandbox/djencks/txmanager/connector-itests/src/
geronimo/sandbox/djencks/txmanager/connector-itests/src/test/
geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/
geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/
geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/apache/
geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/apache/geronimo/
geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/apache/geronimo/components/
geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/apache/geronimo/components/connector/
geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/
geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/ConnectorTest.java (with props)
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/pom.xml (with props)
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/ConnectionExtension.java
- copied unchanged from r1071447, geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/mock/ConnectionExtension.java
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/ConnectionFactoryExtension.java (props changed)
- copied unchanged from r1071447, geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/mock/ConnectionFactoryExtension.java
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockActivationSpec.java (props changed)
- copied unchanged from r1071447, geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/mock/MockActivationSpec.java
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockAdminObject.java (props changed)
- copied unchanged from r1071447, geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/mock/MockAdminObject.java
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockAdminObjectImpl.java (props changed)
- copied unchanged from r1071447, geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/mock/MockAdminObjectImpl.java
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockCCILocalTransaction.java (props changed)
- copied unchanged from r1071447, geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/mock/MockCCILocalTransaction.java
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockConnection.java (props changed)
- copied unchanged from r1071447, geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/mock/MockConnection.java
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockConnectionFactory.java (props changed)
- copied unchanged from r1071447, geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/mock/MockConnectionFactory.java
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockConnectionRequestInfo.java (props changed)
- copied unchanged from r1071447, geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/mock/MockConnectionRequestInfo.java
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockManagedConnection.java (props changed)
- copied unchanged from r1071447, geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/mock/MockManagedConnection.java
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockManagedConnectionFactory.java (props changed)
- copied unchanged from r1071447, geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/mock/MockManagedConnectionFactory.java
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockResourceAdapter.java (props changed)
- copied unchanged from r1071447, geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/mock/MockResourceAdapter.java
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockSPILocalTransaction.java (props changed)
- copied unchanged from r1071447, geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/mock/MockSPILocalTransaction.java
geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockXAResource.java (props changed)
- copied unchanged from r1071447, geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/mock/MockXAResource.java
Removed:
geronimo/sandbox/djencks/txmanager/geronimo-connector/src/test/java/org/apache/geronimo/connector/mock/
Modified:
geronimo/sandbox/djencks/txmanager/geronimo-connector/pom.xml
geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml
geronimo/sandbox/djencks/txmanager/pom.xml
Added: geronimo/sandbox/djencks/txmanager/connector-itests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/connector-itests/pom.xml?rev=1073250&view=auto
==============================================================================
--- geronimo/sandbox/djencks/txmanager/connector-itests/pom.xml (added)
+++ geronimo/sandbox/djencks/txmanager/connector-itests/pom.xml Tue Feb 22 08:31:53 2011
@@ -0,0 +1,142 @@
+<?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.
+--><!-- $Rev$ $Date$ -->
+
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>geronimo-txmanager-parent</artifactId>
+ <groupId>org.apache.geronimo.components</groupId>
+ <version>3.1.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>connector-itests</artifactId>
+ <name>connector-itests</name>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-validation_1.0_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+
+
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-default</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit-extender-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-service</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-mvn</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-mock-ra</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>maven-paxexam-plugin</artifactId>
+ <version>1.2.3</version>
+ <executions>
+ <execution>
+ <id>generate-config</id>
+ <goals>
+ <goal>generate-depends-file</goal>
+ </goals>
+ <configuration>
+ <outputFile>${project.build.directory}/test-classes/META-INF/maven/dependencies.properties</outputFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>
Propchange: geronimo/sandbox/djencks/txmanager/connector-itests/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/txmanager/connector-itests/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/djencks/txmanager/connector-itests/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/ConnectorTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/ConnectorTest.java?rev=1073250&view=auto
==============================================================================
--- geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/ConnectorTest.java (added)
+++ geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/ConnectorTest.java Tue Feb 22 08:31:53 2011
@@ -0,0 +1,70 @@
+package org.apache.geronimo.components.connector.itests;
+
+import javax.resource.spi.BootstrapContext;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker;
+import org.apache.geronimo.transaction.manager.RecoverableTransactionManager;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.CoreOptions;
+import org.ops4j.pax.exam.Inject;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
+import org.osgi.framework.BundleContext;
+
+import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+
+@RunWith(JUnit4TestRunner.class)
+public class ConnectorTest {
+
+ @Inject
+ private BundleContext bundleContext;
+
+ @org.ops4j.pax.exam.junit.Configuration
+ public static Option[] configuration() {
+ Option[] options = options(
+// mavenBundle("org.osgi", "org.osgi.compendium"),
+ // Log
+ mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
+ mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
+ // Felix Config Admin
+ mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
+
+ mavenBundle("org.apache.felix", "org.apache.felix.scr"),
+ // Felix mvn url handler
+ mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
+
+
+ // this is how you set the default log level when using pax logging (logProfile)
+ systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
+
+ // Bundles
+ mavenBundle("org.apache.geronimo.components", "geronimo-transaction"),
+ mavenBundle("org.apache.geronimo.components", "geronimo-connector"),
+ mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
+ mavenBundle("org.apache.geronimo.specs", "geronimo-j2ee-connector_1.6_spec"),
+ mavenBundle("org.apache.geronimo.specs", "geronimo-validation_1.0_spec"),
+
+ //org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
+
+ equinox().version("3.5.0")
+ );
+// options = updateOptions(options);
+ return options;
+ }
+
+ public static MavenArtifactProvisionOption mavenBundle(String groupId, String artifactId) {
+ return CoreOptions.mavenBundle().groupId(groupId).artifactId(artifactId).versionAsInProject();
+ }
+
+
+ @Test
+ public void testServicesStart() throws Exception {
+ Assert.assertNotNull(bundleContext.getServiceReference(RecoverableTransactionManager.class.getName()));
+ Assert.assertNotNull(bundleContext.getServiceReference(BootstrapContext.class.getName()));
+ Assert.assertNotNull(bundleContext.getServiceReference(ConnectionTracker.class.getName()));
+ }
+}
Propchange: geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/ConnectorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/ConnectorTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/ConnectorTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector/pom.xml?rev=1073250&r1=1073249&r2=1073250&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector/pom.xml Tue Feb 22 08:31:53 2011
@@ -83,37 +83,41 @@
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-mock-ra</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-test-sources</phase>
- </execution>
- </executions>
- </plugin>
+ <!--<plugin>-->
+ <!--<groupId>org.apache.maven.plugins</groupId>-->
+ <!--<artifactId>maven-remote-resources-plugin</artifactId>-->
+ <!--<executions>-->
+ <!--<execution>-->
+ <!--<phase>generate-test-sources</phase>-->
+ <!--</execution>-->
+ <!--</executions>-->
+ <!--</plugin>-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <!-- Build *test.jar files for modules -->
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <!--<plugin>-->
+ <!--<groupId>org.apache.maven.plugins</groupId>-->
+ <!--<artifactId>maven-jar-plugin</artifactId>-->
+ <!--<executions>-->
+ <!--<execution>-->
+ <!--<goals>-->
+ <!--<!– Build *test.jar files for modules –>-->
+ <!--<goal>test-jar</goal>-->
+ <!--</goals>-->
+ <!--</execution>-->
+ <!--</executions>-->
+ <!--</plugin>-->
<plugin>
<groupId>org.apache.felix</groupId>
Added: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/pom.xml?rev=1073250&view=auto
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/pom.xml (added)
+++ geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/pom.xml Tue Feb 22 08:31:53 2011
@@ -0,0 +1,53 @@
+<?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.
+--><!-- $Rev$ $Date$ -->
+
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>geronimo-txmanager-parent</artifactId>
+ <groupId>org.apache.geronimo.components</groupId>
+ <version>3.1.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>geronimo-mock-ra</artifactId>
+ <name>geronimo-mock-ra</name>
+ <packaging>bundle</packaging>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.geronimo.connector*;version=3.0</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/ConnectionFactoryExtension.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/ConnectionFactoryExtension.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/ConnectionFactoryExtension.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockActivationSpec.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockActivationSpec.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockActivationSpec.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockAdminObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockAdminObject.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockAdminObject.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockAdminObjectImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockAdminObjectImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockAdminObjectImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockCCILocalTransaction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockCCILocalTransaction.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockCCILocalTransaction.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockConnection.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockConnection.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockConnection.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockConnectionFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockConnectionFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockConnectionFactory.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockConnectionRequestInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockConnectionRequestInfo.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockConnectionRequestInfo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockManagedConnection.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockManagedConnection.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockManagedConnection.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockManagedConnectionFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockManagedConnectionFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockManagedConnectionFactory.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockResourceAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockResourceAdapter.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockResourceAdapter.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockSPILocalTransaction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockSPILocalTransaction.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockSPILocalTransaction.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockXAResource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockXAResource.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/djencks/txmanager/geronimo-mock-ra/src/main/java/org/apache/geronimo/connector/mock/MockXAResource.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml?rev=1073250&r1=1073249&r2=1073250&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml Tue Feb 22 08:31:53 2011
@@ -38,7 +38,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
- <version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: geronimo/sandbox/djencks/txmanager/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/pom.xml?rev=1073250&r1=1073249&r2=1073250&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/pom.xml Tue Feb 22 08:31:53 2011
@@ -14,8 +14,7 @@
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.
---><!-- $Rev$ $Date$ -->
-<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">
+--><!-- $Rev$ $Date$ --><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">
<modelVersion>4.0.0</modelVersion>
@@ -60,6 +59,11 @@
<artifactId>geronimo-connector</artifactId>
<version>3.1.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-mock-ra</artifactId>
+ <version>3.1.1-SNAPSHOT</version>
+ </dependency>
<!-- external -->
<dependency>
@@ -104,9 +108,93 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.8.2</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam</artifactId>
+ <version>1.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-default</artifactId>
+ <version>1.2.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit</artifactId>
+ <version>1.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit-extender-impl</artifactId>
+ <version>1.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-service</artifactId>
+ <version>1.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.runner</groupId>
+ <artifactId>pax-runner-no-jcl</artifactId>
+ <version>1.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.swissbox</groupId>
+ <artifactId>pax-swissbox-tinybundles</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-mvn</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.2.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -123,6 +211,11 @@
<artifactId>org.osgi.compendium</artifactId>
<version>4.2.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr</artifactId>
+ <version>1.6.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -174,6 +267,8 @@
<module>geronimo-txmanager-server</module>
<module>org.apache.geronimo.transaction</module>
<module>org.apache.geronimo.transaction.kar</module>
- </modules>
+ <module>connector-itests</module>
+ <module>geronimo-mock-ra</module>
+ </modules>
</project>
\ No newline at end of file