[jboss-cvs] JBossAS SVN: r100716 - trunk/connector/src/main/java/org/jboss/resource/deployers.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2010-02-08 14:10:14 -0500 (Mon, 08 Feb 2010)
New Revision: 100716

Modified:
   trunk/connector/src/main/java/org/jboss/resource/deployers/ManagedConnectionFactoryDeployer.java
Log:
[JBAS-7438]; deployer overrides ServiceMD attachment.

Modified: trunk/connector/src/main/java/org/jboss/resource/deployers/ManagedConnectionFactoryDeployer.java
===================================================================
--- trunk/connector/src/main/java/org/jboss/resource/deployers/ManagedConnectionFactoryDeployer.java	2010-02-08 18:57:13 UTC (rev 100715)
+++ trunk/connector/src/main/java/org/jboss/resource/deployers/ManagedConnectionFactoryDeployer.java	2010-02-08 19:10:14 UTC (rev 100716)
@@ -69,6 +69,7 @@
          "securityMetaData",
          "managedConnectionFactoryProperties",
    };
+   
    /**
     * A mapping from the managed property name to the attachment property name.
     */
@@ -145,7 +146,6 @@
    @Override
    public void deploy(DeploymentUnit unit, ManagedConnectionFactoryDeploymentGroup group) throws DeploymentException
    {
-      
       List<ManagedConnectionFactoryDeploymentMetaData> deployments = group.getDeployments();
       ServiceDeployment serviceDeployment = new ServiceDeployment();
       List<ServiceMetaData> componentServices = new ArrayList<ServiceMetaData>();            
@@ -184,14 +184,9 @@
       }
       
       serviceDeployment.setServices(componentServices);
-      unit.addAttachment(ServiceDeployment.class, serviceDeployment);
+      // we shouldn't override ServiceDeployment - it's reserved for -service.xml files / SARDeployer
+      unit.addAttachment(ServiceDeployment.class.getName() + ".JCA", serviceDeployment, ServiceDeployment.class);
       if( type != null )
          unit.addAttachment(ComponentType.class, type);
    }
-
-   @Override
-   public void undeploy(DeploymentUnit unit, ManagedConnectionFactoryDeploymentGroup deployment)
-   {      
-   }
-
 }