[jboss-cvs] JBossAS SVN: r70875 - in projects/jboss-deployers/trunk: deployers-client-spi/src/main/org/jboss/deployers/client/spi and 2 other directories.

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

Author: adrian at jboss.org
Date: 2008-03-14 11:27:25 -0400 (Fri, 14 Mar 2008)
New Revision: 70875

Modified:
   projects/jboss-deployers/trunk/deployers-client-spi/src/main/org/jboss/deployers/client/spi/Deployment.java
   projects/jboss-deployers/trunk/deployers-client/src/main/org/jboss/deployers/client/plugins/deployment/AbstractDeployment.java
   projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/DeploymentContext.java
   projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/DeploymentUnit.java
   projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java
   projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentUnit.java
   projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/ComponentDeploymentContext.java
Log:
[JBDEPLOY-14] - Complete the incomplete rollback

Modified: projects/jboss-deployers/trunk/deployers-client/src/main/org/jboss/deployers/client/plugins/deployment/AbstractDeployment.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-client/src/main/org/jboss/deployers/client/plugins/deployment/AbstractDeployment.java	2008-03-14 15:19:56 UTC (rev 70874)
+++ projects/jboss-deployers/trunk/deployers-client/src/main/org/jboss/deployers/client/plugins/deployment/AbstractDeployment.java	2008-03-14 15:27:25 UTC (rev 70875)
@@ -43,6 +43,9 @@
    /** The name of the deployment */
    private String name;
 
+   /** The deployment types */
+   private Set<String> types;
+   
    /**
     * Create a new AbstractDeployment.
     */
@@ -94,6 +97,18 @@
       this.name = name;
    }
 
+   @Deprecated
+   public Set<String> getTypes()
+   {
+      return types;
+   }
+
+   @Deprecated
+   public void setTypes(Set<String> types)
+   {
+      this.types = types;
+   }
+
    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
    {
       super.readExternal(in);

Modified: projects/jboss-deployers/trunk/deployers-client-spi/src/main/org/jboss/deployers/client/spi/Deployment.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-client-spi/src/main/org/jboss/deployers/client/spi/Deployment.java	2008-03-14 15:19:56 UTC (rev 70874)
+++ projects/jboss-deployers/trunk/deployers-client-spi/src/main/org/jboss/deployers/client/spi/Deployment.java	2008-03-14 15:27:25 UTC (rev 70875)
@@ -22,6 +22,7 @@
 package org.jboss.deployers.client.spi;
 
 import java.io.Serializable;
+import java.util.Set;
 
 import org.jboss.deployers.spi.attachments.PredeterminedManagedObjectAttachments;
 
@@ -46,4 +47,20 @@
     * @return the name
     */
    String getSimpleName();
+
+   /**
+    * Get the types.
+    * 
+    * @return the types.
+    */
+   @Deprecated
+   Set<String> getTypes();
+
+   /**
+    * Set the types.
+    * 
+    * @param types the types.
+    */
+   @Deprecated
+   void setTypes(Set<String> types);
 }

Modified: projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/DeploymentContext.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/DeploymentContext.java	2008-03-14 15:19:56 UTC (rev 70874)
+++ projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/DeploymentContext.java	2008-03-14 15:27:25 UTC (rev 70875)
@@ -124,8 +124,16 @@
     * @param comparator the comparator.
     */
    void setComparator(Comparator<DeploymentContext> comparator);
-   
+
    /**
+    * Get the types.
+    * 
+    * @return the types.
+    */
+   @Deprecated
+   Set<String> getTypes();
+
+   /**
     * Get the scope
     * 
     * @return the scope

Modified: projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/DeploymentUnit.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/DeploymentUnit.java	2008-03-14 15:19:56 UTC (rev 70874)
+++ projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/DeploymentUnit.java	2008-03-14 15:27:25 UTC (rev 70875)
@@ -78,8 +78,16 @@
     * @return the top-level deployment relative path
     */
    String getRelativePath();
-   
+
    /**
+    * Get the types.
+    * 
+    * @return the types.
+    */
+   @Deprecated
+   Set<String> getTypes();
+
+   /**
     * Get the scope
     * 
     * @return the scope

Modified: projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java	2008-03-14 15:19:56 UTC (rev 70874)
+++ projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java	2008-03-14 15:27:25 UTC (rev 70875)
@@ -402,6 +402,12 @@
       this.comparator = comparator;
    }
 
+   @Deprecated
+   public Set<String> getTypes()
+   {
+      return deploymentTypes;
+   }
+
    public ScopeKey getScope()
    {
       if (scope == null)

Modified: projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentUnit.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentUnit.java	2008-03-14 15:19:56 UTC (rev 70874)
+++ projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentUnit.java	2008-03-14 15:27:25 UTC (rev 70875)
@@ -115,6 +115,12 @@
       return deploymentContext.getRelativePath();
    }
 
+   @Deprecated
+   public Set<String> getTypes()
+   {
+      return deploymentContext.getTypes();
+   }
+   
    public ScopeKey getScope()
    {
       return deploymentContext.getScope();

Modified: projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/ComponentDeploymentContext.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/ComponentDeploymentContext.java	2008-03-14 15:19:56 UTC (rev 70874)
+++ projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/ComponentDeploymentContext.java	2008-03-14 15:27:25 UTC (rev 70875)
@@ -171,6 +171,12 @@
       // No relative ordering of components?
    }
 
+   @Deprecated
+   public Set<String> getTypes()
+   {
+      return parent.getTypes();
+   }
+   
    public ScopeKey getScope()
    {
       if (scope == null)