[jboss-cvs] JBossAS SVN: r64359 - in projects/microcontainer/trunk: deployers-core/src/tests/org/jboss/test/deployers/structure/test and 1 other directories.

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

Author: scott.stark at jboss.org
Date: 2007-07-30 22:24:44 -0400 (Mon, 30 Jul 2007)
New Revision: 64359

Modified:
   projects/microcontainer/trunk/deployers-core-spi/src/main/org/jboss/deployers/spi/structure/ContextInfo.java
   projects/microcontainer/trunk/deployers-core/src/main/org/jboss/deployers/plugins/structure/ContextInfoImpl.java
   projects/microcontainer/trunk/deployers-core/src/tests/org/jboss/test/deployers/structure/test/ContextInfoImplUnitTestCase.java
Log:
JBMICROCONT-199, rollback the TransientManagedObjects to the structure deployers ContextInfo

Modified: projects/microcontainer/trunk/deployers-core/src/main/org/jboss/deployers/plugins/structure/ContextInfoImpl.java
===================================================================
--- projects/microcontainer/trunk/deployers-core/src/main/org/jboss/deployers/plugins/structure/ContextInfoImpl.java	2007-07-31 00:47:12 UTC (rev 64358)
+++ projects/microcontainer/trunk/deployers-core/src/main/org/jboss/deployers/plugins/structure/ContextInfoImpl.java	2007-07-31 02:24:44 UTC (rev 64359)
@@ -28,7 +28,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jboss.deployers.spi.attachments.helpers.ManagedObjectAttachmentsImpl;
+import org.jboss.deployers.spi.attachments.helpers.PredeterminedManagedObjectAttachmentsImpl;
 import org.jboss.deployers.spi.structure.ClassPathEntry;
 import org.jboss.deployers.spi.structure.ContextInfo;
 
@@ -39,11 +39,11 @@
  * @author Scott.Stark at jboss.org
  * @version $Revision: 1.1 $
  */
-public class ContextInfoImpl extends ManagedObjectAttachmentsImpl
+public class ContextInfoImpl extends PredeterminedManagedObjectAttachmentsImpl
    implements ContextInfo, Externalizable
 {
    /** The serialVersionUID */
-   private static final long serialVersionUID = 2;
+   private static final long serialVersionUID = -4384869824260284607L;
 
    /** The logical path */
    private String path;

Modified: projects/microcontainer/trunk/deployers-core/src/tests/org/jboss/test/deployers/structure/test/ContextInfoImplUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/deployers-core/src/tests/org/jboss/test/deployers/structure/test/ContextInfoImplUnitTestCase.java	2007-07-31 00:47:12 UTC (rev 64358)
+++ projects/microcontainer/trunk/deployers-core/src/tests/org/jboss/test/deployers/structure/test/ContextInfoImplUnitTestCase.java	2007-07-31 02:24:44 UTC (rev 64359)
@@ -182,13 +182,4 @@
       assertEquals("key1 attachment", "testPredeterminedManagedObjectAttachments", a1);
    }
 
-   public void testTransientManagedObjects()
-   {
-      ContextInfoImpl context = createDefault();
-      assertEquals("", context.getPath());
-      MutableAttachments ma = context.getTransientManagedObjects();
-      ma.addAttachment("key1", "testTransientManagedObjects", String.class);
-      String a1 = context.getTransientManagedObjects().getAttachment("key1", String.class);
-      assertEquals("key1 attachment", "testTransientManagedObjects", a1);
-   }
 }

Modified: projects/microcontainer/trunk/deployers-core-spi/src/main/org/jboss/deployers/spi/structure/ContextInfo.java
===================================================================
--- projects/microcontainer/trunk/deployers-core-spi/src/main/org/jboss/deployers/spi/structure/ContextInfo.java	2007-07-31 00:47:12 UTC (rev 64358)
+++ projects/microcontainer/trunk/deployers-core-spi/src/main/org/jboss/deployers/spi/structure/ContextInfo.java	2007-07-31 02:24:44 UTC (rev 64359)
@@ -24,7 +24,6 @@
 import java.io.Serializable;
 import java.util.List;
 
-import org.jboss.deployers.spi.attachments.ManagedObjectAttachments;
 import org.jboss.deployers.spi.attachments.PredeterminedManagedObjectAttachments;
 
 /**
@@ -34,7 +33,7 @@
  * @author adrian at jboss.org
  * @version $Revision: 1.1$
  */
-public interface ContextInfo extends ManagedObjectAttachments, Serializable
+public interface ContextInfo extends PredeterminedManagedObjectAttachments, Serializable
 {
    /** The default metadata path */
    String DEFAULT_METADATA_PATH = "META-INF";