geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1076881 [2/3] - in /geronimo/sandbox/djencks/txmanager: ./ connector-itests/ connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/ connector-itests/src/test/resources/ connector-itests/src/test/resources/deployert...
Date Thu, 03 Mar 2011 23:29:23 GMT
Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Thu Mar  3 23:29:22 2011
@@ -16,110 +16,55 @@
  */
 package org.apache.geronimo.connector.deployment;
 
-import java.beans.Introspector;
-import java.beans.PropertyEditor;
-import java.io.Externalizable;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
+import java.io.ObjectOutputStream;
 import java.net.URI;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
 import java.util.Enumeration;
 import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 
-import javax.resource.spi.Activation;
-import javax.resource.spi.AdministeredObject;
-import javax.resource.spi.ConnectionDefinitions;
-import javax.resource.spi.ManagedConnectionFactory;
-import javax.resource.spi.ResourceAdapter;
 import javax.xml.bind.JAXBException;
-import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.stream.XMLStreamException;
 import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.common.propertyeditor.PropertyEditors;
-import org.apache.geronimo.connector.deployment.plan.AdminobjectInstanceType;
-import org.apache.geronimo.connector.deployment.plan.AdminobjectType;
-import org.apache.geronimo.connector.deployment.plan.ConfigPropertySettingType;
-import org.apache.geronimo.connector.deployment.plan.ConnectionDefinitionType;
-import org.apache.geronimo.connector.deployment.plan.ConnectiondefinitionInstanceType;
-import org.apache.geronimo.connector.deployment.plan.ConnectionmanagerType;
+import org.apache.geronimo.connector.deployment.plan.ArtifactType;
 import org.apache.geronimo.connector.deployment.plan.ConnectorType;
-import org.apache.geronimo.connector.deployment.plan.OutboundResourceadapterType;
-import org.apache.geronimo.connector.deployment.plan.PartitionedpoolType;
-import org.apache.geronimo.connector.deployment.plan.ResourceadapterInstanceType;
-import org.apache.geronimo.connector.deployment.plan.ResourceadapterType;
-import org.apache.geronimo.connector.deployment.plan.SinglepoolType;
-import org.apache.geronimo.connector.model.AdminObjectInfo;
-import org.apache.geronimo.connector.model.ManagedConnectionFactoryInfo;
-import org.apache.geronimo.connector.model.ResourceAdapterInfo;
+import org.apache.geronimo.connector.deployment.plan.EnvironmentType;
+import org.apache.geronimo.connector.deployment.plan.JaxbUtil;
 import org.apache.geronimo.connector.model.ResourceAdapterModuleInfo;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
 import org.apache.geronimo.deployment.NamespaceDrivenBuilder;
-import org.apache.geronimo.deployment.NamespaceDrivenBuilderCollection;
-import org.apache.geronimo.deployment.service.EnvironmentBuilder;
-import org.apache.geronimo.deployment.xbeans.EnvironmentType;
-import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.gbean.AbstractNameQuery;
-import org.apache.geronimo.gbean.DynamicGAttributeInfo;
-import org.apache.geronimo.gbean.GAttributeInfo;
-import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.gbean.MultiGBeanInfoFactory;
 import org.apache.geronimo.gbean.annotation.ParamAttribute;
 import org.apache.geronimo.gbean.annotation.ParamReference;
 import org.apache.geronimo.gbean.annotation.ParamSpecial;
 import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
-import org.apache.geronimo.j2ee.deployment.ActivationSpecInfoLocator;
 import org.apache.geronimo.j2ee.deployment.ConnectorModule;
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.deployment.ModuleBuilder;
 import org.apache.geronimo.j2ee.deployment.ModuleBuilderExtension;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
 import org.apache.geronimo.kernel.Naming;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
+import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.Environment;
+import org.apache.geronimo.kernel.util.FileUtils;
 import org.apache.geronimo.kernel.util.JarUtils;
-import org.apache.geronimo.management.JCAConnectionFactory;
-import org.apache.geronimo.management.geronimo.JCAAdminObject;
-import org.apache.geronimo.management.geronimo.JCAResourceAdapter;
-import org.apache.geronimo.management.geronimo.ResourceAdapterModule;
-import org.apache.geronimo.naming.deployment.ENCConfigBuilder;
-import org.apache.openejb.jee.ActivationSpec;
 import org.apache.openejb.jee.AdminObject;
-import org.apache.openejb.jee.ConfigProperty;
 import org.apache.openejb.jee.ConnectionDefinition;
 import org.apache.openejb.jee.Connector;
 import org.apache.openejb.jee.Connector10;
-import org.apache.openejb.jee.InboundResourceadapter;
 import org.apache.openejb.jee.JaxbJavaee;
-import org.apache.openejb.jee.MessageAdapter;
 import org.apache.openejb.jee.MessageListener;
-import org.apache.openejb.jee.OutboundResourceAdapter;
-import org.apache.openejb.jee.TransactionSupportType;
 import org.apache.xbean.finder.BundleAnnotationFinder;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
@@ -132,11 +77,13 @@ import org.xml.sax.SAXException;
  * @version $Rev:385659 $ $Date$
  */
 
-public class ConnectorModuleBuilder// implements ModuleBuilder
-{
+public class ConnectorModuleBuilder implements ModuleBuilder {
     private static final Logger log = LoggerFactory.getLogger(ConnectorModuleBuilder.class);
 
-//    static final String GERCONNECTOR_NAMESPACE = CONNECTOR_QNAME.getNamespaceURI();
+    //Also in ConnectorExtender
+    public final static URI PLAN_LOCATION = URI.create("OSGI-INF/connector/plan.ser");
+
+    //    static final String GERCONNECTOR_NAMESPACE = CONNECTOR_QNAME.getNamespaceURI();
     private static final Map<String, String> NAMESPACE_UPDATES = new HashMap<String, String>();
     public static final String OSGI_JNDI_SERVICE_NAME = "osgi.jndi.service.name";
 
@@ -183,7 +130,8 @@ public class ConnectorModuleBuilder// im
 //        this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders);
         ServiceReference sr = bundleContext.getServiceReference(PackageAdmin.class.getName());
         packageAdmin = (PackageAdmin) bundleContext.getService(sr);
-    }   
+    }
+
     @Override
     public Module createModule(Bundle bundle, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
         return null;
@@ -193,7 +141,7 @@ public class ConnectorModuleBuilder// im
     public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
         return createModule(plan, moduleFile, "rar", null, null, null, naming, idBuilder);
     }
-    
+
     @Override
     public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object o1, Module module, Naming naming, ModuleIDBuilder moduleIDBuilder) throws DeploymentException {
         return createModule(plan, moduleFile, targetPath, specDDUrl, environment, module, naming, moduleIDBuilder);
@@ -243,48 +191,40 @@ public class ConnectorModuleBuilder// im
                 throw new DeploymentException("Encountered unknown error parsing the ra.xml file: " + specDDUrl.toExternalForm(), e);
             }
         }
-        ConnectorType gerConnector = null;
-//        try {
-            // load the geronimo connector plan from either the supplied plan or from the earFile
+        ConnectorType connectorType = null;
+        // load the geronimo connector plan from either the supplied plan or from the earFile
+        try {
+            InputStream in;
+            if (plan != null) {
+                in = new FileInputStream((File) plan);
+            } else {
+                URL path = JarUtils.createJarURL(moduleFile, "META-INF/geronimo-ra.xml");
+                in = path.openStream();
+            }
             try {
-//                if (plan instanceof XmlObject) {
-//                    gerConnector = (GerConnectorType) SchemaConversionUtils.getNestedObjectAsType((XmlObject) plan,
-//                            CONNECTOR_QNAME,
-//                            GerConnectorType.type);
-//                } else {
-                InputStream in;
-                    if (plan != null) {
-                        in = new FileInputStream((File) plan);
-                    } else {
-                        URL path = JarUtils.createJarURL(moduleFile, "META-INF/geronimo-ra.xml");
-                        in = path.openStream();
-                    }
-                try {
-                    gerConnector = (ConnectorType) JaxbJavaee.unmarshal(ConnectorType.class, in, false);
-                } finally {
-                    in.close();
-                }
-//                }
-            } catch (ParserConfigurationException e) {
-
-            } catch (SAXException e) {
+                connectorType = JaxbUtil.unmarshal(in, false);
+            } finally {
+                in.close();
+            }
+        } catch (XMLStreamException e) {
 
-            } catch (JAXBException e) {
+        } catch (JAXBException e) {
 
-            } catch (IOException e) {
-                //do nothing
-            }
+        } catch (IOException e) {
+            //do nothing
+        }
 
-            // if we got one extract the validate it otherwise create a default one
-            if (gerConnector == null) {
-                throw new DeploymentException("A connector module must be deployed using a Geronimo deployment plan" +
-                        " (either META-INF/geronimo-ra.xml in the RAR file or a standalone deployment plan passed to the deployer).");
-            }
+        // if we got one extract the validate it otherwise create a default one
+        if (connectorType == null) {
+            throw new DeploymentException("A connector module must be deployed using a Geronimo deployment plan" +
+                    " (either META-INF/geronimo-ra.xml in the RAR file or a standalone deployment plan passed to the deployer).");
+        }
 //        } catch (XmlException e) {
 //            throw new DeploymentException("Could not parse module descriptor", e);
 //        }
 
-//        EnvironmentType environmentType = gerConnector.getEnvironment();
+        EnvironmentType environmentType = connectorType.getEnvironment();
+        Environment environment = buildEnvironment(environmentType);
 //        Environment environment = EnvironmentBuilder.buildEnvironment(environmentType, defaultEnvironment);
 //        if (earEnvironment != null) {
 //            EnvironmentBuilder.mergeEnvironments(earEnvironment, environment);
@@ -296,31 +236,45 @@ public class ConnectorModuleBuilder// im
 //            idBuilder.resolve(environment, new File(moduleFile.getName()).getName(), "car");
 //        }
 //
-//        AbstractName moduleName;
-//        if (parentModule == null) {
-//            AbstractName earName = naming.createRootName(environment.getConfigId(), NameFactory.NULL, NameFactory.J2EE_APPLICATION);
-//            moduleName = naming.createChildName(earName, environment.getConfigId().toString(), NameFactory.RESOURCE_ADAPTER_MODULE);
-//        } else {
-//            moduleName = naming.createChildName(parentModule.getModuleName(), targetPath, NameFactory.RESOURCE_ADAPTER_MODULE);
-//        }
-//
-//        boolean standAlone = earEnvironment == null;
-//
-//        String name;
-//        if (connector != null && connector.getModuleName() != null) {
-//            name = connector.getModuleName();
-//        } else if (standAlone) {
-//            name = FileUtils.removeExtension(new File(moduleFile.getName()).getName(), ".rar");
-//        } else {
-//            name = FileUtils.removeExtension(targetPath, ".rar");
-//        }
-        
-        Module module = new ConnectorModule<Connector, XmlObject>(standAlone, moduleName, name, environment, moduleFile, targetPath, connector, gerConnector, specDD, parentModule == null? null: parentModule.getJndiContext(), parentModule);
-        
-        for (ModuleBuilderExtension mbe : moduleBuilderExtensions) {
-            mbe.createModule(module, plan, moduleFile, targetPath, specDDUrl, environment, null, moduleName, naming, idBuilder);
+        AbstractName moduleName;
+        if (parentModule == null) {
+            AbstractName earName = naming.createRootName(environment.getConfigId(), NameFactory.NULL, NameFactory.J2EE_APPLICATION);
+            moduleName = naming.createChildName(earName, environment.getConfigId().toString(), NameFactory.RESOURCE_ADAPTER_MODULE);
+        } else {
+            moduleName = naming.createChildName(parentModule.getModuleName(), targetPath, NameFactory.RESOURCE_ADAPTER_MODULE);
+        }
+
+        boolean standAlone = true;//earEnvironment == null;
+
+        String name;
+        if (connector != null && connector.getModuleName() != null) {
+            name = connector.getModuleName();
+        } else if (standAlone) {
+            name = FileUtils.removeExtension(new File(moduleFile.getName()).getName(), ".rar");
+        } else {
+            name = FileUtils.removeExtension(targetPath, ".rar");
         }
-        return module; 
+
+        Module module = new ConnectorModule<Connector, ConnectorType>(standAlone, moduleName, name, environment, moduleFile, targetPath, connector, connectorType, specDD, parentModule == null ? null : parentModule.getJndiContext(), parentModule);
+
+//        for (ModuleBuilderExtension mbe : moduleBuilderExtensions) {
+//            mbe.createModule(module, plan, moduleFile, targetPath, specDDUrl, environment, null, moduleName, naming, idBuilder);
+//        }
+        return module;
+    }
+
+    private Environment buildEnvironment(EnvironmentType environmentType) {
+        Environment environment = new Environment();
+        ArtifactType artifactType = environmentType.getModuleId();
+        Artifact artifact = new Artifact(artifactType.getGroupId(), artifactType.getArtifactId(), artifactType.getVersion(), artifactType.getType());
+        environment.setConfigId(artifact);
+        environment.setBundleActivator(environmentType.getBundleActivator());
+        environment.addDynamicImportPackages(environmentType.getDynamicImportPackage());
+        environment.addExportPackages(environmentType.getExportPackage());
+        environment.addImportPackages(environmentType.getImportPackage());
+        environment.addRequireBundles(environmentType.getRequireBundle());
+
+        return environment;
     }
 
     public void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws DeploymentException {
@@ -357,15 +311,15 @@ public class ConnectorModuleBuilder// im
         } catch (IOException e) {
             throw new DeploymentException("Problem deploying connector", e);
         }
-        for (ModuleBuilderExtension mbe : moduleBuilderExtensions) {
-            mbe.installModule(earFile, earContext, module, configurationStores, targetConfigurationStore, repository);
-        }
+//        for (ModuleBuilderExtension mbe : moduleBuilderExtensions) {
+//            mbe.installModule(earFile, earContext, module, configurationStores, targetConfigurationStore, repository);
+//        }
     }
 
     public void initContext(EARContext earContext, Module module, Bundle bundle) throws DeploymentException {
         log.info("deploying bundle " + bundle + " at " + bundle.getLocation());
-        ConnectorModule<Connector, XmlObject> resourceModule = (ConnectorModule<Connector, XmlObject>) module;
-        
+        ConnectorModule<Connector, ConnectorType> resourceModule = (ConnectorModule<Connector, ConnectorType>) module;
+
         // all connector objects wrappers get injected with the validator reference 
         AbstractName validatorName = module.getEarContext().getNaming().createChildName(module.getModuleName(), "ValidatorFactory", NameFactory.VALIDATOR_FACTORY);
 
@@ -377,7 +331,7 @@ public class ConnectorModuleBuilder// im
         }
 
         Connector connector = resourceModule.getSpecDD();
-        connector = mergeMetadata(bundle, classFinder, connector);
+        connector = new AnnotationProcessor().mergeMetadata(bundle, classFinder, connector);
 
         addExportPackages(connector, module.getEnvironment(), bundle);
 
@@ -392,377 +346,138 @@ public class ConnectorModuleBuilder// im
         JCAResourceAdapter (n)  (from JCAResource) (actual instance of ResourceAdapter)
         TODO include admin objects (n) from JCAResource presumably
         */
-        AbstractName resourceAdapterModuleName = resourceModule.getModuleName();
-
-        AbstractName resourceAdapterjsr77Name = earContext.getNaming().createChildName(resourceAdapterModuleName, module.getName(), NameFactory.RESOURCE_ADAPTER);
-        AbstractName jcaResourcejsr77Name = earContext.getNaming().createChildName(resourceAdapterjsr77Name, module.getName(), NameFactory.JCA_RESOURCE);
-
-        //set up the metadata for the ResourceAdapterModule
-        GBeanData resourceAdapterModuleData = new GBeanData(resourceAdapterModuleName, ResourceAdapterModuleImplGBean.GBEAN_INFO);
-        // initalize the GBean
-        if (earContext.getServerName() != null) {
-            //app clients don't have a Server gbean
-            resourceAdapterModuleData.setReferencePattern(NameFactory.J2EE_SERVER, earContext.getServerName());
-            //app clients don't have an application name either
-            if (!earContext.getModuleName().equals(resourceAdapterModuleName)) {
-                resourceAdapterModuleData.setReferencePattern(NameFactory.J2EE_APPLICATION, earContext.getModuleName());
-            }
-        }
-        resourceAdapterModuleData.setReferencePattern("ResourceAdapter", resourceAdapterjsr77Name);
-
-        resourceAdapterModuleData.setAttribute("deploymentDescriptor", module.getOriginalSpecDD());
-        resourceAdapterModuleData.setAttribute("displayName", connector.getDisplayName());
-        resourceAdapterModuleData.setAttribute("description", connector.getDescription());
-        resourceAdapterModuleData.setAttribute("vendorName", connector.getVendorName());
-        resourceAdapterModuleData.setAttribute("EISType", connector.getEisType());
-        resourceAdapterModuleData.setAttribute("resourceAdapterVersion", connector.getResourceAdapterVersion());
-
-        org.apache.openejb.jee.ResourceAdapter resourceAdapter = connector.getResourceAdapter();
-        // Create the resource adapter gbean
-        if (resourceAdapter.getResourceAdapterClass() != null) {
-            GBeanInfoBuilder resourceAdapterInfoBuilder = new GBeanInfoBuilder(ResourceAdapterWrapperGBean.class, new MultiGBeanInfoFactory().getGBeanInfo(ResourceAdapterWrapperGBean.class));
-            String resourceAdapterClassName = resourceAdapter.getResourceAdapterClass();
-            GBeanData resourceAdapterGBeanData = setUpDynamicGBeanWithProperties(resourceAdapterClassName, resourceAdapterInfoBuilder, resourceAdapter.getConfigProperty(), bundle, Collections.<String>emptySet());
-
-            resourceAdapterGBeanData.setAttribute("resourceAdapterClass", resourceAdapterClassName);
-
-            // Add map from messageListenerInterface to activationSpec class
-            Map<String, String> messageListenerToActivationSpecMap = new TreeMap<String, String>();
-            if (resourceAdapter.getInboundResourceAdapter() != null && resourceAdapter.getInboundResourceAdapter().getMessageAdapter() != null) {
-                for (MessageListener messageListener : resourceAdapter.getInboundResourceAdapter().getMessageAdapter().getMessageListener()) {
-                    String messageListenerInterface = messageListener.getMessageListenerType();
-                    ActivationSpec activationSpec = messageListener.getActivationSpec();
-                    String activationSpecClassName = activationSpec.getActivationSpecClass();
-                    messageListenerToActivationSpecMap.put(messageListenerInterface, activationSpecClassName);
-                }
-                resourceAdapterGBeanData.setAttribute("messageListenerToActivationSpecMap", messageListenerToActivationSpecMap);
-                resourceAdapterGBeanData.setReferencePattern("XATerminator", earContext.getTransactionManagerName());
-                resourceAdapterGBeanData.setReferencePattern("TransactionManager", earContext.getTransactionManagerName());
-                resourceAdapterGBeanData.setReferencePattern("TransactionSynchronizationRegistry", earContext.getTransactionManagerName());
-                
-                resourceAdapterGBeanData.setReferencePattern("ValidatorFactory", validatorName);
-                //This was previously in a separate if block, whether or not resourceAdapterClass was set.  I don't think this makes sense
-                Map activationSpecInfoMap = getActivationSpecInfoMap(validatorName, resourceAdapter.getInboundResourceAdapter().getMessageAdapter().getMessageListener(), bundle);
-                resourceAdapterModuleData.setAttribute("activationSpecInfoMap", activationSpecInfoMap);
-            }
-
-            resourceAdapterModuleData.setAttribute("resourceAdapterGBeanData", resourceAdapterGBeanData);
-        }
-
-        Map adminObjectInfoMap = getAdminObjectInfoMap(validatorName, resourceAdapter.getAdminObject(), bundle);
-        resourceAdapterModuleData.setAttribute("adminObjectInfoMap", adminObjectInfoMap);
-        if (resourceAdapter.getOutboundResourceAdapter() != null) {
-            Map managedConnectionFactoryInfoMap = getManagedConnectionFactoryInfoMap(validatorName, resourceAdapter.getOutboundResourceAdapter().getConnectionDefinition(), bundle);
-            resourceAdapterModuleData.setAttribute("managedConnectionFactoryInfoMap", managedConnectionFactoryInfoMap);
-        }
-
-        try {
-            earContext.addGBean(resourceAdapterModuleData);
-        } catch (GBeanAlreadyExistsException e) {
-            throw new DeploymentException("Could not add resource adapter module gbean to context", e);
-        }
-
-        //construct the bogus resource adapter and jca resource placeholders
-        GBeanData resourceAdapterData = new GBeanData(resourceAdapterjsr77Name, ResourceAdapterImplGBean.GBEAN_INFO);
-        resourceAdapterData.setReferencePattern("JCAResource", jcaResourcejsr77Name);
-        try {
-            earContext.addGBean(resourceAdapterData);
-        } catch (GBeanAlreadyExistsException e) {
-            throw new DeploymentException("Could not add resource adapter gbean to context", e);
-        }
+//        AbstractName resourceAdapterModuleName = resourceModule.getModuleName();
+//
+//        AbstractName resourceAdapterjsr77Name = earContext.getNaming().createChildName(resourceAdapterModuleName, module.getName(), NameFactory.RESOURCE_ADAPTER);
+//        AbstractName jcaResourcejsr77Name = earContext.getNaming().createChildName(resourceAdapterjsr77Name, module.getName(), NameFactory.JCA_RESOURCE);
+//
+//        //set up the metadata for the ResourceAdapterModule
+//        GBeanData resourceAdapterModuleData = new GBeanData(resourceAdapterModuleName, ResourceAdapterModuleImplGBean.GBEAN_INFO);
+//        // initalize the GBean
+//        if (earContext.getServerName() != null) {
+//            //app clients don't have a Server gbean
+//            resourceAdapterModuleData.setReferencePattern(NameFactory.J2EE_SERVER, earContext.getServerName());
+//            //app clients don't have an application name either
+//            if (!earContext.getModuleName().equals(resourceAdapterModuleName)) {
+//                resourceAdapterModuleData.setReferencePattern(NameFactory.J2EE_APPLICATION, earContext.getModuleName());
+//            }
+//        }
+//        resourceAdapterModuleData.setReferencePattern("ResourceAdapter", resourceAdapterjsr77Name);
+//
+//        resourceAdapterModuleData.setAttribute("deploymentDescriptor", module.getOriginalSpecDD());
+//        resourceAdapterModuleData.setAttribute("displayName", connector.getDisplayName());
+//        resourceAdapterModuleData.setAttribute("description", connector.getDescription());
+//        resourceAdapterModuleData.setAttribute("vendorName", connector.getVendorName());
+//        resourceAdapterModuleData.setAttribute("EISType", connector.getEisType());
+//        resourceAdapterModuleData.setAttribute("resourceAdapterVersion", connector.getResourceAdapterVersion());
+//
+//        org.apache.openejb.jee.ResourceAdapter resourceAdapter = connector.getResourceAdapter();
+//        // Create the resource adapter gbean
+//        if (resourceAdapter.getResourceAdapterClass() != null) {
+//            GBeanInfoBuilder resourceAdapterInfoBuilder = new GBeanInfoBuilder(ResourceAdapterWrapperGBean.class, new MultiGBeanInfoFactory().getGBeanInfo(ResourceAdapterWrapperGBean.class));
+//            String resourceAdapterClassName = resourceAdapter.getResourceAdapterClass();
+//            GBeanData resourceAdapterGBeanData = setUpDynamicGBeanWithProperties(resourceAdapterClassName, resourceAdapterInfoBuilder, resourceAdapter.getConfigProperty(), bundle, Collections.<String>emptySet());
+//
+//            resourceAdapterGBeanData.setAttribute("resourceAdapterClass", resourceAdapterClassName);
+//
+//            // Add map from messageListenerInterface to activationSpec class
+//            Map<String, String> messageListenerToActivationSpecMap = new TreeMap<String, String>();
+//            if (resourceAdapter.getInboundResourceAdapter() != null && resourceAdapter.getInboundResourceAdapter().getMessageAdapter() != null) {
+//                for (MessageListener messageListener : resourceAdapter.getInboundResourceAdapter().getMessageAdapter().getMessageListener()) {
+//                    String messageListenerInterface = messageListener.getMessageListenerType();
+//                    ActivationSpec activationSpec = messageListener.getActivationSpec();
+//                    String activationSpecClassName = activationSpec.getActivationSpecClass();
+//                    messageListenerToActivationSpecMap.put(messageListenerInterface, activationSpecClassName);
+//                }
+//                resourceAdapterGBeanData.setAttribute("messageListenerToActivationSpecMap", messageListenerToActivationSpecMap);
+//                resourceAdapterGBeanData.setReferencePattern("XATerminator", earContext.getTransactionManagerName());
+//                resourceAdapterGBeanData.setReferencePattern("TransactionManager", earContext.getTransactionManagerName());
+//                resourceAdapterGBeanData.setReferencePattern("TransactionSynchronizationRegistry", earContext.getTransactionManagerName());
+//
+//                resourceAdapterGBeanData.setReferencePattern("ValidatorFactory", validatorName);
+//                //This was previously in a separate if block, whether or not resourceAdapterClass was set.  I don't think this makes sense
+//                Map activationSpecInfoMap = getActivationSpecInfoMap(validatorName, resourceAdapter.getInboundResourceAdapter().getMessageAdapter().getMessageListener(), bundle);
+//                resourceAdapterModuleData.setAttribute("activationSpecInfoMap", activationSpecInfoMap);
+//            }
+//
+//            resourceAdapterModuleData.setAttribute("resourceAdapterGBeanData", resourceAdapterGBeanData);
+//        }
+//
+//        Map adminObjectInfoMap = getAdminObjectInfoMap(validatorName, resourceAdapter.getAdminObject(), bundle);
+//        resourceAdapterModuleData.setAttribute("adminObjectInfoMap", adminObjectInfoMap);
+//        if (resourceAdapter.getOutboundResourceAdapter() != null) {
+//            Map managedConnectionFactoryInfoMap = getManagedConnectionFactoryInfoMap(validatorName, resourceAdapter.getOutboundResourceAdapter().getConnectionDefinition(), bundle);
+//            resourceAdapterModuleData.setAttribute("managedConnectionFactoryInfoMap", managedConnectionFactoryInfoMap);
+//        }
+//
+//        try {
+//            earContext.addGBean(resourceAdapterModuleData);
+//        } catch (GBeanAlreadyExistsException e) {
+//            throw new DeploymentException("Could not add resource adapter module gbean to context", e);
+//        }
+//
+//        //construct the bogus resource adapter and jca resource placeholders
+//        GBeanData resourceAdapterData = new GBeanData(resourceAdapterjsr77Name, ResourceAdapterImplGBean.GBEAN_INFO);
+//        resourceAdapterData.setReferencePattern("JCAResource", jcaResourcejsr77Name);
+//        try {
+//            earContext.addGBean(resourceAdapterData);
+//        } catch (GBeanAlreadyExistsException e) {
+//            throw new DeploymentException("Could not add resource adapter gbean to context", e);
+//        }
+//
+//        GBeanData jcaResourceData = new GBeanData(jcaResourcejsr77Name, JCAResourceImplGBean.GBEAN_INFO);
+//        Map<String, String> thisModule = new LinkedHashMap<String, String>(2);
+//        thisModule.put(NameFactory.J2EE_APPLICATION, resourceAdapterModuleName.getNameProperty(NameFactory.J2EE_APPLICATION));
+//        thisModule.put(NameFactory.RESOURCE_ADAPTER_MODULE, resourceAdapterModuleName.getNameProperty(NameFactory.J2EE_NAME));
+//        jcaResourceData.setReferencePattern("ConnectionFactories", new AbstractNameQuery(resourceAdapterModuleName.getArtifact(), thisModule, JCAConnectionFactory.class.getName()));
+//        jcaResourceData.setReferencePattern("ResourceAdapters", new AbstractNameQuery(resourceAdapterModuleName.getArtifact(), thisModule, JCAResourceAdapter.class.getName()));
+//        jcaResourceData.setReferencePattern("AdminObjects", new AbstractNameQuery(resourceAdapterModuleName.getArtifact(), thisModule, JCAAdminObject.class.getName()));
+//
+//        try {
+//            earContext.addGBean(jcaResourceData);
+//        } catch (GBeanAlreadyExistsException e) {
+//            throw new DeploymentException("Could not add jca resource gbean to context", e);
+//        }
 
-        GBeanData jcaResourceData = new GBeanData(jcaResourcejsr77Name, JCAResourceImplGBean.GBEAN_INFO);
-        Map<String, String> thisModule = new LinkedHashMap<String, String>(2);
-        thisModule.put(NameFactory.J2EE_APPLICATION, resourceAdapterModuleName.getNameProperty(NameFactory.J2EE_APPLICATION));
-        thisModule.put(NameFactory.RESOURCE_ADAPTER_MODULE, resourceAdapterModuleName.getNameProperty(NameFactory.J2EE_NAME));
-        jcaResourceData.setReferencePattern("ConnectionFactories", new AbstractNameQuery(resourceAdapterModuleName.getArtifact(), thisModule, JCAConnectionFactory.class.getName()));
-        jcaResourceData.setReferencePattern("ResourceAdapters", new AbstractNameQuery(resourceAdapterModuleName.getArtifact(), thisModule, JCAResourceAdapter.class.getName()));
-        jcaResourceData.setReferencePattern("AdminObjects", new AbstractNameQuery(resourceAdapterModuleName.getArtifact(), thisModule, JCAAdminObject.class.getName()));
+        ConnectorType geronimoConnector = (ConnectorType) module.getVendorDD();
 
         try {
-            earContext.addGBean(jcaResourceData);
-        } catch (GBeanAlreadyExistsException e) {
-            throw new DeploymentException("Could not add jca resource gbean to context", e);
+            ResourceAdapterModuleInfo info = new InfoBuilder().configureConnector(connector, geronimoConnector, bundle);
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            ObjectOutputStream out = new ObjectOutputStream(baos);
+            out.writeObject(info);
+            out.flush();
+            out.close();
+            earContext.addFile(PLAN_LOCATION, baos.toByteArray());
+        } catch (IOException e) {
+            throw new DeploymentException(e);
         }
 
-        GerConnectorType geronimoConnector = (GerConnectorType) module.getVendorDD();
-
-        serviceBuilders.build(geronimoConnector, earContext, earContext);
-
-        configureConnector(connector, geronimoConnector, bundle);
-        
         // also give the extensions a crack at this 
-        for (ModuleBuilderExtension mbe : moduleBuilderExtensions) {
-            mbe.initContext(earContext, module, bundle);
-        }
+//        for (ModuleBuilderExtension mbe : moduleBuilderExtensions) {
+//            mbe.initContext(earContext, module, bundle);
+//        }
 
     }
 
     public void addGBeans(EARContext earContext, Module module, Bundle bundle, Collection repository) throws DeploymentException {
-         //all our gbeans are added in  the initContext step
-         //in case we decide connectors should be separate bundles
-         module.addAsChildConfiguration();
+        //all our gbeans are added in  the initContext step
+        //in case we decide connectors should be separate bundles
+        module.addAsChildConfiguration();
 //        for (ModuleBuilderExtension mbe : moduleBuilderExtensions) {
 //            mbe.addGBeans(earContext, module, bundle, repository);
 //        }
-     }
-
-//    public String getSchemaNamespace() {
-//        return GERCONNECTOR_NAMESPACE;
-//    }
-
-    private Connector mergeMetadata(Bundle bundle, BundleAnnotationFinder classFinder, Connector connector) throws DeploymentException {
-        Class<? extends ResourceAdapter> raClass = null;
-        if (connector == null) {
-            List<Class<?>> resourceAdapterClasses = classFinder.findAnnotatedClasses(javax.resource.spi.Connector.class);
-            if (resourceAdapterClasses.size() != 1) {
-                throw new DeploymentException("Not exactly one resource adapter: " + resourceAdapterClasses);
-            }
-            raClass = resourceAdapterClasses.get(0).asSubclass(ResourceAdapter.class);
-            connector = new Connector();
-//          connector.setDescriptions(ra.description());
-            connector.setMetadataComplete(false);
-            connector.setVersion("1.6");
-            org.apache.openejb.jee.ResourceAdapter resourceAdapter = new org.apache.openejb.jee.ResourceAdapter();
-            connector.setResourceAdapter(resourceAdapter);
-            resourceAdapter.setResourceAdapterClass(raClass.getName());
-        } else {
-            String raClassName = connector.getResourceAdapter().getResourceAdapterClass();
-            if (raClassName != null) {
-                try {
-                    raClass = bundle.loadClass(raClassName).asSubclass(ResourceAdapter.class);
-                } catch (ClassNotFoundException e) {
-                    throw new DeploymentException("Can not load resource adapter class: " + raClassName, e);
-                }
-            }
-        }
-        if (connector.isMetadataComplete() != null && connector.isMetadataComplete()) {
-            log.info("Connector is metadata complete");
-        } else {
-            org.apache.openejb.jee.ResourceAdapter resourceAdapter = connector.getResourceAdapter();
-            log.info("Reading connector annotations");
-            if (raClass != null/*and not metadata complete */) {
-                javax.resource.spi.Connector ra = raClass.getAnnotation(javax.resource.spi.Connector.class);
-                if (ra != null) {
-
-                    OutboundResourceAdapter outboundResourceAdapter = resourceAdapter.getOutboundResourceAdapter();
-                    if (outboundResourceAdapter == null) {
-                        outboundResourceAdapter = new OutboundResourceAdapter();
-                        resourceAdapter.setOutboundResourceAdapter(outboundResourceAdapter);
-                    }
-                    if (outboundResourceAdapter.isReauthenticationSupport() == null) {
-                        outboundResourceAdapter.setReauthenticationSupport(ra.reauthenticationSupport());
-                    }
-                    if (outboundResourceAdapter.getTransactionSupport() == null) {
-                        outboundResourceAdapter.setTransactionSupport(TransactionSupportType.fromValue(ra.transactionSupport().toString()));
-                    }
-                    connector.getRequiredWorkContext().addAll(toString(ra.requiredWorkContexts()));
-                    setConfigProperties(resourceAdapter.getConfigProperty(), raClass);
-                }
-            }
-
-            //inbound
-            log.info("connector of type: " + connector);
-            InboundResourceadapter inboundResource = resourceAdapter.getInboundResourceAdapter();
-            if (inboundResource == null) {
-                inboundResource = new InboundResourceadapter();
-                inboundResource.setMessageAdapter(new MessageAdapter());
-            }
-            MessageAdapter messageAdapter = inboundResource.getMessageAdapter();
-            List<Class<?>> activationSpecClasses = classFinder.findAnnotatedClasses(Activation.class);
-
-            for (Class<?> asClass : activationSpecClasses) {
-                Activation activation = asClass.getAnnotation(Activation.class);
-                for (Class messageListenerClass : activation.messageListeners()) {
-                    ActivationSpec activationSpec = getActivationSpec(messageAdapter, messageListenerClass);
-
-                    if (activationSpec.getActivationSpecClass() == null) {
-                        activationSpec.setActivationSpecClass(asClass.getName());
-                    }
-                    if (asClass.getName().equals(activationSpec.getActivationSpecClass())) {
-                        setConfigProperties(activationSpec.getConfigProperty(), asClass);
-                    }
-                    //TODO set required config properties from @NotNull annotations
-                }
-            }
-            if (resourceAdapter.getInboundResourceAdapter() == null && inboundResource.getMessageAdapter().getMessageListener().size() > 0) {
-                resourceAdapter.setInboundResourceAdapter(inboundResource);
-            }
-
-            //admin objects
-            for (Class adminObjectClass : classFinder.findAnnotatedClasses(AdministeredObject.class)) {
-                AdministeredObject administeredObject = (AdministeredObject) adminObjectClass.getAnnotation(AdministeredObject.class);
-                Class[] interfaces = administeredObject.adminObjectInterfaces();
-                if (interfaces == null || interfaces.length == 0) {
-                    List<Class> allInterfaces = new ArrayList<Class>(Arrays.asList(adminObjectClass.getInterfaces()));
-                    allInterfaces.remove(Serializable.class);
-                    allInterfaces.remove(Externalizable.class);
-                    //TODO check if specified in ra.xml
-                    if (allInterfaces.size() != 1) {
-                        throw new DeploymentException("Interface for admin object not specified properly: " + allInterfaces);
-                    }
-                    interfaces = allInterfaces.toArray(new Class[1]);
-                }
-                for (Class aoInterface : interfaces) {
-                    AdminObject adminObject = getAdminObject(resourceAdapter, aoInterface);
-                    if (adminObject.getAdminObjectClass() == null) {
-                        adminObject.setAdminObjectClass(adminObjectClass.getName());
-                    }
-                    if (adminObjectClass.getName().equals(adminObject.getAdminObjectClass())) {
-                        setConfigProperties(adminObject.getConfigProperty(), adminObjectClass);
-                    }
-                }
-            }
-
-            OutboundResourceAdapter outboundResourceAdapter = resourceAdapter.getOutboundResourceAdapter();
-            if (outboundResourceAdapter == null) {
-                outboundResourceAdapter = new OutboundResourceAdapter();
-            }
-
-            //outbound
-            for (Class<?> mcfClass : classFinder.findAnnotatedClasses(javax.resource.spi.ConnectionDefinition.class)) {
-                javax.resource.spi.ConnectionDefinition connectionDefinitionAnnotation = mcfClass.getAnnotation(javax.resource.spi.ConnectionDefinition.class);
-                buildConnectionDefinition(mcfClass.asSubclass(ManagedConnectionFactory.class), connectionDefinitionAnnotation, outboundResourceAdapter);
-            }
-            for (Class<?> mcfClass : classFinder.findAnnotatedClasses(ConnectionDefinitions.class)) {
-                ConnectionDefinitions connectionDefinitionAnnotations = mcfClass.getAnnotation(ConnectionDefinitions.class);
-                for (javax.resource.spi.ConnectionDefinition connectionDefinitionAnnotation : connectionDefinitionAnnotations.value()) {
-                    buildConnectionDefinition(mcfClass.asSubclass(ManagedConnectionFactory.class), connectionDefinitionAnnotation, outboundResourceAdapter);
-                }
-            }
-            if (outboundResourceAdapter.getConnectionDefinition().size() > 0) {
-                resourceAdapter.setOutboundResourceAdapter(outboundResourceAdapter);
-            }
-        }
-        return connector;
-    }
-
-    /**
-     * Find or create an ActivationSpec object for the supplied messageListenerClass
-     *
-     * @param messageAdapter       MessageAdapter container object
-     * @param messageListenerClass class for the activation spec
-     * @return ActivationSpec data object
-     */
-    private ActivationSpec getActivationSpec(MessageAdapter messageAdapter, Class messageListenerClass) {
-        for (MessageListener messageListener : messageAdapter.getMessageListener()) {
-            if (messageListenerClass.getName().equals(messageListener.getMessageListenerType())) {
-                return messageListener.getActivationSpec();
-            }
-        }
-        MessageListener messageListener = new MessageListener();
-        messageListener.setMessageListenerType(messageListenerClass.getName());
-        ActivationSpec activationSpec = new ActivationSpec();
-        messageListener.setActivationSpec(activationSpec);
-        messageAdapter.getMessageListener().add(messageListener);
-        return activationSpec;
-    }
-
-    /**
-     * find or create an AdminObject for the supplied admin object interface
-     *
-     * @param resourceAdapter ResourceAdapter container object
-     * @param aoInterface     admin object interface
-     * @return AdminObject data object
-     */
-    private AdminObject getAdminObject(org.apache.openejb.jee.ResourceAdapter resourceAdapter, Class aoInterface) {
-        for (AdminObject adminObject : resourceAdapter.getAdminObject()) {
-            if (aoInterface.getName().equals(adminObject.getAdminObjectInterface())) {
-                return adminObject;
-            }
-        }
-        AdminObject adminObject = new AdminObject();
-        adminObject.setAdminObjectInterface(aoInterface.getName());
-        resourceAdapter.getAdminObject().add(adminObject);
-        return adminObject;
-    }
-
-    private void setConfigProperties(List<ConfigProperty> configProperty, Class<?> aClass) throws DeploymentException {
-        for (Method method : aClass.getMethods()) {
-            if (method.getName().startsWith("set") && method.getParameterTypes().length == 1) {
-                javax.resource.spi.ConfigProperty cpa = method.getAnnotation(javax.resource.spi.ConfigProperty.class);
-                if (cpa != null) {
-                    setConfigProperty(configProperty, cpa, method.getName().substring(3), method.getParameterTypes()[0]);
-                }
-            }
-        }
-        do {
-            for (Field field : aClass.getDeclaredFields()) {
-                javax.resource.spi.ConfigProperty cpa = field.getAnnotation(javax.resource.spi.ConfigProperty.class);
-                if (cpa != null) {
-                    setConfigProperty(configProperty, cpa, field.getName(), field.getType());
-                }
-            }
-            aClass = aClass.getSuperclass();
-        } while (aClass != null);
     }
 
-    private void setConfigProperty(List<ConfigProperty> configProperties, javax.resource.spi.ConfigProperty cpa, String name, Class<?> type) throws DeploymentException {
-        name = Introspector.decapitalize(name);
-        ConfigProperty target = null;
-        for (ConfigProperty configProperty : configProperties) {
-            if (name.equals(configProperty.getConfigPropertyName())) {
-                target = configProperty;
-                break;
-            }
-        }
-        if (target == null) {
-            target = new ConfigProperty();
-            target.setConfigPropertyName(name);
-            configProperties.add(target);
-        }
-        if (cpa.type() != Object.class && cpa.type() != type) {
-            throw new DeploymentException("wrong type specified: " + cpa.type().getName() + " expecting " + type.getName());
-        }
-        if (target.getConfigPropertyType() == null) {
-            target.setConfigPropertyType(type.getName());
-        }
-        if (target.getConfigPropertyValue() == null) {
-            target.setConfigPropertyValue(cpa.defaultValue());
-        }
-        if (target.isConfigPropertyConfidential() == null) {
-            target.setConfigPropertyConfidential(cpa.confidential());
-        }
-        if (target.isConfigPropertyIgnore() == null) {
-            target.setConfigPropertyIgnore(cpa.ignore());
-        }
-        if (target.isConfigPropertySupportsDynamicUpdates() == null) {
-            target.setConfigPropertySupportsDynamicUpdates(cpa.supportsDynamicUpdates());
-        }
-    }
-
-    private List<String> toString(Class<?>[] classes) {
-        List<String> list = new ArrayList<String>(classes.length);
-        for (Class<?> clazz : classes) {
-            list.add(clazz.getName());
-        }
-        return list;
+    @Override
+    public String getSchemaNamespace() {
+        return null;
     }
 
-    private void buildConnectionDefinition(Class<? extends ManagedConnectionFactory> mcfClass, javax.resource.spi.ConnectionDefinition connectionDefinitionAnnotation, OutboundResourceAdapter outboundResourceAdapter) throws DeploymentException {
-        ConnectionDefinition connectionDefinition = getConnectionDefinition(connectionDefinitionAnnotation, outboundResourceAdapter);
-        if (connectionDefinition.getManagedConnectionFactoryClass() == null) {
-            connectionDefinition.setManagedConnectionFactoryClass(mcfClass.getName());
-        }
-        if (mcfClass.getName().equals(connectionDefinition.getManagedConnectionFactoryClass())) {
-            connectionDefinition.setConnectionFactoryImplClass(connectionDefinitionAnnotation.connectionFactoryImpl().getName());
-            connectionDefinition.setConnectionInterface(connectionDefinitionAnnotation.connection().getName());
-            connectionDefinition.setConnectionImplClass(connectionDefinitionAnnotation.connectionImpl().getName());
-            setConfigProperties(connectionDefinition.getConfigProperty(), mcfClass);
-        }
-    }
+//    public String getSchemaNamespace() {
+//        return GERCONNECTOR_NAMESPACE;
+//    }
 
-    private ConnectionDefinition getConnectionDefinition(javax.resource.spi.ConnectionDefinition connectionDefinitionAnnotation, OutboundResourceAdapter outboundResourceAdapter) {
-        for (ConnectionDefinition connectionDefinition : outboundResourceAdapter.getConnectionDefinition()) {
-            if (connectionDefinitionAnnotation.connectionFactory().getName().equals(connectionDefinition.getConnectionFactoryInterface())) {
-                return connectionDefinition;
-            }
-        }
-        ConnectionDefinition connectionDefinition = new ConnectionDefinition();
-        outboundResourceAdapter.getConnectionDefinition().add(connectionDefinition);
-        connectionDefinition.setConnectionFactoryInterface(connectionDefinitionAnnotation.connectionFactory().getName());
-        return connectionDefinition;
-    }
 
     private void addExportPackages(Connector connector, Environment environment, Bundle bundle) throws DeploymentException {
         if (connector.getResourceAdapter().getOutboundResourceAdapter() != null) {
@@ -797,28 +512,5 @@ public class ConnectorModuleBuilder// im
 
     }
 
-    private GBeanData setUpDynamicGBeanWithProperties(String className, GBeanInfoBuilder infoBuilder, List<ConfigProperty> configProperties, Bundle bundle, Set<String> ignore) throws DeploymentException {
-        findConfigProperties(className, ignore, bundle, false);
-
-        GBeanInfo gbeanInfo = infoBuilder.getBeanInfo();
-        GBeanData gbeanData = new GBeanData(gbeanInfo);
-        for (ConfigProperty configProperty : configProperties) {
-            if (configProperty.getConfigPropertyValue() != null) {
-                String name = configProperty.getConfigPropertyName();
-                if (gbeanInfo.getAttribute(name) == null) {
-                    String originalName = name;
-                    name = switchCase(name);
-                    if (gbeanInfo.getAttribute(name) == null) {
-                        log.warn("Unsupported config-property: " + originalName);
-                        continue;
-                    }
-                }
-                String type = configProperty.getConfigPropertyType();
-                String value = configProperty.getConfigPropertyValue();
-                gbeanData.setAttribute(name, getValue(type, value, bundle));
-            }
-        }
-        return gbeanData;
-    }
 
 }

Added: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/DeploymentExtender.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/DeploymentExtender.java?rev=1076881&view=auto
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/DeploymentExtender.java (added)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/DeploymentExtender.java Thu Mar  3 23:29:22 2011
@@ -0,0 +1,213 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.connector.deployment;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.xml.bind.JAXBException;
+import javax.xml.stream.XMLStreamException;
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Deactivate;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.connector.deployment.plan.ConnectorType;
+import org.apache.geronimo.connector.deployment.plan.JaxbUtil;
+import org.apache.geronimo.connector.extender.Container;
+import org.apache.geronimo.connector.model.ResourceAdapterModuleInfo;
+import org.apache.geronimo.kernel.util.JarUtils;
+import org.apache.openejb.jee.Connector;
+import org.apache.openejb.jee.Connector10;
+import org.apache.openejb.jee.JaxbJavaee;
+import org.apache.xbean.finder.BundleAnnotationFinder;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.Constants;
+import org.osgi.service.packageadmin.PackageAdmin;
+import org.osgi.util.tracker.BundleTracker;
+import org.osgi.util.tracker.BundleTrackerCustomizer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xml.sax.SAXException;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+@Component
+public class DeploymentExtender {
+    private static final Logger log = LoggerFactory.getLogger(DeploymentExtender.class);
+
+    public final static String PLAN_LOCATION = "OSGI-INF/connector/plan.ser";
+
+    @Reference(cardinality = ReferenceCardinality.OPTIONAL_UNARY)
+    private volatile PackageAdmin packageAdmin;
+
+    private BundleTracker bt;
+
+    @Activate
+    public void start(BundleContext bundleContext) {
+        bt = new BundleTracker(bundleContext, Bundle.STARTING, new RarBundleTrackerCustomizer());
+        bt.open();
+
+    }
+
+    @Deactivate
+    public void stop() {
+        bt.close();
+        bt = null;
+    }
+
+    private class RarBundleTrackerCustomizer implements BundleTrackerCustomizer {
+
+        public Object addingBundle(Bundle bundle, BundleEvent event) {
+            if (bundle.getState() == Bundle.STARTING) {
+                try {
+                    checkBundle(bundle);
+                    return bundle;
+                } catch (DeploymentException e) {
+                    log.info("Could not deploy bundle " + bundle, e);
+                }
+            }
+            return null;
+        }
+
+        public void modifiedBundle(Bundle bundle, BundleEvent event, Object arg) {
+        }
+
+        public void removedBundle(Bundle bundle, BundleEvent event, Object arg) {
+        }
+
+    }
+
+    private void checkBundle(Bundle bundle) throws DeploymentException {
+        log.info("checking bundle " + bundle);
+        File infoFile = bundle.getBundleContext().getDataFile(PLAN_LOCATION);
+        URL url = null;
+        if (infoFile != null && infoFile.exists()) {
+            try {
+                url = infoFile.toURI().toURL();
+            } catch (MalformedURLException e) {
+                //??
+            }
+        }
+        if (url == null) {
+            url = bundle.getEntry(PLAN_LOCATION);
+        }
+        if (url == null) {
+            URL specDDUrl = bundle.getEntry("META-INF/ra.xml");
+            Connector connector = null;
+            Thread currentThread = Thread.currentThread();
+            ClassLoader oldTCCL = currentThread.getContextClassLoader();
+            currentThread.setContextClassLoader(getClass().getClassLoader());
+            if (specDDUrl != null) {
+                try {
+                    InputStream in = specDDUrl.openStream();
+                    try {
+                        connector = (Connector) JaxbJavaee.unmarshalJavaee(Connector.class, in);
+                    } catch (JAXBException e) {
+                        in.close();
+                        in = specDDUrl.openStream();
+                        Connector10 connector10 = (Connector10) JaxbJavaee.unmarshalJavaee(Connector10.class, in);
+                        connector = Connector.newConnector(connector10);
+                    } finally {
+                        in.close();
+                    }
+                } catch (SAXException e) {
+                    throw new DeploymentException("Cannot parse the ra.xml file: " + specDDUrl.toExternalForm(), e);
+                } catch (JAXBException e) {
+                    throw new DeploymentException("Cannot unmarshall the ra.xml file: " + specDDUrl.toExternalForm(), e);
+                } catch (Exception e) {
+                    throw new DeploymentException("Encountered unknown error parsing the ra.xml file: " + specDDUrl.toExternalForm(), e);
+                }
+            }
+            ConnectorType connectorType = null;
+            // load the geronimo connector plan from either the supplied plan or from the earFile
+            URL path = bundle.getEntry("META-INF/geronimo-ra.xml");
+            if (path != null) {
+                try {
+                    InputStream in;
+                        in = path.openStream();
+                    try {
+                        connectorType = JaxbUtil.unmarshal(in, false);
+                    } finally {
+                        in.close();
+                    }
+                } catch (XMLStreamException e) {
+                    throw new DeploymentException("Cannot unmarshall the geronimo-ra.xml file: " + path.toExternalForm(), e);
+                } catch (JAXBException e) {
+                    throw new DeploymentException("Cannot unmarshall the geronimo-ra.xml file: " + path.toExternalForm(), e);
+                } catch (IOException e) {
+                    throw new DeploymentException("Cannot unmarshall the geronimo-ra.xml file: " + path.toExternalForm(), e);
+                }
+            }
+            currentThread.setContextClassLoader(oldTCCL);
+            BundleAnnotationFinder classFinder;
+            try {
+                classFinder = new BundleAnnotationFinder(packageAdmin, bundle);
+            } catch (Exception e) {
+                throw new DeploymentException("could not create class finder for rar bundle " + bundle, e);
+            }
+            connector = new AnnotationProcessor().mergeMetadata(bundle, classFinder, connector);
+            if (connector == null) {
+                return;
+            }
+            if (connector != null && path == null) {
+                    throw new DeploymentException("A connector module must be deployed using a Geronimo deployment plan" +
+                            " (either META-INF/geronimo-ra.xml in the RAR file or a standalone deployment plan passed to the deployer).");
+            }
+            log.info("deploying rar bundle");
+            File planFile = bundle.getBundleContext().getDataFile(PLAN_LOCATION);
+            try {
+                ResourceAdapterModuleInfo info = new InfoBuilder().configureConnector(connector, connectorType, bundle);
+                FileOutputStream baos = new FileOutputStream(planFile);
+                ObjectOutputStream out = new ObjectOutputStream(baos);
+                out.writeObject(info);
+                out.flush();
+                out.close();
+            } catch (IOException e) {
+                throw new DeploymentException(e);
+            }
+
+
+        }
+    }
+
+    public void bindPackageAdmin(PackageAdmin packageAdmin) {
+        this.packageAdmin = packageAdmin;
+    }
+    public void unbindPackageAdmin(PackageAdmin packageAdmin) {
+        if (this.packageAdmin == packageAdmin) {
+            this.packageAdmin = null;
+        }
+    }
+
+}

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/AdminobjectInstanceType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/AdminobjectInstanceType.java?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/AdminobjectInstanceType.java (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/AdminobjectInstanceType.java Thu Mar  3 23:29:22 2011
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2011.02.25 at 01:20:32 AM PST 
+// Generated on: 2011.02.28 at 03:28:36 PM PST 
 //
 
 

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/AdminobjectType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/AdminobjectType.java?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/AdminobjectType.java (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/AdminobjectType.java Thu Mar  3 23:29:22 2011
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2011.02.25 at 01:20:32 AM PST 
+// Generated on: 2011.02.28 at 03:28:36 PM PST 
 //
 
 

Added: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ArtifactType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ArtifactType.java?rev=1076881&view=auto
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ArtifactType.java (added)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ArtifactType.java Thu Mar  3 23:29:22 2011
@@ -0,0 +1,184 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.02.28 at 03:28:36 PM PST 
+//
+
+
+package org.apache.geronimo.connector.deployment.plan;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * 
+ *                 
+ *                 Refers to either another module running in the server, or
+ *                 an entry in the server's Repository.  In either case this effectively uses a
+ *                 URI.
+ * 
+ *                 When this is pointing to a repository entry, the URI must have a form
+ *                 acceptable to the repository, which is currently a URI consisting of
+ *                 Maven-style identifiers separated by slashes (groupId/artifactId/version/type,
+ *                 for example, the URI "postgresql/postgresql-8.0-jdbc/313/jar" for a file like
+ *                 "repository/postgresql/postgresql-8.0-jdbc-313.jar").
+ * 
+ *                 When this is pointing to a module, the URI should match the
+ *                 module's moduleId.  This also looks
+ *                 like a Maven-style URI discussed above.
+ * 
+ *                 The artifactType element can take either a straight URI (as in the examples
+ *                 above), or maven-style identifier fragments (groupId, type, artifactId, and
+ *                 version), which it will compose into a URI by adding up the fragments with
+ *                 slashes in between.
+ * 
+ *                 There is a correspondence between the xml format and a URI.  For example, the URI
+ * 
+ *                 postgresql/postgresql-8.0-jdbc/313/jar
+ * 
+ *                 corresponds to the xml:
+ * 
+ *                 <groupId>postgresql</groupId>
+ *                 <artifactId>postgresql-8.0-jdbc</artifactId>
+ *                 <version>313</version>
+ *                 <type>jar</type>
+ * 	            
+ *             
+ * 
+ * <p>Java class for artifactType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="artifactType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="groupId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="artifactId" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "artifactType", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", propOrder = {
+    "groupId",
+    "artifactId",
+    "version",
+    "type"
+})
+public class ArtifactType {
+
+    protected String groupId;
+    @XmlElement(required = true)
+    protected String artifactId;
+    protected String version;
+    protected String type;
+
+    /**
+     * Gets the value of the groupId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getGroupId() {
+        return groupId;
+    }
+
+    /**
+     * Sets the value of the groupId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setGroupId(String value) {
+        this.groupId = value;
+    }
+
+    /**
+     * Gets the value of the artifactId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getArtifactId() {
+        return artifactId;
+    }
+
+    /**
+     * Sets the value of the artifactId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setArtifactId(String value) {
+        this.artifactId = value;
+    }
+
+    /**
+     * Gets the value of the version property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * Sets the value of the version property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setVersion(String value) {
+        this.version = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setType(String value) {
+        this.type = value;
+    }
+
+}

Propchange: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ArtifactType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ArtifactType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ArtifactType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ConfigPropertySettingType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ConfigPropertySettingType.java?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ConfigPropertySettingType.java (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ConfigPropertySettingType.java Thu Mar  3 23:29:22 2011
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2011.02.25 at 01:20:32 AM PST 
+// Generated on: 2011.02.28 at 03:28:36 PM PST 
 //
 
 

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ConnectionDefinitionType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ConnectionDefinitionType.java?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ConnectionDefinitionType.java (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ConnectionDefinitionType.java Thu Mar  3 23:29:22 2011
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2011.02.25 at 01:20:32 AM PST 
+// Generated on: 2011.02.28 at 03:28:36 PM PST 
 //
 
 

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ConnectiondefinitionInstanceType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ConnectiondefinitionInstanceType.java?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ConnectiondefinitionInstanceType.java (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ConnectiondefinitionInstanceType.java Thu Mar  3 23:29:22 2011
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2011.02.25 at 01:20:32 AM PST 
+// Generated on: 2011.02.28 at 03:28:36 PM PST 
 //
 
 

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ConnectionmanagerType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ConnectionmanagerType.java?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ConnectionmanagerType.java (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ConnectionmanagerType.java Thu Mar  3 23:29:22 2011
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2011.02.25 at 01:20:32 AM PST 
+// Generated on: 2011.02.28 at 03:28:36 PM PST 
 //
 
 

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ConnectorType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ConnectorType.java?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ConnectorType.java (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/ConnectorType.java Thu Mar  3 23:29:22 2011
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2011.02.25 at 01:20:32 AM PST 
+// Generated on: 2011.02.28 at 03:28:36 PM PST 
 //
 
 
@@ -34,6 +34,7 @@ import javax.xml.bind.annotation.XmlType
  *   &lt;complexContent>
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;sequence>
+ *         &lt;element ref="{http://geronimo.apache.org/xml/ns/deployment-1.2}environment" minOccurs="0"/>
  *         &lt;element name="resourceadapter" type="{http://geronimo.apache.org/xml/ns/j2ee/connector-1.2}resourceadapterType" maxOccurs="unbounded"/>
  *         &lt;element name="adminobject" type="{http://geronimo.apache.org/xml/ns/j2ee/connector-1.2}adminobjectType" maxOccurs="unbounded" minOccurs="0"/>
  *       &lt;/sequence>
@@ -46,16 +47,46 @@ import javax.xml.bind.annotation.XmlType
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "connectorType", propOrder = {
+    "environment",
     "resourceadapter",
     "adminobject"
 })
 public class ConnectorType {
 
+    @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
+    protected EnvironmentType environment;
     @XmlElement(required = true)
     protected List<ResourceadapterType> resourceadapter;
     protected List<AdminobjectType> adminobject;
 
     /**
+     * 
+     *                         Reference to environment element defined in imported
+     *                         "geronimo-module-1.2.xsd"
+     *                     
+     * 
+     * @return
+     *     possible object is
+     *     {@link EnvironmentType }
+     *     
+     */
+    public EnvironmentType getEnvironment() {
+        return environment;
+    }
+
+    /**
+     * Sets the value of the environment property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link EnvironmentType }
+     *     
+     */
+    public void setEnvironment(EnvironmentType value) {
+        this.environment = value;
+    }
+
+    /**
      * Gets the value of the resourceadapter property.
      * 
      * <p>

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/DescriptionType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/DescriptionType.java?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/DescriptionType.java (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/DescriptionType.java Thu Mar  3 23:29:22 2011
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2011.02.25 at 01:20:32 AM PST 
+// Generated on: 2011.02.28 at 03:28:36 PM PST 
 //
 
 

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/EmptyType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/EmptyType.java?rev=1076881&r1=1076880&r2=1076881&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/EmptyType.java (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/plan/EmptyType.java Thu Mar  3 23:29:22 2011
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2011.02.25 at 01:20:32 AM PST 
+// Generated on: 2011.02.28 at 03:28:36 PM PST 
 //
 
 



Mime
View raw message