svn commit: r356749 - /geronimo/branches/1.0/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java

[am...@apache.org]

Author: ammulder
Date: Wed Dec 14 00:30:37 2005
New Revision: 356749

URL: http://svn.apache.org/viewcvs?rev=356749&view=rev
Log:
Unbreak deploying connectors with no parentId (GERONIMO-1359)

Modified:
    geronimo/branches/1.0/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java

Modified: geronimo/branches/1.0/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=356749&r1=356748&r2=356749&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/branches/1.0/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Wed Dec 14 00:30:37 2005
@@ -243,16 +243,16 @@
         }
 
         List parentId = ServiceConfigBuilder.getParentID(gerConnector.getParentId(), gerConnector.getImportArray());
+        //suppressing the default parentid is mostly useful for deploying standalone connectors on the app client.
+        //The defaultParentId normally pulls in and tries to start all the base server gbeans.
+        if (!gerConnector.getSuppressDefaultParentId()) {
+            parentId.addAll(defaultParentId);
+        }
         return new ConnectorModule(standAlone, configId, parentId, moduleFile, targetPath, connector, gerConnector, specDD);
     }
 
     public void installModule(JarFile earFile, EARContext earContext, Module module) throws DeploymentException {
         GerConnectorType vendorConnector = (GerConnectorType) module.getVendorDD();
-        //suppressing the default parentid is mostly useful for deploying standalone connectors on the app client.
-        //The defaultParentId normally pulls in and tries to start all the base server gbeans.
-        if (!vendorConnector.getSuppressDefaultParentId()) {
-            earContext.addParentId(defaultParentId);
-        }
         try {
             JarFile moduleFile = module.getModuleFile();