You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/10/20 20:23:42 UTC

svn commit: r706357 [1/13] - in /geronimo/server/trunk/plugins/connector-1_6: ./ client-transaction-1_6/ client-transaction-1_6/src/ client-transaction-1_6/src/main/ client-transaction-1_6/src/main/history/ client-transaction-1_6/src/main/plan/ client-...

Author: djencks
Date: Mon Oct 20 11:23:36 2008
New Revision: 706357

URL: http://svn.apache.org/viewvc?rev=706357&view=rev
Log:
GERONIMO-4360 make copy of connector plugin area for 1.6 spec implementation work.  Hopefully the diff part of this change can be reverted when we actually move to 1.6 spec

Added:
    geronimo/server/trunk/plugins/connector-1_6/
      - copied from r706342, geronimo/server/trunk/plugins/connector/
    geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/
    geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/
    geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/
    geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/history/
    geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/history/dependencies.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/plan/
    geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/plan/plan.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/
    geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/pom.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/
    geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/
    geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/
    geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/plan/
    geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/plan/plan.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapperGBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/AdminObjectWrapper.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/AdminObjectWrapperGBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/DatabaseInitializationGBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/GeronimoBootstrapContextGBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/JCAResourceImpl.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/JCAResourceImplGBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/ResourceAdapterImpl.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/ResourceAdapterImplGBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/ResourceAdapterModuleImpl.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/ResourceAdapterModuleImplGBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/ResourceAdapterWrapperGBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/naming/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/outbound/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/outbound/AbstractConnectionManagerGBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImpl.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImplGBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperGBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorGBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/outbound/security/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/outbound/security/CallerIdentityPasswordCredentialLoginModule.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModuleWrapper.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModuleWrapperGBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/outbound/transactionlog/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/outbound/transactionlog/JDBCLog.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/outbound/transactionlog/JDBCLogGBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/pool/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/AdminObjectWrapperTest.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/mock/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/outbound/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBeanSerializationTest.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/outbound/connectiontracking/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/outbound/security/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/outbound/security/GBeanTest.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/work/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorPlanRectifier.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/RARConfiguration.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/RARConfigurer.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/dconfigbean/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/dconfigbean/AdminObjectDConfigBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/dconfigbean/AdminObjectInstance.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/dconfigbean/ConfigPropertiesHelper.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/dconfigbean/ConfigPropertySettingDConfigBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/dconfigbean/ConfigPropertySettings.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/dconfigbean/ConnectionDefinitionDConfigBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/dconfigbean/ConnectionDefinitionDConfigBeanBeanInfo.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/dconfigbean/ConnectionDefinitionInstance.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/dconfigbean/ConnectionDefinitionInstanceBeanInfo.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapterDConfigBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapterDConfigRoot.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapter_1_0DConfigRoot.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/jsr88/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/jsr88/AdminObjectDCB.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/jsr88/AdminObjectInstance.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/jsr88/ConfigHolder.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/jsr88/ConfigPropertySetting.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/jsr88/ConnectionDefinition.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/jsr88/ConnectionDefinitionInstance.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/jsr88/ConnectionManager.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/jsr88/Connector15DCBRoot.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/jsr88/ConnectorDCB.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/jsr88/PartitionedPool.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/jsr88/ResourceAdapter.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/jsr88/ResourceAdapterInstance.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/jsr88/SinglePool.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/xsd/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/xsd/geronimo-connector-1.2.xsd   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/xsdconfig/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/xsdconfig/xmlconfig.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/data/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/MockRARDeployable.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/RAR_1_0DConfigBeanTest.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/RAR_1_5DConfigBeanTest.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/SchemaConversionTest.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/AnnotationHelperTest.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/ResourceAnnotationTest.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/jsr88/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/jsr88/Connector15DCBTest.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/ConnectionFactoryExtension.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockActivationSpec.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockAdminObject.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockAdminObjectImpl.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockCCILocalTransaction.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockConnection.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockConnectionFactory.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockConnectionRequestInfo.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockManagedConnection.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockManagedConnectionFactory.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockResourceAdapter.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockSPILocalTransaction.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/mock/MockXAResource.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/annotation/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/annotation/empty-web-src.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/annotation/resource-ref-expected.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_0/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_0/geronimo-ra.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_0/ra.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5/geronimo-ra.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5/ra.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5_localtx/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5_localtx/geronimo-ra.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5_localtx/ra.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5_notx/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5_notx/geronimo-ra.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5_notx/ra.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/data/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/data/dup-admin-object-name.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/data/dup-connectionfactoryinstance-name.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/data/dup-resourceadapter-name.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/data/external-application-plan.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/data/groups.properties   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/data/login.config
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/data/old-schema-plan.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/data/users.properties   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/database.rar   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/ear/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/ear/application.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/ear/geronimo-application.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/j2ee_1_3dtd/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/j2ee_1_3dtd/ra-10.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/j2ee_1_3dtd/ra-15.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/jms-plan.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/jms.rar   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/plan-with-nulls.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/script/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/script/test-setup.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/pom.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/main/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/main/java/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/main/java/org/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/main/java/org/apache/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/main/java/org/apache/geronimo/transaction/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/main/java/org/apache/geronimo/transaction/log/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/main/java/org/apache/geronimo/transaction/log/HOWLLogGBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/main/java/org/apache/geronimo/transaction/manager/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/main/java/org/apache/geronimo/transaction/manager/GeronimoTransactionManagerGBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/main/java/org/apache/geronimo/transaction/manager/XidFactoryImplGBean.java   (with props)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/test/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/test/java/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/test/java/org/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/test/java/org/apache/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/test/java/org/apache/geronimo/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/test/java/org/apache/geronimo/transaction/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/test/java/org/apache/geronimo/transaction/context/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/test/java/org/apache/geronimo/transaction/log/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/src/test/java/org/apache/geronimo/transaction/manager/
    geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/
    geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/
    geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/
    geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/
    geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml   (with props)
    geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/plan/
    geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/plan/plan.xml   (with props)
Removed:
    geronimo/server/trunk/plugins/connector-1_6/client-transaction/
    geronimo/server/trunk/plugins/connector-1_6/connector-deployer/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder/
    geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction/
    geronimo/server/trunk/plugins/connector-1_6/transaction/
Modified:
    geronimo/server/trunk/plugins/connector-1_6/pom.xml

Added: geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml?rev=706357&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml (added)
+++ geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml Mon Oct 20 11:23:36 2008
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>connector-1_6</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+    
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>client-transaction-1_6</artifactId>
+    <name>Geronimo Plugins, Connector :: Client transaction</name>
+    <packaging>car</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        
+        <!-- parent config -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-security</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <!-- connector deploys jsr77 beans hence needs j2ee, mgmt -->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector-1_6</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.components</groupId>-->
+            <!--<artifactId>geronimo-connector</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-transaction</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.components</groupId>-->
+            <!--<artifactId>geronimo-transaction</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-persistence-jpa10</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-transformer</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <category>Geronimo Core</category>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content load="false"/>
+                            <artifact-alias server="client" key="org.apache.geronimo.configs/transaction-1_6//car">org.apache.geronimo.configs/client-transaction-1_6/${version}/car</artifact-alias>
+                            <artifact-alias server="client" key="org.apache.geronimo.configs/transaction-1_6/${version}/car">org.apache.geronimo.configs/client-transaction-1_6/${version}/car</artifact-alias>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/history/dependencies.xml?rev=706357&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/history/dependencies.xml (added)
+++ geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/history/dependencies.xml Mon Oct 20 11:23:36 2008
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+    <module-id>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>client-transaction-1_6</artifactId>
+        <version>2.2-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-connector-1_6</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>client-security</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.components</groupId>
+        <artifactId>geronimo-transaction</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.components</groupId>
+        <artifactId>geronimo-connector</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>client</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.objectweb.howl</groupId>
+        <artifactId>howl</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-transaction-1_6</artifactId>
+        <type>jar</type>
+    </dependency>
+</plugin-artifact>

Propchange: geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/plan/plan.xml?rev=706357&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/plan/plan.xml Mon Oct 20 11:23:36 2008
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <!--client connector support-->
+    <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+        <!-- Turn off lazyConnect, it leaks connections. May need to revert the function -->
+        <attribute name="lazyConnect">false</attribute>
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
+        </reference>
+    </gbean>
+
+    <gbean name="DefaultWorkManager" class="org.apache.geronimo.connector.work.GeronimoWorkManagerGBean">
+        <reference name="SyncPool">
+            <name>DefaultThreadPool</name>
+        </reference>
+        <reference name="StartPool">
+            <name>DefaultThreadPool</name>
+        </reference>
+        <reference name="ScheduledPool">
+            <name>DefaultThreadPool</name>
+        </reference>
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
+        </reference>
+    </gbean>
+
+    <gbean name="XidFactory" class="org.apache.geronimo.transaction.manager.XidFactoryImplGBean">
+        <attribute name="tmId">71,84,77,73,68</attribute>
+    </gbean>
+
+    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.GeronimoTransactionManagerGBean">
+        <!--no transaction log on the client-->
+        <attribute name="defaultTransactionTimeoutSeconds">600</attribute>
+        <reference name="XidFactory">
+            <name>XidFactory</name>
+        </reference>
+    </gbean>
+
+    <gbean name="TransactionManagerBinding" class="org.apache.geronimo.gjndi.binding.GBeanBinding">
+        <attribute name="name">TransactionManager</attribute>
+        <attribute name="abstractNameQuery">?name=TransactionManager#</attribute>
+        <reference name="Context">
+            <name>JavaContext</name>
+        </reference>
+    </gbean>
+    <gbean name="TransactionSynchronizationRegistryBinding" class="org.apache.geronimo.gjndi.binding.GBeanBinding">
+        <attribute name="name">TransactionSynchronizationRegistry</attribute>
+        <attribute name="abstractNameQuery">?name=TransactionManager#</attribute>
+        <reference name="Context">
+            <name>JavaContext</name>
+        </reference>
+    </gbean>
+
+</module>

Propchange: geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/pom.xml?rev=706357&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/pom.xml (added)
+++ geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/pom.xml Mon Oct 20 11:23:36 2008
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>connector-1_6</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+    
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>connector-deployer-1_6</artifactId>
+    <name>Geronimo Plugins, Connector :: Deployer</name>
+    <packaging>car</packaging>
+
+    <description>
+        Deployer for J2CA connectors
+    </description>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>transaction-1_6</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector-builder-1_6</artifactId>
+            <version>${version}</version>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/resources/schema</outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-connector-builder-1_6</artifactId>
+                                    <version>${version}</version>
+                                </artifactItem>
+                            </artifactItems>
+                            <includes>**/*.xsd</includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>false</value>
+                    </useMavenDependencies>
+                    <category>Connector</category>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-connector-builder-1_6</artifactId>
+                            <type>jar</type>
+                            <import>classes</import>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>transaction-1_6</artifactId>
+                            <type>car</type>
+                            <import>classes</import>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>j2ee-deployer</artifactId>
+                            <type>car</type>
+                        </dependency>
+                    </dependencies>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content>
+                                <gbean name="ResourceRefBuilder">
+                                    <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+                                    <attribute name="corbaEnvironment" propertyEditor="org.apache.geronimo.deployment.service.EnvironmentBuilder">
+                                        <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                                            <dependencies>
+                                                <dependency>
+                                                    <groupId>org.apache.geronimo.configs</groupId>
+                                                    <artifactId>j2ee-corba-yoko</artifactId>
+                                                    <type>car</type>
+                                                </dependency>
+                                            </dependencies>
+                                        </environment>
+                                    </attribute>
+                                </gbean>
+
+                                <gbean name="AdminObjectRefBuilder">
+                                    <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+                                </gbean>
+
+                                <gbean name="ClientResourceRefBuilder">
+                                    <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+                                    <attribute name="corbaEnvironment" propertyEditor="org.apache.geronimo.deployment.service.EnvironmentBuilder">
+                                        <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                                            <dependencies>
+                                                <dependency>
+                                                    <groupId>org.apache.geronimo.configs</groupId>
+                                                    <artifactId>client-corba-yoko</artifactId>
+                                                    <type>car</type>
+                                                </dependency>
+                                            </dependencies>
+                                        </environment>
+                                    </attribute>
+                                </gbean>
+                            </config-xml-content>
+                            <config-xml-content server="offline"/>
+                            <copy-file dest-dir="schema">schema/schemaorg_apache_xmlbeans/src/</copy-file>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml?rev=706357&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml (added)
+++ geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml Mon Oct 20 11:23:36 2008
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+    <module-id>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>connector-deployer-1_6</artifactId>
+        <version>2.2-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+    <dependency start="true">
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>transaction-1_6</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency start="true">
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-connector-builder-1_6</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency start="true">
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>j2ee-deployer</artifactId>
+        <type>car</type>
+    </dependency>
+</plugin-artifact>

Propchange: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/plan/plan.xml?rev=706357&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/plan/plan.xml Mon Oct 20 11:23:36 2008
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="ConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
+        <attribute name="defaultMaxSize">10</attribute>
+        <attribute name="defaultMinSize">0</attribute>
+        <attribute name="defaultBlockingTimeoutMilliseconds">5000</attribute>
+        <attribute name="defaultIdleTimeoutMinutes">15</attribute>
+        <attribute name="defaultXATransactionCaching">true</attribute>
+        <attribute name="defaultXAThreadCaching">false</attribute>
+        <attribute name="defaultWorkManagerName">DefaultWorkManager</attribute>
+        <reference name="ServiceBuilders">
+            <name>GBeanBuilder</name>
+        </reference>
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+                <dependencies>
+                    <dependency>
+                        <groupId>${pom.groupId}</groupId>
+                        <artifactId>transaction</artifactId>
+                        <type>car</type>
+                    </dependency>
+                    <dependency>
+                        <groupId>${pom.groupId}</groupId>
+                        <artifactId>j2ee-server</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+    <gbean name="ResourceRefBuilder" class="org.apache.geronimo.connector.deployment.ResourceRefBuilder">
+        <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+        <xml-attribute name="corbaEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}"/>
+        </xml-attribute>
+        <reference name="CorbaGBeanNameSource">
+            <name>EARBuilder</name>
+        </reference>
+    </gbean>
+
+    <gbean name="AdminObjectRefBuilder" class="org.apache.geronimo.connector.deployment.AdminObjectRefBuilder">
+        <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+    </gbean>
+
+    <gbean name="ClientConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
+        <attribute name="defaultMaxSize">10</attribute>
+        <attribute name="defaultMinSize">0</attribute>
+        <attribute name="defaultBlockingTimeoutMilliseconds">5000</attribute>
+        <attribute name="defaultIdleTimeoutMinutes">15</attribute>
+        <attribute name="defaultXATransactionCaching">true</attribute>
+        <attribute name="defaultXAThreadCaching">false</attribute>
+        <reference name="ServiceBuilders">
+            <name>GBeanBuilder</name>
+        </reference>
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+                <dependencies>
+                    <dependency>
+                        <groupId>${pom.groupId}</groupId>
+                        <artifactId>client-transaction</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+    <gbean name="ClientResourceRefBuilder" class="org.apache.geronimo.connector.deployment.ResourceRefBuilder">
+        <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+        <xml-attribute name="corbaEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}"/>
+        </xml-attribute>
+        <reference name="CorbaGBeanNameSource">
+            <name>AppClientBuilder</name>
+        </reference>
+    </gbean>
+
+    <gbean name="ClientAdminObjectRefBuilder" class="org.apache.geronimo.connector.deployment.AdminObjectRefBuilder">
+        <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+    </gbean>
+
+</module>

Propchange: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml?rev=706357&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml (added)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml Mon Oct 20 11:23:36 2008
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>connector-1_6</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+    
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>geronimo-connector-1_6</artifactId>
+    <name>Geronimo Plugins, Connector :: Core</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.components</groupId>
+            <artifactId>geronimo-connector</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.components</groupId>
+            <artifactId>geronimo-connector</artifactId>
+            <classifier>tests</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-naming</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <!-- Needed only for DeploymentException in a test, from NameFactory which probably shouldn't be throwing it in the first place-->
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-deployment</artifactId>
+            <version>${version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-security</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <!-- g-system, g-management come from this via g-j2ee -->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-transaction-1_6</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+        </dependency>
+
+        <!-- needed for passwordcredential realm-->
+        <!--<dependency>-->
+            <!--<groupId>regexp</groupId>-->
+            <!--<artifactId>regexp</artifactId>-->
+        <!--</dependency>-->
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl104-over-slf4j</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
+

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapperGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapperGBean.java?rev=706357&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapperGBean.java (added)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapperGBean.java Mon Oct 20 11:23:36 2008
@@ -0,0 +1,110 @@
+/**
+ *  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;
+
+import javax.resource.spi.endpoint.MessageEndpointFactory;
+
+import org.apache.geronimo.gbean.DynamicGBean;
+import org.apache.geronimo.gbean.DynamicGBeanDelegate;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+
+/**
+ * 
+ * @version $Revision$
+ */
+public class ActivationSpecWrapperGBean extends ActivationSpecWrapper implements DynamicGBean {
+
+    private final DynamicGBeanDelegate delegate;
+
+    public ActivationSpecWrapperGBean() {
+        delegate = null;
+    }
+
+    public ActivationSpecWrapperGBean(final String activationSpecClass, final String containerId, final ResourceAdapterWrapper resourceAdapterWrapper, final ClassLoader cl) throws IllegalAccessException, InstantiationException, ClassNotFoundException {
+        super(activationSpecClass, containerId, resourceAdapterWrapper, cl);
+        delegate = new DynamicGBeanDelegate();
+        delegate.addAll(activationSpec);
+    }
+
+    //DynamicGBean implementation
+
+    /**
+     * Delegating DynamicGBean getAttribute method.
+     *
+     * @param name of attribute.
+     * @return attribute value.
+     * @throws Exception
+     */
+    public Object getAttribute(final String name) throws Exception {
+        return delegate.getAttribute(name);
+    }
+
+    /**
+     * Delegating DynamicGBean setAttribute method.
+     *
+     * @param name  of attribute.
+     * @param value of attribute to be set.
+     * @throws Exception
+     */
+    public void setAttribute(final String name, final Object value) throws Exception {
+        delegate.setAttribute(name, value);
+    }
+
+    /**
+     * no-op DynamicGBean method
+     *
+     * @param name
+     * @param arguments
+     * @param types
+     * @return nothing, there are no operations.
+     * @throws Exception
+     */
+    public Object invoke(final String name, final Object[] arguments, final String[] types) throws Exception {
+        //we have no dynamic operations.
+        return null;
+    }
+
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(ActivationSpecWrapperGBean.class, NameFactory.JCA_ACTIVATION_SPEC);
+        infoBuilder.addAttribute("activationSpecClass", String.class, true);
+        infoBuilder.addAttribute("containerId", String.class, true);
+        infoBuilder.addAttribute("classLoader", ClassLoader.class, false);
+
+        infoBuilder.addReference("ResourceAdapterWrapper", ResourceAdapterWrapper.class, NameFactory.RESOURCE_ADAPTER);
+
+        infoBuilder.addOperation("activate", new Class[]{MessageEndpointFactory.class});
+        infoBuilder.addOperation("deactivate", new Class[]{MessageEndpointFactory.class});
+
+        infoBuilder.setConstructor(new String[]{
+            "activationSpecClass",
+            "containerId",
+            "ResourceAdapterWrapper",
+            "classLoader"});
+
+        GBEAN_INFO = infoBuilder.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+
+}

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapperGBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapperGBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapperGBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/AdminObjectWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/AdminObjectWrapper.java?rev=706357&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/AdminObjectWrapper.java (added)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/AdminObjectWrapper.java Mon Oct 20 11:23:36 2008
@@ -0,0 +1,229 @@
+/**
+ *  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;
+
+import java.lang.reflect.Constructor;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.resource.spi.ResourceAdapterAssociation;
+
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.DynamicGBean;
+import org.apache.geronimo.gbean.DynamicGBeanDelegate;
+import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.naming.ResourceSource;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.management.geronimo.JCAAdminObject;
+
+/**
+ * Wrapper around AdminObject that exposes its config-properties as GBeanAttributes and
+ * supplies a disconnectable proxy to bind in jndi.
+ *
+ * @version $Rev$ $Date$
+ */
+public class AdminObjectWrapper implements DynamicGBean, JCAAdminObject, ResourceSource<RuntimeException>, GBeanLifecycle {
+
+    private final String adminObjectInterface;
+    private final String adminObjectClass;
+    private final ResourceAdapterWrapper resourceAdapterWrapper;
+
+    private final DynamicGBeanDelegate delegate;
+    private final Object adminObject;
+
+
+    private final Kernel kernel;
+    private final AbstractName abstractName;
+    private final String objectName;
+
+    /**
+     * Normal managed constructor.
+     *
+     * @param adminObjectInterface Interface the proxy will implement.
+     * @param adminObjectClass Class of admin object to be wrapped.
+     * @throws IllegalAccessException
+     * @throws InstantiationException
+     */
+    public AdminObjectWrapper(final String adminObjectInterface,
+                              final String adminObjectClass,
+                              final ResourceAdapterWrapper resourceAdapterWrapper,
+                              final Kernel kernel,
+                              final AbstractName abstractName,
+                              final String objectName,
+                              final ClassLoader cl) throws IllegalAccessException, InstantiationException, ClassNotFoundException {
+        this.adminObjectInterface = adminObjectInterface;
+        this.adminObjectClass = adminObjectClass;
+        this.resourceAdapterWrapper = resourceAdapterWrapper;
+        this.kernel = kernel;
+        this.abstractName = abstractName;
+        this.objectName = objectName;
+        Class clazz = cl.loadClass(adminObjectClass);
+        adminObject = clazz.newInstance();
+        delegate = new DynamicGBeanDelegate();
+        delegate.addAll(adminObject);
+    }
+
+    public String getAdminObjectInterface() {
+        return adminObjectInterface;
+    }
+
+    /**
+     * Returns class of wrapped AdminObject.
+     * @return class of wrapped AdminObject
+     */
+    public String getAdminObjectClass() {
+        return adminObjectClass;
+    }
+
+    /**
+     * Returns disconnectable proxy for binding in jndi.
+     * @return proxy implementing adminObjectInterface.
+     */
+    public Object $getResource() {
+        return adminObject;
+    }
+
+
+    //DynamicGBean implementation
+
+    /**
+     * Delegating DynamicGBean getAttribute method.
+     * @param name of attribute.
+     * @return attribute value.
+     * @throws Exception
+     */
+    public Object getAttribute(final String name) throws Exception {
+        return delegate.getAttribute(name);
+    }
+
+    /**
+     * Delegating DynamicGBean setAttribute method.
+     * @param name of attribute.
+     * @param value of attribute to be set.
+     * @throws Exception
+     */
+    public void setAttribute(final String name, final Object value) throws Exception {
+        delegate.setAttribute(name, value);
+    }
+
+    /**
+     * no-op DynamicGBean method
+     * @param name
+     * @param arguments
+     * @param types
+     * @return nothing, there are no operations.
+     * @throws Exception
+     */
+    public Object invoke(final String name, final Object[] arguments, final String[] types) throws Exception {
+        //we have no dynamic operations.
+        return null;
+    }
+
+    /**
+     * Gets the config properties in the form of a map where the key is the
+     * property name and the value is property type (as a String not a Class).
+     */
+    public Map getConfigProperties() {
+        String[] props = delegate.getProperties();
+        Map map = new HashMap();
+        for (int i = 0; i < props.length; i++) {
+            String prop = props[i];
+            if(prop.equals("logWriter")) {
+                continue;
+            }
+            map.put(prop, delegate.getPropertyType(prop));
+        }
+        return map;
+    }
+
+    public void setConfigProperty(String property, Object value) throws Exception {
+        Class cls = delegate.getPropertyType(property);
+        if(value != null && value instanceof String && !cls.getName().equals("java.lang.String")) {
+            if(cls.isPrimitive()) {
+                if(cls.equals(int.class)) {
+                    cls = Integer.class;
+                } else if(cls.equals(boolean.class)) {
+                    cls = Boolean.class;
+                } else if(cls.equals(float.class)) {
+                    cls = Float.class;
+                } else if(cls.equals(double.class)) {
+                    cls = Double.class;
+                } else if(cls.equals(long.class)) {
+                    cls = Long.class;
+                } else if(cls.equals(short.class)) {
+                    cls = Short.class;
+                } else if(cls.equals(byte.class)) {
+                    cls = Byte.class;
+                } else if(cls.equals(char.class)) {
+                    cls = Character.class;
+                }
+            }
+            Constructor con = cls.getConstructor(new Class[]{String.class});
+            value = con.newInstance(new Object[]{value});
+        }
+        kernel.setAttribute(abstractName, property, value);
+    }
+
+    public Object getConfigProperty(String property) throws Exception {
+        return delegate.getAttribute(property);
+    }
+
+    public String getObjectName() {
+        return objectName;
+    }
+
+    public boolean isStateManageable() {
+        return false;
+    }
+
+    public boolean isStatisticsProvider() {
+        return false;
+    }
+
+    public boolean isEventProvider() {
+        return false;
+    }
+
+    /**
+     * Starts the GBean.  This informs the GBean that it is about to transition to the running state.
+     *
+     * @throws Exception if the target failed to start; this will cause a transition to the failed state
+     */
+    public void doStart() throws Exception {
+        if (adminObject instanceof ResourceAdapterAssociation) {
+            if (resourceAdapterWrapper == null) {
+                throw new IllegalStateException("Admin object expects to be registered with a ResourceAdapter, but there is no ResourceAdapter");
+            }
+            resourceAdapterWrapper.registerResourceAdapterAssociation((ResourceAdapterAssociation) adminObject);
+        }
+    }
+
+    /**
+     * Stops the target.  This informs the GBean that it is about to transition to the stopped state.
+     *
+     * @throws Exception if the target failed to stop; this will cause a transition to the failed state
+     */
+    public void doStop() throws Exception {
+    }
+
+    /**
+     * Fails the GBean.  This informs the GBean that it is about to transition to the failed state.
+     */
+    public void doFail() {
+    }
+}

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/AdminObjectWrapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/AdminObjectWrapper.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/AdminObjectWrapper.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/AdminObjectWrapperGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/AdminObjectWrapperGBean.java?rev=706357&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/AdminObjectWrapperGBean.java (added)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/AdminObjectWrapperGBean.java Mon Oct 20 11:23:36 2008
@@ -0,0 +1,64 @@
+/**
+ *  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;
+
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.management.geronimo.JCAAdminObject;
+
+/**
+ * @version $Revision$
+ */
+public class AdminObjectWrapperGBean {
+
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(AdminObjectWrapperGBean.class, AdminObjectWrapper.class, NameFactory.JCA_ADMIN_OBJECT);
+        infoBuilder.addAttribute("adminObjectInterface", String.class, true);
+        infoBuilder.addAttribute("adminObjectClass", String.class, true);
+        infoBuilder.addReference("ResourceAdapterWrapper", ResourceAdapterWrapper.class, NameFactory.JCA_RESOURCE_ADAPTER);
+        infoBuilder.addAttribute("kernel", Kernel.class, false);
+        infoBuilder.addAttribute("abstractName", AbstractName.class, false);
+        infoBuilder.addAttribute("objectName", String.class, false);
+        infoBuilder.addAttribute("classLoader", ClassLoader.class, false);
+
+        infoBuilder.addOperation("$getResource");
+        infoBuilder.addInterface(JCAAdminObject.class);
+
+        infoBuilder.setConstructor(new String[]{
+                "adminObjectInterface",
+                "adminObjectClass",
+                "ResourceAdapterWrapper",
+                "kernel",
+                "abstractName",
+                "objectName",
+                "classLoader"
+        });
+
+        GBEAN_INFO = infoBuilder.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+
+}

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/AdminObjectWrapperGBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/AdminObjectWrapperGBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/AdminObjectWrapperGBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain