Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 68402 invoked from network); 3 Jan 2008 02:45:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Jan 2008 02:45:18 -0000 Received: (qmail 25315 invoked by uid 500); 3 Jan 2008 02:45:06 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 25276 invoked by uid 500); 3 Jan 2008 02:45:06 -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 25265 invoked by uid 99); 3 Jan 2008 02:45:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 18:45:06 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jan 2008 02:44:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F384D1A9832; Wed, 2 Jan 2008 18:44:56 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r608311 - in /geronimo/server/trunk: framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/reference/ plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ plugins/connecto... Date: Thu, 03 Jan 2008 02:44:56 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080103024456.F384D1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Wed Jan 2 18:44:54 2008 New Revision: 608311 URL: http://svn.apache.org/viewvc?rev=608311&view=rev Log: moved generic ResourceReference.java and ResourceReferenceFactory.java to geronimo-naming module from geronimo-connector module Added: geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/reference/ResourceReference.java - copied, changed from r608296, geronimo/server/trunk/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/naming/ResourceReference.java geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/reference/ResourceReferenceFactory.java - copied, changed from r608296, geronimo/server/trunk/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/naming/ResourceReferenceFactory.java Removed: geronimo/server/trunk/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/naming/ResourceReference.java geronimo/server/trunk/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/naming/ResourceReferenceFactory.java Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java Copied: geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/reference/ResourceReference.java (from r608296, geronimo/server/trunk/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/naming/ResourceReference.java) URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/reference/ResourceReference.java?p2=geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/reference/ResourceReference.java&p1=geronimo/server/trunk/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/naming/ResourceReference.java&r1=608296&r2=608311&rev=608311&view=diff ============================================================================== --- geronimo/server/trunk/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/naming/ResourceReference.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/reference/ResourceReference.java Wed Jan 2 18:44:54 2008 @@ -18,7 +18,7 @@ */ -package org.apache.geronimo.connector.naming; +package org.apache.geronimo.naming.reference; import javax.naming.NamingException; @@ -26,7 +26,7 @@ import org.apache.xbean.naming.reference.SimpleReference; /** - * @version $Rev:$ $Date:$ + * @version $Rev$ $Date$ */ public class ResourceReference extends SimpleReference { private final ResourceSource source; Copied: geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/reference/ResourceReferenceFactory.java (from r608296, geronimo/server/trunk/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/naming/ResourceReferenceFactory.java) URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/reference/ResourceReferenceFactory.java?p2=geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/reference/ResourceReferenceFactory.java&p1=geronimo/server/trunk/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/naming/ResourceReferenceFactory.java&r1=608296&r2=608311&rev=608311&view=diff ============================================================================== --- geronimo/server/trunk/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/naming/ResourceReferenceFactory.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/reference/ResourceReferenceFactory.java Wed Jan 2 18:44:54 2008 @@ -18,23 +18,22 @@ */ -package org.apache.geronimo.connector.naming; +package org.apache.geronimo.naming.reference; import javax.naming.NamingException; import org.apache.geronimo.gbean.AbstractNameQuery; -import org.apache.geronimo.naming.ResourceSource; import org.apache.geronimo.kernel.Kernel; import org.apache.geronimo.kernel.repository.Artifact; -import org.apache.geronimo.naming.reference.AbstractEntryFactory; +import org.apache.geronimo.naming.ResourceSource; /** - * @version $Rev:$ $Date:$ + * @version $Rev$ $Date$ */ public class ResourceReferenceFactory extends AbstractEntryFactory, ResourceSource> { - private static final long serialVersionUID = -8208147204560412794L; - private final String type; + private static final long serialVersionUID = 7366848211161204771L; + private final String type; public ResourceReferenceFactory(Artifact[] configId, AbstractNameQuery abstractNameQuery, Class targetClass) { super(configId, abstractNameQuery, ResourceSource.class); Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java?rev=608311&r1=608310&r2=608311&view=diff ============================================================================== --- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java (original) +++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java Wed Jan 2 18:44:54 2008 @@ -31,7 +31,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.geronimo.common.DeploymentException; import org.apache.geronimo.common.UnresolvedReferenceException; -import org.apache.geronimo.connector.naming.ResourceReferenceFactory; import org.apache.geronimo.gbean.AbstractNameQuery; import org.apache.geronimo.gbean.GBeanInfo; import org.apache.geronimo.gbean.GBeanInfoBuilder; @@ -44,6 +43,7 @@ import org.apache.geronimo.kernel.config.Configuration; import org.apache.geronimo.kernel.repository.Environment; import org.apache.geronimo.naming.deployment.AbstractNamingBuilder; +import org.apache.geronimo.naming.reference.ResourceReferenceFactory; import org.apache.geronimo.naming.reference.UserTransactionReference; import org.apache.geronimo.xbeans.geronimo.naming.GerMessageDestinationDocument; import org.apache.geronimo.xbeans.geronimo.naming.GerMessageDestinationType; Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java?rev=608311&r1=608310&r2=608311&view=diff ============================================================================== --- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java (original) +++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java Wed Jan 2 18:44:54 2008 @@ -36,7 +36,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.geronimo.common.DeploymentException; -import org.apache.geronimo.connector.naming.ResourceReferenceFactory; import org.apache.geronimo.gbean.AbstractName; import org.apache.geronimo.gbean.AbstractNameQuery; import org.apache.geronimo.gbean.GBeanInfo; @@ -55,6 +54,7 @@ import org.apache.geronimo.naming.deployment.ResourceEnvironmentBuilder; import org.apache.geronimo.naming.deployment.ResourceEnvironmentSetter; import org.apache.geronimo.naming.reference.ORBReference; +import org.apache.geronimo.naming.reference.ResourceReferenceFactory; import org.apache.geronimo.naming.reference.URLReference; import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType; import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefDocument;