[jboss-cvs] JBossAS SVN: r61045 - in trunk/system/src/main/org/jboss/profileservice: spi and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2007-03-02 04:14:20 -0500 (Fri, 02 Mar 2007)
New Revision: 61045

Modified:
   trunk/system/src/main/org/jboss/profileservice/aop/DeployerAspects.java
   trunk/system/src/main/org/jboss/profileservice/spi/AttachmentsSerializer.java
Log:
More debugging

Modified: trunk/system/src/main/org/jboss/profileservice/aop/DeployerAspects.java
===================================================================
--- trunk/system/src/main/org/jboss/profileservice/aop/DeployerAspects.java	2007-03-02 09:13:54 UTC (rev 61044)
+++ trunk/system/src/main/org/jboss/profileservice/aop/DeployerAspects.java	2007-03-02 09:14:20 UTC (rev 61045)
@@ -134,17 +134,19 @@
          ClassLoader prevTCL = Thread.currentThread().getContextClassLoader();
          if( loader == null )
             loader = prevTCL;
-         DeploymentContext ctx = unit.getDeploymentContext();
          // No guarentee this is unique
          String deployerID = target.getClass().getSimpleName();
          try
          {
-            Map<String, Object> map = attachmentsSerializer.loadAttachments(ctx, deployerID, loader);
+            Map<String, Object> map = attachmentsSerializer.loadAttachments(unit, deployerID, loader);
             if( map != null )
             {
+               if( unit.getSimpleName().equals("hsqldb-ds.xml") )
+                  log.info("Loading hsqldb-ds.xml attachments, "+deployerID);
                for(String key : map.keySet())
                {
                   Object value = map.get(key);
+                  DeploymentContext ctx = unit.getDeploymentContext();
                   ctx.getPredeterminedManagedObjects().addAttachment(key, value);
                }
             }
@@ -184,12 +186,11 @@
          ClassLoader prevTCL = Thread.currentThread().getContextClassLoader();
          if( loader == null )
             loader = prevTCL;
-         DeploymentContext ctx = unit.getDeploymentContext();
          // No guarentee this is unique
          String deployerID = target.getClass().getSimpleName();
          try
          {
-            attachmentsSerializer.saveAttachments(ctx, deployerID, loader);
+            attachmentsSerializer.saveAttachments(unit, deployerID, loader);
          }
          finally
          {

Modified: trunk/system/src/main/org/jboss/profileservice/spi/AttachmentsSerializer.java
===================================================================
--- trunk/system/src/main/org/jboss/profileservice/spi/AttachmentsSerializer.java	2007-03-02 09:13:54 UTC (rev 61044)
+++ trunk/system/src/main/org/jboss/profileservice/spi/AttachmentsSerializer.java	2007-03-02 09:14:20 UTC (rev 61045)
@@ -23,6 +23,7 @@
 
 import java.util.Map;
 
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
 import org.jboss.deployers.spi.structure.DeploymentContext;
 
 /**
@@ -34,8 +35,8 @@
  */
 public interface AttachmentsSerializer
 {
-   public void saveAttachments(DeploymentContext ctx, String deployerID, ClassLoader loader)
+   public void saveAttachments(DeploymentUnit ctx, String deployerID, ClassLoader loader)
       throws Exception;
-   public Map<String, Object> loadAttachments(DeploymentContext ctx, String deployerID, ClassLoader loader)
+   public Map<String, Object> loadAttachments(DeploymentUnit ctx, String deployerID, ClassLoader loader)
       throws Exception;
 }