Return-Path: Delivered-To: apmail-incubator-geronimo-cvs-archive@www.apache.org Received: (qmail 40269 invoked from network); 6 Feb 2004 13:33:41 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 6 Feb 2004 13:33:41 -0000 Received: (qmail 20171 invoked by uid 500); 6 Feb 2004 13:33:17 -0000 Delivered-To: apmail-incubator-geronimo-cvs-archive@incubator.apache.org Received: (qmail 19872 invoked by uid 500); 6 Feb 2004 13:33:14 -0000 Mailing-List: contact geronimo-cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: geronimo-dev@incubator.apache.org Delivered-To: mailing list geronimo-cvs@incubator.apache.org Received: (qmail 19834 invoked from network); 6 Feb 2004 13:33:13 -0000 Received: from unknown (HELO web12825.mail.yahoo.com) (216.136.174.206) by daedalus.apache.org with SMTP; 6 Feb 2004 13:33:13 -0000 Message-ID: <20040206133314.2955.qmail@web12825.mail.yahoo.com> Received: from [141.202.248.58] by web12825.mail.yahoo.com via HTTP; Fri, 06 Feb 2004 05:33:14 PST Date: Fri, 6 Feb 2004 05:33:14 -0800 (PST) From: Davanum Srinivas Reply-To: dims@yahoo.com Subject: Re: cvs commit: incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment AbstractConnectorModule.java AbstractRARConfigurationFactory.java Connector_1_0Module.java Connector_1_5Module.java RARConfiguration.java RAR_1_0ConfigurationFactory.java RAR_1_5ConfigurationFactory.java To: geronimo-dev@incubator.apache.org, incubator-geronimo-cvs@apache.org In-Reply-To: <20040206085642.83547.qmail@minotaur.apache.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Random Thought: Shouldn't we write a tiny layer to abstract xmlbeans stuff? instead of peppering org.apache.xmlbeans.* all over the codebase? -- dims --- djencks@apache.org wrote: > djencks 2004/02/06 00:56:42 > > Modified: modules/connector project.xml > modules/connector/src/java/org/apache/geronimo/connector/deployment > AbstractConnectorModule.java > AbstractRARConfigurationFactory.java > Connector_1_0Module.java Connector_1_5Module.java > RARConfiguration.java > RAR_1_0ConfigurationFactory.java > RAR_1_5ConfigurationFactory.java > Log: > further work on xmlbeans support in connector. DConfigbeans are still missing > > Revision Changes Path > 1.6 +9 -1 incubator-geronimo/modules/connector/project.xml > > Index: project.xml > =================================================================== > RCS file: /home/cvs/incubator-geronimo/modules/connector/project.xml,v > retrieving revision 1.5 > retrieving revision 1.6 > diff -u -r1.5 -r1.6 > --- project.xml 2 Feb 2004 22:10:35 -0000 1.5 > +++ project.xml 6 Feb 2004 08:56:42 -0000 1.6 > @@ -36,6 +36,14 @@ > > > > + > + > > > geronimo > > > > 1.2 +3 -3 > incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/AbstractConnectorModule.java > > Index: AbstractConnectorModule.java > =================================================================== > RCS file: > /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/AbstractConnectorModule.java,v > retrieving revision 1.1 > retrieving revision 1.2 > diff -u -r1.1 -r1.2 > --- AbstractConnectorModule.java 3 Feb 2004 06:51:21 -0000 1.1 > +++ AbstractConnectorModule.java 6 Feb 2004 08:56:42 -0000 1.2 > @@ -88,10 +88,10 @@ > protected InputStream moduleArchive; > protected GerConnectorDocument geronimoConnectorDocument; > > - public AbstractConnectorModule(URI configID, InputStream moduleArchive, Object > geronimoConnectorDocument, ObjectName connectionTrackerNamePattern) { > + public AbstractConnectorModule(URI configID, InputStream moduleArchive, > GerConnectorDocument geronimoConnectorDocument, ObjectName connectionTrackerNamePattern) { > this.configID = configID; > this.moduleArchive = moduleArchive; > - this.geronimoConnectorDocument = (GerConnectorDocument) geronimoConnectorDocument; > + this.geronimoConnectorDocument = geronimoConnectorDocument; > this.connectionTrackerNamePattern = connectionTrackerNamePattern; > } > > > > > 1.2 +8 -13 > incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/AbstractRARConfigurationFactory.java > > Index: AbstractRARConfigurationFactory.java > =================================================================== > RCS file: > /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/AbstractRARConfigurationFactory.java,v > retrieving revision 1.1 > retrieving revision 1.2 > diff -u -r1.1 -r1.2 > --- AbstractRARConfigurationFactory.java 3 Feb 2004 06:51:21 -0000 1.1 > +++ AbstractRARConfigurationFactory.java 6 Feb 2004 08:56:42 -0000 1.2 > @@ -56,8 +56,6 @@ > > package org.apache.geronimo.connector.deployment; > > -import java.io.File; > -import java.io.IOException; > import java.io.InputStream; > import java.net.URI; > > @@ -74,9 +72,9 @@ > import org.apache.geronimo.gbean.GBeanInfo; > import org.apache.geronimo.gbean.GBeanInfoFactory; > import org.apache.geronimo.gbean.GConstructorInfo; > -import org.apache.xmlbeans.XmlException; > -import org.w3c.dom.Document; > -import org.w3c.dom.Element; > +import org.apache.xmlbeans.XmlObject; > +import org.apache.xmlbeans.SchemaTypeLoader; > +import org.apache.xmlbeans.XmlBeans; > > /** > * > @@ -87,6 +85,7 @@ > public abstract class AbstractRARConfigurationFactory implements > DeploymentConfigurationFactory { > private final ObjectName connectionTrackerNamePattern; > public static final GBeanInfo GBEAN_INFO; > + private final static SchemaTypeLoader SCHEMA_TYPE_LOADER = > XmlBeans.getContextTypeLoader(); > > public AbstractRARConfigurationFactory(ObjectName connectionTrackerNamePattern) { > this.connectionTrackerNamePattern = connectionTrackerNamePattern; > @@ -103,15 +102,11 @@ > return new RARConfiguration(deployable); > } > > - public DeploymentModule createModule(InputStream moduleArchive, Document deploymentPlan, > URI configID) throws DeploymentException { > - return null; > - } > + public abstract DeploymentModule createModule(InputStream moduleArchive, XmlObject > geronimoDD, URI configID, boolean isLocal) throws DeploymentException; > > - public DeploymentModule createModule(File moduleArchive, Document deploymentPlan, URI > configID, boolean isLocal) throws DeploymentException { > - return null; > + public SchemaTypeLoader getSchemaTypeLoader() { > + return SCHEMA_TYPE_LOADER; > } > - > - public abstract DeploymentModule createModule(InputStream moduleArchive, Object > geronimoDD, URI configID, boolean isLocal) throws DeploymentException, XmlException, > IOException; > > static { > GBeanInfoFactory infoFactory = new GBeanInfoFactory("Geronimo RAR Configuration > Factory", AbstractRARConfigurationFactory.class.getName()); > > > > 1.3 +3 -11 > incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/Connector_1_0Module.java > > Index: Connector_1_0Module.java > =================================================================== > RCS file: > /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/Connector_1_0Module.java,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -r1.2 -r1.3 > --- Connector_1_0Module.java 3 Feb 2004 06:51:21 -0000 1.2 > +++ Connector_1_0Module.java 6 Feb 2004 08:56:42 -0000 1.3 > @@ -57,7 +57,6 @@ > package org.apache.geronimo.connector.deployment; > > import java.beans.PropertyEditor; > -import java.io.File; > import java.io.IOException; > import java.io.InputStream; > import java.net.URI; > @@ -88,11 +87,11 @@ > import org.apache.geronimo.xbeans.geronimo.GerConnectionDefinitionType; > import org.apache.geronimo.xbeans.geronimo.GerConnectionmanagerType; > import org.apache.geronimo.xbeans.geronimo.GerResourceadapterType; > +import org.apache.geronimo.xbeans.geronimo.GerConnectorDocument; > import org.apache.geronimo.xbeans.j2ee.connector_1_0.ConfigPropertyType; > import org.apache.geronimo.xbeans.j2ee.connector_1_0.ConnectorDocument; > import org.apache.geronimo.xbeans.j2ee.connector_1_0.ResourceadapterType; > import org.apache.xmlbeans.XmlException; > -import org.w3c.dom.Document; > > /** > * > @@ -104,17 +103,10 @@ > > private ConnectorDocument connectorDocument; > > - public Connector_1_0Module(URI configID, InputStream moduleArchive, Object > geronimoConnectorDocument, ObjectName connectionTrackerNamePattern) { > + public Connector_1_0Module(URI configID, InputStream moduleArchive, GerConnectorDocument > geronimoConnectorDocument, ObjectName connectionTrackerNamePattern) { > super(configID, moduleArchive, geronimoConnectorDocument, > connectionTrackerNamePattern); > } > > - public Connector_1_0Module(URI configID, InputStream moduleArchive, Document > deploymentPlan, ObjectName connectionTrackerNamePattern) { > - super(configID, moduleArchive, null, connectionTrackerNamePattern); > - } > - > - public Connector_1_0Module(URI configID, File moduleArchive, Document deploymentPlan, > ObjectName connectionTrackerNamePattern) { > - super(configID, null, null, connectionTrackerNamePattern); > - } > > protected void getConnectorDocument(JarInputStream jarInputStream) throws XmlException, > IOException { > === message truncated === ===== Davanum Srinivas - http://webservices.apache.org/~dims/