geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akulshresh...@apache.org
Subject svn commit: r472756 - in /geronimo/server/trunk/modules/geronimo-connector-builder: ./ src/test/data/connector_1_0/ src/test/data/connector_1_5/ src/test/data/connector_1_5_localtx/ src/test/data/connector_1_5_notx/ src/test/data/data/ src/test/data/ea...
Date Thu, 09 Nov 2006 03:20:52 GMT
Author: akulshreshtha
Date: Wed Nov  8 19:20:51 2006
New Revision: 472756

URL: http://svn.apache.org/viewvc?view=rev&rev=472756
Log:
Removed old style configId from test plans. The Connector15DCBTest now passes in eclipse.

Modified:
    geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/connector_1_0/geronimo-ra.xml
    geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/connector_1_5/geronimo-ra.xml
    geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/connector_1_5_localtx/geronimo-ra.xml
    geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/connector_1_5_notx/geronimo-ra.xml
    geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/dup-admin-object-name.xml
    geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/dup-connectionfactoryinstance-name.xml
    geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/dup-resourceadapter-name.xml
    geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/external-application-plan.xml
    geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/old-schema-plan.xml
    geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/ear/geronimo-application.xml
    geronimo/server/trunk/modules/geronimo-connector-builder/src/test/resources/jms-plan.xml
    geronimo/server/trunk/modules/geronimo-connector-builder/src/test/resources/plan-with-nulls.xml

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml?view=diff&rev=472756&r1=472755&r2=472756
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml Wed Nov  8 19:20:51 2006
@@ -71,7 +71,7 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
                 <configuration>
-                    <sourceSchemas>geronimo-connector-1.2.xsd</sourceSchemas>
+                    <sourceSchemas>geronimo-connector-${geronimoSchemaVersion}.xsd</sourceSchemas>
                 </configuration>
             </plugin>
             

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/connector_1_0/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/connector_1_0/geronimo-ra.xml?view=diff&rev=472756&r1=472755&r2=472756
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/connector_1_0/geronimo-ra.xml
(original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/connector_1_0/geronimo-ra.xml
Wed Nov  8 19:20:51 2006
@@ -17,8 +17,8 @@
     limitations under the License.
 -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
-    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <moduleId>
             <groupId>geronimo</groupId>
             <artifactId>test-ear</artifactId>

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/connector_1_5/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/connector_1_5/geronimo-ra.xml?view=diff&rev=472756&r1=472755&r2=472756
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/connector_1_5/geronimo-ra.xml
(original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/connector_1_5/geronimo-ra.xml
Wed Nov  8 19:20:51 2006
@@ -17,8 +17,8 @@
     limitations under the License.
 -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
-    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <moduleId>
             <groupId>geronimo</groupId>
             <artifactId>test-ear</artifactId>

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/connector_1_5_localtx/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/connector_1_5_localtx/geronimo-ra.xml?view=diff&rev=472756&r1=472755&r2=472756
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/connector_1_5_localtx/geronimo-ra.xml
(original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/connector_1_5_localtx/geronimo-ra.xml
Wed Nov  8 19:20:51 2006
@@ -17,8 +17,8 @@
     limitations under the License.
 -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
-    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <moduleId>
             <groupId>geronimo</groupId>
             <artifactId>test-ear</artifactId>

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/connector_1_5_notx/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/connector_1_5_notx/geronimo-ra.xml?view=diff&rev=472756&r1=472755&r2=472756
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/connector_1_5_notx/geronimo-ra.xml
(original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/connector_1_5_notx/geronimo-ra.xml
Wed Nov  8 19:20:51 2006
@@ -17,8 +17,8 @@
     limitations under the License.
 -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
-    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <moduleId>
             <groupId>geronimo</groupId>
             <artifactId>test-ear</artifactId>

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/dup-admin-object-name.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/dup-admin-object-name.xml?view=diff&rev=472756&r1=472755&r2=472756
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/dup-admin-object-name.xml
(original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/dup-admin-object-name.xml
Wed Nov  8 19:20:51 2006
@@ -17,7 +17,7 @@
     limitations under the License.
 -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
 
     <resourceadapter>
         <resourceadapter-instance>

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/dup-connectionfactoryinstance-name.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/dup-connectionfactoryinstance-name.xml?view=diff&rev=472756&r1=472755&r2=472756
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/dup-connectionfactoryinstance-name.xml
(original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/dup-connectionfactoryinstance-name.xml
Wed Nov  8 19:20:51 2006
@@ -17,7 +17,7 @@
     limitations under the License.
 -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
 
     <resourceadapter>
         <resourceadapter-instance>

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/dup-resourceadapter-name.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/dup-resourceadapter-name.xml?view=diff&rev=472756&r1=472755&r2=472756
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/dup-resourceadapter-name.xml
(original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/dup-resourceadapter-name.xml
Wed Nov  8 19:20:51 2006
@@ -17,7 +17,7 @@
     limitations under the License.
 -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
 
     <resourceadapter>
         <resourceadapter-instance>

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/external-application-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/external-application-plan.xml?view=diff&rev=472756&r1=472755&r2=472756
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/external-application-plan.xml
(original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/external-application-plan.xml
Wed Nov  8 19:20:51 2006
@@ -17,9 +17,9 @@
     limitations under the License.
 -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
     <!--parentId="org/apache/geronimo/Server"-->
-    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <moduleId>
             <groupId>geronimo</groupId>
             <artifactId>test-ear</artifactId>
@@ -30,8 +30,8 @@
 
     <module>
         <connector>test-rar-10-noger.rar</connector>
-        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
-            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <moduleId>
                     <groupId>geronimo</groupId>
                     <artifactId>test-ear</artifactId>
@@ -96,8 +96,8 @@
     </module>
     <module>
         <connector>test-rar-15-noger.rar</connector>
-        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
-            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <moduleId>
                     <groupId>geronimo</groupId>
                     <artifactId>test-ear</artifactId>

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/old-schema-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/old-schema-plan.xml?view=diff&rev=472756&r1=472755&r2=472756
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/old-schema-plan.xml
(original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/data/old-schema-plan.xml
Wed Nov  8 19:20:51 2006
@@ -17,7 +17,7 @@
     limitations under the License.
 -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2"
     version="1.5">
     <!--configId="org/apache/geronimo/j2ee/deployment/test"
     parentId="org/apache/geronimo/Server"-->

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/ear/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/ear/geronimo-application.xml?view=diff&rev=472756&r1=472755&r2=472756
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/ear/geronimo-application.xml
(original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/test/data/ear/geronimo-application.xml
Wed Nov  8 19:20:51 2006
@@ -17,8 +17,8 @@
     limitations under the License.
 -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
-    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <moduleId>
             <groupId>geronimo</groupId>
             <artifactId>test-ear</artifactId>

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/test/resources/jms-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/test/resources/jms-plan.xml?view=diff&rev=472756&r1=472755&r2=472756
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/test/resources/jms-plan.xml
(original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/test/resources/jms-plan.xml
Wed Nov  8 19:20:51 2006
@@ -14,13 +14,22 @@
     See the License for the specific language governing permissions and
     limitations under the License.-->
 <!--$Rev$ $Date$-->
-<connector configId="TestJMSConfig" xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
-    <dep:import xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-        <dep:groupId>geronimo</dep:groupId>
-        <dep:artifactId>activemq-broker</dep:artifactId>
-        <dep:version>1.0</dep:version>
-        <dep:type>car</dep:type>
-    </dep:import>
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+        <moduleId>
+            <groupId>user</groupId>
+            <artifactId>TestJMSConfig</artifactId>
+            <version>1.0</version>
+            <type>car</type>
+        </moduleId>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>activemq-broker</artifactId>
+                <type>car</type>
+            </dependency>
+        </dependencies>
+    </environment>
     <resourceadapter>
         <resourceadapter-instance>
             <resourceadapter-name>Test ActiveMQ RA</resourceadapter-name>

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/test/resources/plan-with-nulls.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/test/resources/plan-with-nulls.xml?view=diff&rev=472756&r1=472755&r2=472756
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/test/resources/plan-with-nulls.xml
(original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/test/resources/plan-with-nulls.xml
Wed Nov  8 19:20:51 2006
@@ -1,8 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<connector configId="user/database-pool-TestPool/1/car" xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
-    <dep:dependency xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-        <dep:uri>org.apache.derby/derbyclient/10.1.1.0/jar</dep:uri>
-    </dep:dependency>
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+        <moduleId>
+            <groupId>user</groupId>
+            <artifactId>database-pool-TestPool</artifactId>
+            <version>1.0</version>
+            <type>car</type>
+        </moduleId>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derbyclient</artifactId>
+                <version>10.1.1.0</version>
+                <type>jar</type>
+            </dependency>
+        </dependencies>
+    </environment>
     <resourceadapter>
         <outbound-resourceadapter>
             <connection-definition>



Mime
View raw message