Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 52285 invoked from network); 13 Apr 2006 06:48:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 13 Apr 2006 06:48:47 -0000 Received: (qmail 59741 invoked by uid 500); 13 Apr 2006 06:48:46 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 59713 invoked by uid 500); 13 Apr 2006 06:48:46 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 59699 invoked by uid 99); 13 Apr 2006 06:48:46 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Apr 2006 23:48:46 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 12 Apr 2006 23:48:45 -0700 Received: (qmail 52202 invoked by uid 65534); 13 Apr 2006 06:48:25 -0000 Message-ID: <20060413064825.52199.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r393736 - in /geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector: JCAResourceImplGBean.java ResourceAdapterImplGBean.java outbound/JCAConnectionFactoryImplGBean.java outbound/ManagedConnectionFactoryWrapper.java Date: Thu, 13 Apr 2006 06:48:23 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: djencks Date: Wed Apr 12 23:48:21 2006 New Revision: 393736 URL: http://svn.apache.org/viewcvs?rev=393736&view=rev Log: Fix the imports for the gbean classes to match the non-gbean classes for the jsr-77 interfaces Modified: geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/JCAResourceImplGBean.java geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterImplGBean.java geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImplGBean.java geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java Modified: geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/JCAResourceImplGBean.java URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/JCAResourceImplGBean.java?rev=393736&r1=393735&r2=393736&view=diff ============================================================================== --- geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/JCAResourceImplGBean.java (original) +++ geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/JCAResourceImplGBean.java Wed Apr 12 23:48:21 2006 @@ -23,7 +23,7 @@ import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; import org.apache.geronimo.management.geronimo.JCAResourceAdapter; import org.apache.geronimo.management.geronimo.JCAResource; -import org.apache.geronimo.management.JCAConnectionFactory; +import org.apache.geronimo.management.geronimo.JCAConnectionFactory; public class JCAResourceImplGBean { Modified: geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterImplGBean.java URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterImplGBean.java?rev=393736&r1=393735&r2=393736&view=diff ============================================================================== --- geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterImplGBean.java (original) +++ geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterImplGBean.java Wed Apr 12 23:48:21 2006 @@ -20,7 +20,7 @@ import org.apache.geronimo.gbean.GBeanInfo; import org.apache.geronimo.gbean.GBeanInfoBuilder; import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; -import org.apache.geronimo.management.ResourceAdapter; +import org.apache.geronimo.management.geronimo.ResourceAdapter; import org.apache.geronimo.management.geronimo.JCAResource; public class ResourceAdapterImplGBean { Modified: geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImplGBean.java URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImplGBean.java?rev=393736&r1=393735&r2=393736&view=diff ============================================================================== --- geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImplGBean.java (original) +++ geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImplGBean.java Wed Apr 12 23:48:21 2006 @@ -19,8 +19,7 @@ import org.apache.geronimo.gbean.GBeanInfo; import org.apache.geronimo.gbean.GBeanInfoBuilder; import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; -import org.apache.geronimo.management.J2EEServer; -import org.apache.geronimo.management.JCAConnectionFactory; +import org.apache.geronimo.management.geronimo.JCAConnectionFactory; import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory; /** Modified: geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java?rev=393736&r1=393735&r2=393736&view=diff ============================================================================== --- geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java (original) +++ geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java Wed Apr 12 23:48:21 2006 @@ -18,11 +18,10 @@ package org.apache.geronimo.connector.outbound; import java.lang.reflect.Constructor; -import java.util.Map; import java.util.HashMap; -import java.util.Properties; +import java.util.Map; + import javax.management.ObjectName; -import javax.management.MalformedObjectNameException; import javax.resource.ResourceException; import javax.resource.spi.ManagedConnectionFactory; import javax.resource.spi.ResourceAdapterAssociation; @@ -38,10 +37,9 @@ import org.apache.geronimo.gbean.DynamicGBeanDelegate; import org.apache.geronimo.gbean.GBeanLifecycle; import org.apache.geronimo.kernel.Kernel; +import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory; import org.apache.geronimo.transaction.manager.NamedXAResource; import org.apache.geronimo.transaction.manager.ResourceManager; -import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory; -import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; /** * @version $Rev$ $Date$