[jboss-cvs] JBossAS SVN: r59084 - trunk/server/src/main/org/jboss/deployment

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

Author: thomas.diesler at jboss.com
Date: 2006-12-18 13:09:57 -0500 (Mon, 18 Dec 2006)
New Revision: 59084

Modified:
   trunk/server/src/main/org/jboss/deployment/ClientDeployer.java
Log:
Ignore deploy/undeploy if the unit is a component

Modified: trunk/server/src/main/org/jboss/deployment/ClientDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/ClientDeployer.java	2006-12-18 16:03:12 UTC (rev 59083)
+++ trunk/server/src/main/org/jboss/deployment/ClientDeployer.java	2006-12-18 18:09:57 UTC (rev 59084)
@@ -95,10 +95,9 @@
          try
          {
             Element root = DOMUtils.parse(dd.openStream());
-            accepts = true;
+            // If this is javaee, it should be processed by another deployer
             String namespaceURI = root.getNamespaceURI();
-            // If this is javaee, it should be processed by another deployer
-            accepts = !"http://java.sun.com/xml/ns/javaee".equals(namespaceURI);
+            accepts = "http://java.sun.com/xml/ns/javaee".equals(namespaceURI) == false;
             if (accepts == false)
                log.debug("Ignore application-client.xml with namespace: " + namespaceURI);
          }
@@ -114,7 +113,8 @@
    @Override
    public void deploy(DeploymentUnit unit) throws org.jboss.deployers.spi.DeploymentException
    {
-      if (accepts(unit))
+      boolean isComponent = unit.getDeploymentContext().isComponent();
+      if (isComponent == false && accepts(unit))
       {
          // Create the resource class loader
          unit.createClassLoader(new RootURLClassLoaderFactory(unit));
@@ -137,10 +137,11 @@
    @Override
    public void undeploy(DeploymentUnit unit)
    {
-      // Teardown the JNDI context
+      boolean isComponent = unit.getDeploymentContext().isComponent();
       ClientMetaData metaData = unit.getAttachment(ClientMetaData.class);
-      if (metaData != null)
+      if (isComponent == false && metaData != null)
       {
+         // Teardown the JNDI context
          String appClientName = metaData.getJndiName();
          log.info("Removing client ENC from: " + appClientName);
          try