[jboss-cvs] JBossAS SVN: r110409 - trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/util.

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

Author: alesj
Date: 2011-01-19 17:30:42 -0500 (Wed, 19 Jan 2011)
New Revision: 110409

Modified:
   trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/util/IdFactory.java
Log:
[JBAS-8804]; remove server.home from Weld id.



Modified: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/util/IdFactory.java
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/util/IdFactory.java	2011-01-19 03:30:39 UTC (rev 110408)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/util/IdFactory.java	2011-01-19 22:30:42 UTC (rev 110409)
@@ -24,6 +24,10 @@
 
 import javax.management.ObjectName;
 
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+import org.jboss.bootstrap.api.as.config.JBossASBasedServerConfig;
 import org.jboss.classloading.spi.RealClassLoader;
 
 /**
@@ -33,6 +37,30 @@
  */
 public final class IdFactory
 {
+   private static String serverHome;
+
+   static
+   {
+      String home;
+      SecurityManager sm = System.getSecurityManager();
+      if (sm == null)
+         home = System.getProperty(JBossASBasedServerConfig.PROP_KEY_JBOSSAS_SERVER_HOME_URL);
+      else
+      {
+         home = AccessController.doPrivileged(new PrivilegedAction<String>()
+         {
+            public String run()
+            {
+               return System.getProperty(JBossASBasedServerConfig.PROP_KEY_JBOSSAS_SERVER_HOME_URL);
+            }
+         });
+      }
+      if (home != null && home.startsWith("file:"))
+         home = home.substring("file:".length());
+
+      serverHome = home;
+   }
+
    private IdFactory()
    {
    }
@@ -57,7 +85,13 @@
       {
          ObjectName on = ((RealClassLoader) current).getObjectName();
          if (on != null)
-            return on.getCanonicalName();
+         {
+            String canonical = on.getCanonicalName();
+            if (serverHome != null)
+               return canonical.replace(serverHome, "-JBossAS-");
+            else
+               return canonical;
+         }
       }
       return cl.toString(); // the best we can do :-(
    }