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 2004/11/02 04:27:41 UTC
svn commit: rev 56338 - in geronimo/trunk/modules: assembly assembly/src/plan connector connector-builder connector-builder/src connector-builder/src/java connector-builder/src/java/org connector-builder/src/java/org/apache connector-builder/src/java/org/apache/geronimo connector-builder/src/java/org/apache/geronimo/connector connector-builder/src/java/org/apache/geronimo/connector/deployment connector-builder/src/java/org/apache/geronimo/connector/deployment/dconfigbean connector-builder/src/schema connector-builder/src/test connector-builder/src/test-data connector-builder/src/test-data/connector_1_0 connector-builder/src/test-data/connector_1_5 connector-builder/src/test-data/data connector-builder/src/test-data/ear connector-builder/src/test/org connector-builder/src/test/org/apache connector-builder/src/test/org/apache/geronimo connector-builder/src/test/org/apache/geronimo/connector connector-builder/src/test/org/apache/geronimo/connector/deployment connector-builder/src/test/org/apache/geronimo/connector/mock connector/src/java/org/apache/geronimo/connector/deployment connector/src/schema connector/src/test-data connector/src/test/org/apache/geronimo/connector/deployment
Author: djencks
Date: Mon Nov 1 19:27:40 2004
New Revision: 56338
Added:
geronimo/trunk/modules/connector-builder/
geronimo/trunk/modules/connector-builder/locator.ent
- copied unchanged from rev 56167, geronimo/trunk/modules/connector/locator.ent
geronimo/trunk/modules/connector-builder/maven.xml
- copied unchanged from rev 56167, geronimo/trunk/modules/connector/maven.xml
geronimo/trunk/modules/connector-builder/project.properties
- copied unchanged from rev 56167, geronimo/trunk/modules/connector/project.properties
geronimo/trunk/modules/connector-builder/project.xml
- copied, changed from rev 56167, geronimo/trunk/modules/connector/project.xml
geronimo/trunk/modules/connector-builder/src/
geronimo/trunk/modules/connector-builder/src/java/
geronimo/trunk/modules/connector-builder/src/java/org/
geronimo/trunk/modules/connector-builder/src/java/org/apache/
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/
- copied from rev 56167, geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/RARConfiguration.java
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/RARConfiguration.java
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/RARConfigurer.java
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/RARConfigurer.java
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/RARGBeanAdapter.java
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/RARGBeanAdapter.java
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/dconfigbean/
- copied from rev 56336, geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean/
geronimo/trunk/modules/connector-builder/src/schema/
- copied from rev 56167, geronimo/trunk/modules/connector/src/schema/
geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector_1_5.xsd
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/schema/geronimo-connector_1_5.xsd
geronimo/trunk/modules/connector-builder/src/schema/xmlconfig.xml
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/schema/xmlconfig.xml
geronimo/trunk/modules/connector-builder/src/test/
geronimo/trunk/modules/connector-builder/src/test-data/
- copied from rev 56167, geronimo/trunk/modules/connector/src/test-data/
geronimo/trunk/modules/connector-builder/src/test-data/connector_1_0/
- copied from rev 56336, geronimo/trunk/modules/connector/src/test-data/connector_1_0/
geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5/
- copied from rev 56336, geronimo/trunk/modules/connector/src/test-data/connector_1_5/
geronimo/trunk/modules/connector-builder/src/test-data/data/
- copied from rev 56336, geronimo/trunk/modules/connector/src/test-data/data/
geronimo/trunk/modules/connector-builder/src/test-data/ear/
- copied from rev 56336, geronimo/trunk/modules/connector/src/test-data/ear/
geronimo/trunk/modules/connector-builder/src/test/org/
geronimo/trunk/modules/connector-builder/src/test/org/apache/
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/
- copied from rev 56167, geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/deployment/
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/MockRARDeployable.java
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/deployment/MockRARDeployable.java
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilderTest.java
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilderTest.java
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/RAR_1_0DConfigBeanTest.java
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/deployment/RAR_1_0DConfigBeanTest.java
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/RAR_1_5ConfigBuilderTest.java
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/deployment/RAR_1_5ConfigBuilderTest.java
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/RAR_1_5DConfigBeanTest.java
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/deployment/RAR_1_5DConfigBeanTest.java
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/mock/
- copied from rev 56167, geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/mock/
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/mock/ConnectionFactoryExtension.java
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/mock/ConnectionFactoryExtension.java
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/mock/MockActivationSpec.java
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/mock/MockActivationSpec.java
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/mock/MockAdminObject.java
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/mock/MockAdminObject.java
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/mock/MockAdminObjectImpl.java
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/mock/MockAdminObjectImpl.java
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/mock/MockCCILocalTransaction.java
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/mock/MockCCILocalTransaction.java
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/mock/MockConnection.java
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/mock/MockConnection.java
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/mock/MockConnectionFactory.java
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/mock/MockConnectionFactory.java
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/mock/MockConnectionRequestInfo.java
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/mock/MockConnectionRequestInfo.java
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/mock/MockManagedConnection.java
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/mock/MockManagedConnection.java
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/mock/MockManagedConnectionFactory.java
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/mock/MockManagedConnectionFactory.java
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/mock/MockResourceAdapter.java
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/mock/MockResourceAdapter.java
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/mock/MockSPILocalTransaction.java
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/mock/MockSPILocalTransaction.java
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/mock/MockXAResource.java
- copied unchanged from rev 56336, geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/mock/MockXAResource.java
Removed:
geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/
geronimo/trunk/modules/connector/src/schema/
geronimo/trunk/modules/connector/src/test-data/
geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/deployment/
Modified:
geronimo/trunk/modules/assembly/project.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
geronimo/trunk/modules/connector/maven.xml
geronimo/trunk/modules/connector/project.xml
Log:
GERONIMO-404. Split connector module into connector and connector-builder.
Modified: geronimo/trunk/modules/assembly/project.xml
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Mon Nov 1 19:27:40 2004
@@ -115,6 +115,15 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-connector-builder</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-core</artifactId>
<version>${pom.currentVersion}</version>
<properties>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Mon Nov 1 19:27:40 2004
@@ -34,6 +34,9 @@
<uri>geronimo/jars/geronimo-connector-${geronimo_version}.jar</uri>
</dependency>
<dependency>
+ <uri>geronimo/jars/geronimo-connector-builder-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
<uri>geronimo/jars/geronimo-core-${geronimo_version}.jar</uri>
</dependency>
<!-- needed to load some connector and core classes-->
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml Mon Nov 1 19:27:40 2004
@@ -43,6 +43,9 @@
<uri>geronimo/jars/geronimo-connector-${geronimo_version}.jar</uri>
</dependency>
<dependency>
+ <uri>geronimo/jars/geronimo-connector-builder-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
<uri>concurrent/jars/concurrent-${concurrent_version}.jar</uri>
</dependency>
<dependency>
Copied: geronimo/trunk/modules/connector-builder/project.xml (from rev 56167, geronimo/trunk/modules/connector/project.xml)
==============================================================================
--- geronimo/trunk/modules/connector/project.xml (original)
+++ geronimo/trunk/modules/connector-builder/project.xml Mon Nov 1 19:27:40 2004
@@ -32,10 +32,10 @@
<!-- Module Identification -->
<!-- ===================== -->
- <name>Geronimo :: Connector</name>
- <id>geronimo-connector</id>
- <shortDescription>Geronimo Connector</shortDescription>
- <description>Geronimo Connector</description>
+ <name>Geronimo :: Connector :: Builder</name>
+ <id>geronimo-connector-builder</id>
+ <shortDescription>Geronimo Connector Builder</shortDescription>
+ <description>Geronimo Connector Builder</description>
<url>http://geronimo.apache.org/modules/connector/</url>
<siteDirectory>/www/geronimo.apache.org/modules/connector</siteDirectory>
<distributionDirectory>/www/incubator.apache.org/projects/geronimo/builds/connector</distributionDirectory>
@@ -79,7 +79,14 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-deployment</artifactId>
<version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ <version>${pom.currentVersion}</version>
</dependency>
+
<dependency>
<groupId>geronimo</groupId>
@@ -99,22 +106,18 @@
<version>${pom.currentVersion}</version>
</dependency>
+ <!-- test only-->
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
+ <!-- test only-->
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-transaction</artifactId>
<version>${pom.currentVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-jacc</artifactId>
- <version>&geronimo-spec-j2ee-jacc-version;</version>
</dependency>
<dependency>
Modified: geronimo/trunk/modules/connector/maven.xml
==============================================================================
--- geronimo/trunk/modules/connector/maven.xml (original)
+++ geronimo/trunk/modules/connector/maven.xml Mon Nov 1 19:27:40 2004
@@ -22,17 +22,7 @@
<project default="default"
xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
- xmlns:maven="jelly:maven"
- xmlns:xmlbeans="geronimo:xmlbeans">
-
- <preGoal name="java:compile">
- <xmlbeans:schema2java
- sourcedir="${basedir}/src"
- sourceschema="schema/geronimo-connector_1_5.xsd"
- xmlconfigs="${basedir}/src/schema/xmlconfig.xml"
- targetdir="${basedir}/target/xmlbeans"
- cataloglocation="${basedir}/../j2ee-schema/src/catalog/resolver-catalog.xml"/>
- </preGoal>
+ xmlns:maven="jelly:maven">
<preGoal name="test:compile">
<!-- Build test-rar-10 -->
Modified: geronimo/trunk/modules/connector/project.xml
==============================================================================
--- geronimo/trunk/modules/connector/project.xml (original)
+++ geronimo/trunk/modules/connector/project.xml Mon Nov 1 19:27:40 2004
@@ -47,34 +47,13 @@
<!-- ============ -->
<dependencies>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-xmlbeans-plugin</artifactId>
- <version>${pom.currentVersion}</version>
- <type>plugin</type>
- </dependency>
-
- <!-- needed for xmlbeans runtime-->
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean-apache</artifactId>
- <version>&xmlbeans-version;</version>
- </dependency>
-
- <!-- real stuff -->
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
-
- <dependency>
+ <dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-naming</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
-
+<!-- Needed only for DeploymentException in a test, from NameFactory which probably shouldn't be throwing it in the first place-->
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-deployment</artifactId>
@@ -101,16 +80,11 @@
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-system</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-transaction</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
+ <!-- test only -->
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-jacc</artifactId>
@@ -118,15 +92,6 @@
</dependency>
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-j2ee-schema</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <xmlbeans>true</xmlbeans>
- </properties>
- </dependency>
-
- <dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-connector</artifactId>
<version>&geronimo-spec-j2ee-connector-version;</version>
@@ -134,12 +99,6 @@
<dependency>
<groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-deployment</artifactId>
- <version>&geronimo-spec-j2ee-deployment-version;</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jta</artifactId>
<version>&geronimo-spec-jta-version;</version>
</dependency>
@@ -170,6 +129,7 @@
<version>&mx4j-version;</version>
</dependency>
+<!-- test only -->
<dependency>
<groupId>tranql</groupId>
<artifactId>tranql</artifactId>