geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject 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
Date Fri, 06 Feb 2004 08:56:42 GMT
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 @@
               </properties>
           </dependency>
   
  +        <!--dependency>
  +            <groupId>maven</groupId>
  +            <artifactId>geronimo-maven-xmlbeans-plugin</artifactId>
  +            <version>DEV</version>
  +            <properties>
  +            </properties>
  +        </dependency-->
  +
           <!-- real stuff -->
           <dependency>
               <groupId>geronimo</groupId>
  
  
  
  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 {
           connectorDocument = ConnectorDocument.Factory.parse(new UnclosableInputStream(jarInputStream));
  
  
  
  1.3       +3 -15     incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/Connector_1_5Module.java
  
  Index: Connector_1_5Module.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/Connector_1_5Module.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Connector_1_5Module.java	3 Feb 2004 06:51:21 -0000	1.2
  +++ Connector_1_5Module.java	6 Feb 2004 08:56:42 -0000	1.3
  @@ -57,16 +57,13 @@
   package org.apache.geronimo.connector.deployment;
   
   import java.beans.PropertyEditor;
  -import java.io.File;
  -import java.io.InputStream;
   import java.io.IOException;
  +import java.io.InputStream;
   import java.net.URI;
  -import java.net.URL;
   import java.util.Collections;
   import java.util.HashMap;
   import java.util.Map;
   import java.util.jar.JarInputStream;
  -import java.util.jar.JarEntry;
   
   import javax.management.AttributeNotFoundException;
   import javax.management.InvalidAttributeValueException;
  @@ -82,7 +79,6 @@
   import org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper;
   import org.apache.geronimo.deployment.ConfigurationCallback;
   import org.apache.geronimo.deployment.DeploymentException;
  -import org.apache.geronimo.deployment.DeploymentModule;
   import org.apache.geronimo.deployment.util.UnclosableInputStream;
   import org.apache.geronimo.gbean.DynamicGAttributeInfo;
   import org.apache.geronimo.gbean.GBeanInfo;
  @@ -102,7 +98,6 @@
   import org.apache.geronimo.xbeans.j2ee.ConnectorDocument;
   import org.apache.geronimo.xbeans.j2ee.ResourceadapterType;
   import org.apache.xmlbeans.XmlException;
  -import org.w3c.dom.Document;
   
   /**
    *
  @@ -114,17 +109,10 @@
   
       private ConnectorDocument connectorDocument;
   
  -    public Connector_1_5Module(URI configID, InputStream moduleArchive, Object geronimoConnectorDocument,
ObjectName connectionTrackerNamePattern) {
  +    public Connector_1_5Module(URI configID, InputStream moduleArchive, GerConnectorDocument
geronimoConnectorDocument, ObjectName connectionTrackerNamePattern) {
           super(configID, moduleArchive, geronimoConnectorDocument, connectionTrackerNamePattern);
       }
   
  -    public Connector_1_5Module(URI configID, InputStream moduleArchive, Document deploymentPlan,
ObjectName connectionTrackerNamePattern) {
  -        super(configID, moduleArchive, null, connectionTrackerNamePattern);
  -    }
  -
  -    public Connector_1_5Module(URI configID, File moduleArchive, Document deploymentPlan,
ObjectName connectionTrackerNamePattern) {
  -        super(configID, null, null, connectionTrackerNamePattern);
  -    }
   
       protected void getConnectorDocument(JarInputStream jarInputStream) throws XmlException,
IOException {
           connectorDocument = ConnectorDocument.Factory.parse(new UnclosableInputStream(jarInputStream));
  
  
  
  1.2       +2 -2      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RARConfiguration.java
  
  Index: RARConfiguration.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RARConfiguration.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RARConfiguration.java	2 Feb 2004 22:10:35 -0000	1.1
  +++ RARConfiguration.java	6 Feb 2004 08:56:42 -0000	1.2
  @@ -69,6 +69,6 @@
   public class RARConfiguration extends DeploymentConfigurationSupport {
   
       public RARConfiguration(DeployableObject deployable) {
  -        super(deployable);
  +        super(deployable, null);
       }
   }
  
  
  
  1.2       +10 -4     incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RAR_1_0ConfigurationFactory.java
  
  Index: RAR_1_0ConfigurationFactory.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RAR_1_0ConfigurationFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RAR_1_0ConfigurationFactory.java	3 Feb 2004 06:51:21 -0000	1.1
  +++ RAR_1_0ConfigurationFactory.java	6 Feb 2004 08:56:42 -0000	1.2
  @@ -56,7 +56,6 @@
   
   package org.apache.geronimo.connector.deployment;
   
  -import java.io.IOException;
   import java.io.InputStream;
   import java.net.URI;
   
  @@ -67,7 +66,9 @@
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.xbeans.geronimo.GerConnectorDocument;
  -import org.apache.xmlbeans.XmlException;
  +import org.apache.xmlbeans.XmlObject;
  +import org.apache.xmlbeans.SchemaType;
  +import org.apache.xmlbeans.SchemaTypeLoader;
   
   /**
    *
  @@ -83,9 +84,14 @@
           super(connectionTrackerNamePattern);
       }
   
  -    public DeploymentModule createModule(InputStream moduleArchive, Object geronimoDD,
URI configID, boolean isLocal) throws DeploymentException, XmlException, IOException {
  +    public DeploymentModule createModule(InputStream moduleArchive, XmlObject geronimoDD,
URI configID, boolean isLocal) throws DeploymentException {
           GerConnectorDocument geronimoConnectorDocument = (GerConnectorDocument) geronimoDD;
           return new Connector_1_0Module(configID, moduleArchive, geronimoConnectorDocument,
getConnectionTrackerNamePattern());
  +    }
  +
  +    //these might be temporary
  +    public SchemaType getSchemaType() {
  +        return GerConnectorDocument.type;
       }
   
       static {
  
  
  
  1.2       +9 -4      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RAR_1_5ConfigurationFactory.java
  
  Index: RAR_1_5ConfigurationFactory.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RAR_1_5ConfigurationFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RAR_1_5ConfigurationFactory.java	3 Feb 2004 06:51:21 -0000	1.1
  +++ RAR_1_5ConfigurationFactory.java	6 Feb 2004 08:56:42 -0000	1.2
  @@ -56,7 +56,6 @@
   
   package org.apache.geronimo.connector.deployment;
   
  -import java.io.IOException;
   import java.io.InputStream;
   import java.net.URI;
   
  @@ -67,7 +66,8 @@
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.xbeans.geronimo.GerConnectorDocument;
  -import org.apache.xmlbeans.XmlException;
  +import org.apache.xmlbeans.XmlObject;
  +import org.apache.xmlbeans.SchemaType;
   
   /**
    *
  @@ -83,9 +83,14 @@
           super(connectionTrackerNamePattern);
       }
   
  -    public DeploymentModule createModule(InputStream moduleArchive, Object geronimoDD,
URI configID, boolean isLocal) throws DeploymentException, XmlException, IOException {
  +    public DeploymentModule createModule(InputStream moduleArchive, XmlObject geronimoDD,
URI configID, boolean isLocal) throws DeploymentException {
           GerConnectorDocument geronimoConnectorDocument = (GerConnectorDocument) geronimoDD;
           return new Connector_1_5Module(configID, moduleArchive, geronimoConnectorDocument,
getConnectionTrackerNamePattern());
  +    }
  +
  +    //these might be temporary
  +    public SchemaType getSchemaType() {
  +        return GerConnectorDocument.type;
       }
   
       static {
  
  
  

Mime
View raw message