[jboss-cvs] JBossAS SVN: r94096 - in projects/aop/trunk: aop and 12 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Sep 29 08:03:39 EDT 2009


Author: kabir.khan at jboss.com
Date: 2009-09-29 08:03:37 -0400 (Tue, 29 Sep 2009)
New Revision: 94096

Added:
   projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/deployment/
   projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerService.java
   projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerServiceMBean.java
   projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/deployment/JBossIntegrationWrapperMBean.java
   projects/aop/trunk/asintegration-jmx/src/main/java/org/jboss/aop/deployment/JBoss4IntegrationWrapperMBean.java
Removed:
   projects/aop/trunk/asintegration-jmx/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerService.java
   projects/aop/trunk/asintegration-jmx/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerServiceMBean.java
   projects/aop/trunk/asintegration-jmx/src/main/java/org/jboss/aop/deployment/JBoss4IntegrationWrapperMBean.java
   projects/aop/trunk/asintegration-jmx/src/main/java/org/jboss/aop/deployment/JBossIntegrationWrapperMBean.java
Modified:
   projects/aop/trunk/aop/.classpath
   projects/aop/trunk/aop/src/main/java/org/jboss/aop/util/logging/SystemOutLoggerPlugin.java
   projects/aop/trunk/aophelper/.classpath
   projects/aop/trunk/asintegration-core/.classpath
   projects/aop/trunk/asintegration-core/pom.xml
   projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/asintegration/core/AspectManagerServiceDelegate.java
   projects/aop/trunk/asintegration-jmx/.classpath
   projects/aop/trunk/asintegration-mc/.classpath
   projects/aop/trunk/aspects/.classpath
   projects/aop/trunk/build/.classpath
   projects/aop/trunk/deployers/.classpath
   projects/aop/trunk/pom.xml
Log:
[JBAOP-751] Move things around to minimize AS dependencies

Modified: projects/aop/trunk/aop/.classpath
===================================================================
--- projects/aop/trunk/aop/.classpath	2009-09-29 11:53:07 UTC (rev 94095)
+++ projects/aop/trunk/aop/.classpath	2009-09-29 12:03:37 UTC (rev 94096)
@@ -9,10 +9,10 @@
 	<classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
 	<classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar" sourcepath="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1-sources.jar"/>
 	<classpathentry kind="var" path="M2_REPO/javassist/javassist/3.10.0.GA/javassist-3.10.0.GA.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.11.GA/jboss-common-core-2.2.11.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.11.GA/jboss-common-core-2.2.11.GA-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA-sources.jar"/>
 	<classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA-sources.jar"/>
 	<classpathentry kind="var" path="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA-sources.jar"/>

Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/util/logging/SystemOutLoggerPlugin.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/util/logging/SystemOutLoggerPlugin.java	2009-09-29 11:53:07 UTC (rev 94095)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/util/logging/SystemOutLoggerPlugin.java	2009-09-29 12:03:37 UTC (rev 94096)
@@ -30,47 +30,74 @@
  */
 public class SystemOutLoggerPlugin implements LoggerPlugin
 {
+   private static final String WARN = "[aop-warn]";
+   private static final String TRACE = "[aop-trace]";
+   private static final String INFO = "[aop-info]";
+   private static final String FATAL = "[aop-fatal]";
+   private static final String ERROR = "[aop-error]";
+   private static final String DEBUG = "[aop-debug]";
+   
    String name;
    public void debug(Object message)
    {
-      print("[aop-debug]", message, null);
+      print(DEBUG, message, null);
    }
 
    public void debug(Object message, Throwable t)
    {
-      print("[aop-debug]", message, t);
+      print(DEBUG, message, t);
    }
 
+   public void debug(String loggerFcqn, Object message, Throwable t)
+   {
+      print(DEBUG + " " + loggerFcqn, message, t);
+   }
+
    public void error(Object message)
    {
-      print("[aop-error]", message, null);
+      print(ERROR, message, null);
    }
 
    public void error(Object message, Throwable t)
    {
-      print("[aop-error]", message, t);
+      print(ERROR, message, t);
    }
 
+   public void error(String loggerFcqn, Object message, Throwable t)
+   {
+      print(ERROR + " " + loggerFcqn, message, t);
+   }
+
    public void fatal(Object message)
    {
-      print("[aop-fatal]", message, null);
+      print(FATAL, message, null);
    }
 
    public void fatal(Object message, Throwable t)
    {
-      print("[aop-debug]", message, t);
+      print(FATAL, message, t);
    }
 
+   public void fatal(String loggerFcqn, Object message, Throwable t)
+   {
+      print(FATAL + " " + loggerFcqn, message, t);
+   }
+
    public void info(Object message)
    {
-      print("[aop-info]", message, null);
+      print(INFO, message, null);
    }
 
    public void info(Object message, Throwable t)
    {
-      print("[aop-info]", message, t);
+      print(INFO, message, t);
    }
 
+   public void info(String loggerFcqn, Object message, Throwable t)
+   {
+      print(INFO + " " + loggerFcqn, message, t);
+   }
+
    public void init(String name)
    {
       this.name = name;
@@ -93,24 +120,34 @@
 
    public void trace(Object message)
    {
-      print("[aop-trace]", message, null);
+      print(TRACE, message, null);
    }
 
    public void trace(Object message, Throwable t)
    {
-      print("[aop-trace]", message, null);
+      print(TRACE, message, null);
    }
 
+   public void trace(String loggerFcqn, Object message, Throwable t)
+   {
+      print(TRACE + " " + loggerFcqn, message, t);
+   }
+
    public void warn(Object message)
    {
-      print("[aop-warn]", message, null);
+      print(WARN, message, null);
    }
 
    public void warn(Object message, Throwable t)
    {
-      print("[aop-warn]", message, null);
+      print(WARN, message, null);
    }
 
+   public void warn(String loggerFcqn, Object message, Throwable t)
+   {
+      print(WARN + " " + loggerFcqn, message, t);
+   }
+
    private void print(String prefix, Object message, Throwable t)
    {
       System.out.println(prefix + " " + name + " " + message);

Modified: projects/aop/trunk/aophelper/.classpath
===================================================================
--- projects/aop/trunk/aophelper/.classpath	2009-09-29 11:53:07 UTC (rev 94095)
+++ projects/aop/trunk/aophelper/.classpath	2009-09-29 12:03:37 UTC (rev 94096)
@@ -8,10 +8,10 @@
   <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar"/>
   <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.10.0.GA/javassist-3.10.0.GA.jar"/>
   <classpathentry kind="src" path="/jboss-aop"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.11.GA/jboss-common-core-2.2.11.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.11.GA/jboss-common-core-2.2.11.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9-sources.jar"/>

Modified: projects/aop/trunk/asintegration-core/.classpath
===================================================================
--- projects/aop/trunk/asintegration-core/.classpath	2009-09-29 11:53:07 UTC (rev 94095)
+++ projects/aop/trunk/asintegration-core/.classpath	2009-09-29 12:03:37 UTC (rev 94096)
@@ -4,9 +4,7 @@
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1.1/activation-1.1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
@@ -15,56 +13,59 @@
   <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar" sourcepath="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/urbanophile/java-getopt/1.0.9/java-getopt-1.0.9.jar"/>
+  <classpathentry kind="var" path="M2_REPO/gnu-getopt/getopt/1.0.12-brew/getopt-1.0.12-brew.jar"/>
   <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.10.0.GA/javassist-3.10.0.GA.jar"/>
-  <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/>
   <classpathentry kind="src" path="/jboss-aop"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.4.GA/jboss-aop-mc-int-2.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.4.GA/jboss-aop-mc-int-2.0.4.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-bootstrap/5.0.0.CR1/jboss-as-bootstrap-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-bootstrap/5.0.0.CR1/jboss-as-bootstrap-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.0.0.CR1/jboss-as-j2se-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.0.0.CR1/jboss-as-j2se-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.0.0.CR1/jboss-as-j2se-5.0.0.CR1-tests.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.0.0.CR1/jboss-as-jmx-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.0.0.CR1/jboss-as-jmx-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-main/5.0.0.CR1/jboss-as-main-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-main/5.0.0.CR1/jboss-as-main-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.0.0.CR1/jboss-as-mbeans-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.0.0.CR1/jboss-as-mbeans-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system/5.0.0.CR1/jboss-as-system-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system/5.0.0.CR1/jboss-as-system-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.0.0.CR1/jboss-as-system-jmx-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.0.0.CR1/jboss-as-system-jmx-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloader/2.0.3.GA/jboss-classloader-2.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloader/2.0.3.GA/jboss-classloader-2.0.3.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading/2.0.3.GA/jboss-classloading-2.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading/2.0.3.GA/jboss-classloading-2.0.3.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.3.GA/jboss-classloading-spi-5.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.3.GA/jboss-classloading-spi-5.0.3.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.3.GA/jboss-classloading-vfs-2.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.3.GA/jboss-classloading-vfs-2.0.3.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.11.GA/jboss-common-core-2.2.11.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.11.GA/jboss-common-core-2.2.11.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.4.GA/jboss-dependency-2.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.4.GA/jboss-dependency-2.0.4.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.5.GA/jboss-deployers-client-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.5.GA/jboss-deployers-client-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.5.GA/jboss-deployers-client-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.5.GA/jboss-deployers-client-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.5.GA/jboss-deployers-core-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.5.GA/jboss-deployers-core-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.5.GA/jboss-deployers-core-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.5.GA/jboss-deployers-core-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.5.GA/jboss-deployers-impl-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.5.GA/jboss-deployers-impl-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.5.GA/jboss-deployers-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.5.GA/jboss-deployers-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.5.GA/jboss-deployers-structure-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.5.GA/jboss-deployers-structure-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.5.GA/jboss-deployers-vfs-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.5.GA/jboss-deployers-vfs-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.5.GA/jboss-deployers-vfs-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.5.GA/jboss-deployers-vfs-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.4.GA/jboss-kernel-2.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.4.GA/jboss-kernel-2.0.4.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.0.0.GA/jboss-managed-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.0.0.GA/jboss-managed-2.0.0.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.0.0.GA/jboss-metatype-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.0.0.GA/jboss-metatype-2.0.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.9.GA/jboss-aop-mc-int-2.0.9.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.9.GA/jboss-aop-mc-int-2.0.9.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA-tests.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.1.0.GA/jboss-as-jmx-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.1.0.GA/jboss-as-jmx-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-main/5.1.0.GA/jboss-as-main-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-main/5.1.0.GA/jboss-as-main-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.1.0.GA/jboss-as-mbeans-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.1.0.GA/jboss-as-mbeans-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system/5.1.0.GA/jboss-as-system-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system/5.1.0.GA/jboss-as-system-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.1.0.GA/jboss-as-system-jmx-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.1.0.GA/jboss-as-system-jmx-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/bootstrap/jboss-bootstrap/1.0.0-Beta-3/jboss-bootstrap-1.0.0-Beta-3.jar" sourcepath="M2_REPO/org/jboss/bootstrap/jboss-bootstrap/1.0.0-Beta-3/jboss-bootstrap-1.0.0-Beta-3-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloader/2.0.6.SP1/jboss-classloader-2.0.6.SP1.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloader/2.0.6.SP1/jboss-classloader-2.0.6.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading/2.0.6.SP1/jboss-classloading-2.0.6.SP1.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading/2.0.6.SP1/jboss-classloading-2.0.6.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.SP1/jboss-classloading-spi-5.1.0.SP1.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.SP1/jboss-classloading-spi-5.1.0.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.6.SP1/jboss-classloading-vfs-2.0.6.SP1.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.6.SP1/jboss-classloading-vfs-2.0.6.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.9.GA/jboss-dependency-2.0.9.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.9.GA/jboss-dependency-2.0.9.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.8.GA/jboss-deployers-client-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.8.GA/jboss-deployers-client-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.8.GA/jboss-deployers-client-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.8.GA/jboss-deployers-client-spi-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.8.GA/jboss-deployers-core-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.8.GA/jboss-deployers-core-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.8.GA/jboss-deployers-core-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.8.GA/jboss-deployers-core-spi-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.8.GA/jboss-deployers-impl-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.8.GA/jboss-deployers-impl-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.8.GA/jboss-deployers-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.8.GA/jboss-deployers-spi-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.8.GA/jboss-deployers-structure-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.8.GA/jboss-deployers-structure-spi-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.8.GA/jboss-deployers-vfs-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.8.GA/jboss-deployers-vfs-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.8.GA/jboss-deployers-vfs-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.8.GA/jboss-deployers-vfs-spi-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.9.GA/jboss-kernel-2.0.9.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.9.GA/jboss-kernel-2.0.9.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logbridge/jboss-logbridge/1.0.0.GA/jboss-logbridge-1.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/logbridge/jboss-logbridge/1.0.0.GA/jboss-logbridge-1.0.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logmanager/jboss-logmanager/1.0.0.GA/jboss-logmanager-1.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/logmanager/jboss-logmanager/1.0.0.GA/jboss-logmanager-1.0.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.GA/jboss-metatype-2.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.GA/jboss-metatype-2.1.1.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.GA/jboss-profileservice-spi-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.GA/jboss-profileservice-spi-5.1.0.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.0.GA/jboss-server-manager-0.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.0.GA/jboss-server-manager-0.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.3.SP1/jboss-security-spi-2.0.3.SP1.jar" sourcepath="M2_REPO/org/jboss/security/jboss-security-spi/2.0.3.SP1/jboss-security-spi-2.0.3.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-server-manager/1.0.2.GA/jboss-server-manager-1.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-server-manager/1.0.2.GA/jboss-server-manager-1.0.2.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.0.GA/jboss-test-1.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/test/jboss-test/1.1.0.GA/jboss-test-1.1.0.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.1.0.GA/jboss-vfs-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.1.0.GA/jboss-vfs-2.1.0.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR11/jbossxb-2.0.0.CR11.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.0.CR11/jbossxb-2.0.0.CR11-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.4.GA/jboss-test-1.1.4.GA.jar" sourcepath="M2_REPO/org/jboss/test/jboss-test/1.1.4.GA/jboss-test-1.1.4.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.1.3.SP1/jboss-vfs-2.1.3.SP1.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.1.3.SP1/jboss-vfs-2.1.3.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx-client/2.0.3.SP1/jbosssx-client-2.0.3.SP1.jar" sourcepath="M2_REPO/org/jboss/security/jbosssx-client/2.0.3.SP1/jbosssx-client-2.0.3.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/naming/jnp-client/5.0.1.GA/jnp-client-5.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/naming/jnp-client/5.0.1.GA/jnp-client-5.0.1.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
   <classpathentry kind="src" path="/pluggable-instrumentor"/>
   <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar" sourcepath="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 </classpath>
\ No newline at end of file

Modified: projects/aop/trunk/asintegration-core/pom.xml
===================================================================
--- projects/aop/trunk/asintegration-core/pom.xml	2009-09-29 11:53:07 UTC (rev 94095)
+++ projects/aop/trunk/asintegration-core/pom.xml	2009-09-29 12:03:37 UTC (rev 94096)
@@ -115,6 +115,10 @@
       <artifactId>jboss-as-system-jmx</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.jboss.jbossas</groupId>
+      <artifactId>jboss-as-main</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging-spi</artifactId>
     </dependency>

Modified: projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/asintegration/core/AspectManagerServiceDelegate.java
===================================================================
--- projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/asintegration/core/AspectManagerServiceDelegate.java	2009-09-29 11:53:07 UTC (rev 94095)
+++ projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/asintegration/core/AspectManagerServiceDelegate.java	2009-09-29 12:03:37 UTC (rev 94096)
@@ -57,7 +57,6 @@
 import org.jboss.aop.introduction.InterfaceIntroduction;
 import org.jboss.aop.pointcut.Pointcut;
 import org.jboss.logging.Logger;
-import org.jboss.system.server.ServerConfig;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
@@ -227,7 +226,8 @@
       // Set a default tmp classes dir to the jboss tmp dir/aopclasses
       if (tmpClassesDir == null)
       {
-         String jbossTmpDir = System.getProperty(ServerConfig.SERVER_TEMP_DIR);
+         //Hardcode this since the constant exists in different locations in AS 4 and AS 5
+         String jbossTmpDir = System.getProperty("jboss.server.temp.dir");
          if (jbossTmpDir == null)
             jbossTmpDir = System.getProperty("java.io.tmpdir");
          tmpClassesDir = new File(jbossTmpDir, "aopdynclasses");

Copied: projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerService.java (from rev 92941, projects/aop/trunk/asintegration-jmx/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerService.java)
===================================================================
--- projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerService.java	                        (rev 0)
+++ projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerService.java	2009-09-29 12:03:37 UTC (rev 94096)
@@ -0,0 +1,335 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.deployment;
+
+import java.io.File;
+
+import javassist.scopedpool.ScopedClassPoolFactory;
+
+import javax.management.Notification;
+
+import org.jboss.aop.AspectManager;
+import org.jboss.aop.AspectNotificationHandler;
+import org.jboss.aop.ClassLoaderValidation;
+import org.jboss.aop.asintegration.JBossIntegration;
+import org.jboss.aop.asintegration.core.AspectManagerServiceDelegate;
+import org.jboss.logging.Logger;
+import org.jboss.system.ServiceMBeanSupport;
+
+/**
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @author adrian at jboss.org
+ * @version $Revision: 70855 $
+ */
+public class AbstractAspectManagerService
+        extends ServiceMBeanSupport
+        implements AbstractAspectManagerServiceMBean, AspectNotificationHandler
+{
+
+   Logger log = Logger.getLogger(AbstractAspectManagerService.class);
+   
+   private static final String BASE_XML = "base-aop.xml";
+   
+   //private boolean registerHappensAfterStart;
+   
+   private AspectManagerServiceDelegate delegate;
+   
+   // Static -------------------------------------------------------
+
+   // Constructors -------------------------------------------------
+   /**
+    * This constructor shouuld only get called when used in JBoss 4.x.x, not in JBoss 5.
+    */
+   public AbstractAspectManagerService()
+   {
+      //Initialise the manager and delegate
+      delegate = createDelegate();
+      delegate.setBaseXml(BASE_XML);
+      delegate.setAspectManager(AspectManager.getTopLevelAspectManager());
+
+      //This constructor shouuld only get called when used in JBoss 4.x.x, not in JBoss 5.
+      //In JBoss 4 we need to maintain this field
+      delegate.setAspectManagerMaintainAdvisorInterceptors(true);
+      
+      //Default 
+      delegate.setUseBaseXml(true);
+   }
+
+   /**
+    * This constructor should only get called when used in JBoss 5 by JBossAspectLibrary.
+    */
+   public AbstractAspectManagerService(AspectManagerServiceDelegate delegate)
+   {
+      this.delegate = delegate;
+   }
+
+   
+   protected AspectManagerServiceDelegate createDelegate()
+   {
+      throw new RuntimeException("Should not use this class directly");
+   }
+
+   // Public -------------------------------------------------------
+
+   public void setJBossIntegrationWrapper(JBossIntegrationWrapperMBean integration)
+   {
+      JBossIntegration intgr = integration != null ? integration.getIntegration() : null;
+      delegate.setJBossIntegration(intgr);
+   }
+
+   protected ScopedClassPoolFactory createFactory() throws Exception
+   {
+      return delegate.createFactory();
+   }
+   
+   protected ClassLoaderValidation createClassLoaderValidation()
+   {
+      return delegate.createClassLoaderValidation();
+   }
+
+   @Override
+   protected void createService()
+           throws Exception
+   {
+      delegate.create();
+      AspectManager.notificationHandler = this;
+   }
+   
+   @Override
+   protected void destroyService() throws Exception
+   {
+      delegate.destroy();
+   }
+
+   @Override
+   protected void startService() throws Exception
+   {
+      delegate.start();
+   }
+
+   @Override
+   protected void stopService() throws Exception
+   {
+      delegate.stop();
+   }
+
+   public void attachClass(String classname)
+   {
+      Notification msg = new Notification("AOP class attached", this, getNextNotificationSequenceNumber());
+      msg.setUserData(classname);
+      sendNotification(msg);
+   }
+
+   public boolean getPrune()
+   {
+      return delegate.getPrune();
+   }
+
+   public void setPrune(boolean prune)
+   {
+      delegate.setPrune(prune);
+   }
+
+   public String getExclude()
+   {
+      return delegate.getExclude();
+   }
+
+   public void setExclude(String exclude)
+   {
+      delegate.setExclude(exclude);
+   }
+
+   public String getInclude()
+   {
+      return delegate.getInclude();
+   }
+
+   public void setInclude(String include)
+   {
+      delegate.setInclude(include);
+   }
+
+   public String getIgnore()
+   {
+      return delegate.getIgnore();
+   }
+
+   public void setIgnore(String ignore)
+   {
+      delegate.setIgnore(ignore);
+   }
+   
+   public String getIncludedInvisibleAnnotations()
+   {
+      return delegate.getIncludedInvisibleAnnotations();
+   }
+   
+   public void setIncludedInvisibleAnnotations(String ia)
+   {
+      delegate.setIncludedInvisibleAnnotations(ia);
+   }
+
+   /**
+    * The temporary directory to which dyn class files are written
+    */
+   public File getTmpClassesDir()
+   {
+      return delegate.getTmpClassesDir();
+   }
+
+   /**
+    * The temporary directory to which dyn class files are written
+    */
+   public void setTmpClassesDir(File tmpClassesDir)
+   {
+      delegate.setTmpClassesDir(tmpClassesDir);
+   }
+
+   /**
+    * Set the verbosity of aop logging.  It doesn't use log4j
+    */
+   public boolean getVerbose()
+   {
+      return delegate.getVerbose();
+   }
+
+   /**
+    * Set the verbosity of aop logging.
+    */
+   public void setVerbose(boolean verbose)
+   {
+      delegate.setVerbose(verbose);
+   }
+
+   /**
+    * Use aop optimizations.  Optional just in case there is a bug
+    */
+   public boolean getOptimized()
+   {
+      return delegate.getOptimized();
+   }
+
+   /**
+    * Use aop optimizations.  Optional just in case there is a bug
+    */
+   public void setOptimized(boolean verbose)
+   {
+      delegate.setOptimized(verbose);
+   }
+
+   public boolean getSuppressTransformationErrors()
+   {
+      return delegate.getSuppressReferenceErrors();
+   }
+
+   public void setSuppressTransformationErrors(boolean suppressTransformationErrors)
+   {
+      delegate.setSuppressTransformationErrors(suppressTransformationErrors);
+   }
+
+   public boolean getSuppressReferenceErrors()
+   {
+      return delegate.getSuppressReferenceErrors();
+   }
+
+   public void setSuppressReferenceErrors(boolean suppressReferenceErrors)
+   {
+      delegate.setSuppressReferenceErrors(suppressReferenceErrors);
+   }
+
+   public boolean getEnableTransformer()
+   {
+      return delegate.getEnableTransformer();
+   }
+
+   public String interceptorFactories()
+   {
+      return delegate.interceptorFactories();
+   }
+
+   public String aspectDefinitions()
+   {
+      return delegate.aspectDefinitions();
+   }
+
+   public String introductions()
+   {
+      return delegate.introductions();
+   }
+
+   public String stacks()
+   {
+      return delegate.stacks();
+   }
+
+   public String bindings()
+   {
+      return delegate.bindings();
+   }
+
+   public String pointcuts()
+   {
+      return delegate.pointcuts();
+   }
+
+   public String registeredClassLoaders()
+   {
+      return delegate.registeredClassLoaders();
+   }
+
+   public void setEnableTransformer(boolean enableTransformer)
+   {
+      delegate.setEnableTransformer(enableTransformer);
+   }
+
+   public boolean getEnableLoadtimeWeaving()
+   {
+      return delegate.getEnableLoadtimeWeaving();
+   }
+
+   public void setEnableLoadtimeWeaving(boolean enableTransformer)
+   {
+      delegate.setEnableLoadtimeWeaving(enableTransformer);
+   }
+
+   public String getInstrumentor()
+   {
+      return delegate.getInstrumentor();
+   }
+
+   public void setInstrumentor(String instrumentor)
+   {
+      delegate.setInstrumentor(instrumentor);
+   }
+   
+   public boolean getUseBaseXml()
+   {
+      return delegate.getUseBaseXml();
+   }
+
+   public synchronized void setUseBaseXml(boolean useBaseXml)
+   {
+      delegate.setUseBaseXml(useBaseXml);
+   }
+
+}

Copied: projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerServiceMBean.java (from rev 92941, projects/aop/trunk/asintegration-jmx/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerServiceMBean.java)
===================================================================
--- projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerServiceMBean.java	                        (rev 0)
+++ projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerServiceMBean.java	2009-09-29 12:03:37 UTC (rev 94096)
@@ -0,0 +1,146 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.deployment;
+
+/**
+ * MBean interface.
+ */
+public interface AbstractAspectManagerServiceMBean extends org.jboss.system.ServiceMBean {
+
+   /**
+    * The temporary directory to which dyn class files are written
+    */
+  java.io.File getTmpClassesDir() ;
+
+   /**
+    * The temporary directory to which dyn class files are written
+    */
+  void setTmpClassesDir(java.io.File tmpClassesDir) ;
+
+   /**
+    * Set the verbosity of aop logging. It doesn't use log4j
+    */
+  boolean getVerbose() ;
+
+   /**
+    * Set the verbosity of aop logging. It doesn't use log4j
+    */
+  void setVerbose(boolean verbose) ;
+
+   /**
+    * Use aop optimizations. Optional just in case there is a bug
+    */
+  boolean getOptimized() ;
+
+   /**
+    * Use aop optimizations. Optional just in case there is a bug
+    */
+  void setOptimized(boolean verbose) ;
+
+  boolean getSuppressTransformationErrors() ;
+
+  void setSuppressTransformationErrors(boolean suppressTransformationErrors) ;
+
+   /**
+    * The temporary directory to which dyn class files are written
+    */
+  boolean getEnableTransformer() ;
+
+   /**
+    * The temporary directory to which dyn class files are written
+    */
+  boolean getEnableLoadtimeWeaving() ;
+
+   /**
+    * The temporary directory to which dyn class files are written
+    */
+  java.lang.String interceptorFactories() ;
+
+   /**
+    * The temporary directory to which dyn class files are written
+    */
+  java.lang.String aspectDefinitions() ;
+
+  java.lang.String introductions() ;
+
+   /**
+    * The temporary directory to which dyn class files are written
+    */
+  java.lang.String stacks() ;
+
+   /**
+    * The temporary directory to which dyn class files are written
+    */
+  java.lang.String bindings() ;
+
+  java.lang.String pointcuts();
+  
+   /**
+    * The temporary directory to which dyn class files are written
+    */
+  java.lang.String registeredClassLoaders() ;
+
+   /**
+    * The temporary directory to which dyn class files are written
+    */
+   void setEnableTransformer(boolean enableTransformer) ;
+   void setEnableLoadtimeWeaving(boolean enableTransformer) ;
+
+   String getExclude();
+
+   void setExclude(String exclude);
+
+   String getInclude();
+
+   void setInclude(String include);
+   
+   String getIncludedInvisibleAnnotations();
+   
+   void setIncludedInvisibleAnnotations(String ia);
+
+   boolean getPrune();
+
+   void setPrune(boolean prune);
+   
+   String getIgnore();
+
+   void setIgnore(String ignore);
+   
+   String getInstrumentor();
+   
+   void setInstrumentor(String instrumentor);
+
+   /**
+    * Whether or not tu use base-aop.xml
+    */
+   boolean getUseBaseXml();
+   
+   /**
+    * Whether or not tu use base-aop.xml
+    */
+   void setUseBaseXml(boolean useBaseXml);
+   
+   /**
+    * Sets the MBean containing the JBossIntegration implementation
+    */
+   void setJBossIntegrationWrapper(JBossIntegrationWrapperMBean integration);
+}

Copied: projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/deployment/JBossIntegrationWrapperMBean.java (from rev 92941, projects/aop/trunk/asintegration-jmx/src/main/java/org/jboss/aop/deployment/JBossIntegrationWrapperMBean.java)
===================================================================
--- projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/deployment/JBossIntegrationWrapperMBean.java	                        (rev 0)
+++ projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/deployment/JBossIntegrationWrapperMBean.java	2009-09-29 12:03:37 UTC (rev 94096)
@@ -0,0 +1,34 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors. 
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/ 
+package org.jboss.aop.deployment;
+
+import org.jboss.aop.asintegration.JBossIntegration;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface JBossIntegrationWrapperMBean
+{
+   JBossIntegration getIntegration();
+}

Modified: projects/aop/trunk/asintegration-jmx/.classpath
===================================================================
--- projects/aop/trunk/asintegration-jmx/.classpath	2009-09-29 11:53:07 UTC (rev 94095)
+++ projects/aop/trunk/asintegration-jmx/.classpath	2009-09-29 12:03:37 UTC (rev 94096)
@@ -4,9 +4,7 @@
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1.1/activation-1.1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/bcel/bcel/5.1/bcel-5.1.jar" sourcepath="M2_REPO/bcel/bcel/5.1/bcel-5.1-sources.jar"/>
@@ -14,54 +12,55 @@
   <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar" sourcepath="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/urbanophile/java-getopt/1.0.9/java-getopt-1.0.9.jar"/>
+  <classpathentry kind="var" path="M2_REPO/gnu-getopt/getopt/1.0.12-brew/getopt-1.0.12-brew.jar"/>
   <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.10.0.GA/javassist-3.10.0.GA.jar"/>
-  <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/>
   <classpathentry kind="src" path="/jboss-aop"/>
   <classpathentry kind="src" path="/jboss-aop-asintegration-core"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.4.GA/jboss-aop-mc-int-2.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.4.GA/jboss-aop-mc-int-2.0.4.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-bootstrap/5.0.0.CR1/jboss-as-bootstrap-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-bootstrap/5.0.0.CR1/jboss-as-bootstrap-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.0.0.CR1/jboss-as-j2se-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.0.0.CR1/jboss-as-j2se-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.0.0.CR1/jboss-as-j2se-5.0.0.CR1-tests.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.0.0.CR1/jboss-as-jmx-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.0.0.CR1/jboss-as-jmx-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-main/5.0.0.CR1/jboss-as-main-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-main/5.0.0.CR1/jboss-as-main-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.0.0.CR1/jboss-as-mbeans-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.0.0.CR1/jboss-as-mbeans-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system/5.0.0.CR1/jboss-as-system-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system/5.0.0.CR1/jboss-as-system-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.0.0.CR1/jboss-as-system-jmx-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.0.0.CR1/jboss-as-system-jmx-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloader/2.0.3.GA/jboss-classloader-2.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloader/2.0.3.GA/jboss-classloader-2.0.3.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading/2.0.3.GA/jboss-classloading-2.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading/2.0.3.GA/jboss-classloading-2.0.3.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.3.GA/jboss-classloading-spi-5.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.3.GA/jboss-classloading-spi-5.0.3.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.3.GA/jboss-classloading-vfs-2.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.3.GA/jboss-classloading-vfs-2.0.3.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.11.GA/jboss-common-core-2.2.11.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.11.GA/jboss-common-core-2.2.11.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.4.GA/jboss-dependency-2.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.4.GA/jboss-dependency-2.0.4.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.5.GA/jboss-deployers-client-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.5.GA/jboss-deployers-client-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.5.GA/jboss-deployers-client-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.5.GA/jboss-deployers-client-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.5.GA/jboss-deployers-core-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.5.GA/jboss-deployers-core-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.5.GA/jboss-deployers-core-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.5.GA/jboss-deployers-core-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.5.GA/jboss-deployers-impl-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.5.GA/jboss-deployers-impl-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.5.GA/jboss-deployers-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.5.GA/jboss-deployers-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.5.GA/jboss-deployers-structure-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.5.GA/jboss-deployers-structure-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.5.GA/jboss-deployers-vfs-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.5.GA/jboss-deployers-vfs-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.5.GA/jboss-deployers-vfs-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.5.GA/jboss-deployers-vfs-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.4.GA/jboss-kernel-2.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.4.GA/jboss-kernel-2.0.4.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.0.0.GA/jboss-managed-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.0.0.GA/jboss-managed-2.0.0.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.0.0.GA/jboss-metatype-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.0.0.GA/jboss-metatype-2.0.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.9.GA/jboss-aop-mc-int-2.0.9.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.9.GA/jboss-aop-mc-int-2.0.9.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA-tests.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.1.0.GA/jboss-as-jmx-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.1.0.GA/jboss-as-jmx-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-main/5.1.0.GA/jboss-as-main-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-main/5.1.0.GA/jboss-as-main-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.1.0.GA/jboss-as-mbeans-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.1.0.GA/jboss-as-mbeans-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system/5.1.0.GA/jboss-as-system-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system/5.1.0.GA/jboss-as-system-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.1.0.GA/jboss-as-system-jmx-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.1.0.GA/jboss-as-system-jmx-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/bootstrap/jboss-bootstrap/1.0.0-Beta-3/jboss-bootstrap-1.0.0-Beta-3.jar" sourcepath="M2_REPO/org/jboss/bootstrap/jboss-bootstrap/1.0.0-Beta-3/jboss-bootstrap-1.0.0-Beta-3-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloader/2.0.6.SP1/jboss-classloader-2.0.6.SP1.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloader/2.0.6.SP1/jboss-classloader-2.0.6.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading/2.0.6.SP1/jboss-classloading-2.0.6.SP1.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading/2.0.6.SP1/jboss-classloading-2.0.6.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.SP1/jboss-classloading-spi-5.1.0.SP1.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.SP1/jboss-classloading-spi-5.1.0.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.6.SP1/jboss-classloading-vfs-2.0.6.SP1.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.6.SP1/jboss-classloading-vfs-2.0.6.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.9.GA/jboss-dependency-2.0.9.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.9.GA/jboss-dependency-2.0.9.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.8.GA/jboss-deployers-client-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.8.GA/jboss-deployers-client-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.8.GA/jboss-deployers-client-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.8.GA/jboss-deployers-client-spi-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.8.GA/jboss-deployers-core-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.8.GA/jboss-deployers-core-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.8.GA/jboss-deployers-core-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.8.GA/jboss-deployers-core-spi-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.8.GA/jboss-deployers-impl-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.8.GA/jboss-deployers-impl-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.8.GA/jboss-deployers-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.8.GA/jboss-deployers-spi-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.8.GA/jboss-deployers-structure-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.8.GA/jboss-deployers-structure-spi-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.8.GA/jboss-deployers-vfs-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.8.GA/jboss-deployers-vfs-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.8.GA/jboss-deployers-vfs-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.8.GA/jboss-deployers-vfs-spi-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.9.GA/jboss-kernel-2.0.9.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.9.GA/jboss-kernel-2.0.9.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logbridge/jboss-logbridge/1.0.0.GA/jboss-logbridge-1.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/logbridge/jboss-logbridge/1.0.0.GA/jboss-logbridge-1.0.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logmanager/jboss-logmanager/1.0.0.GA/jboss-logmanager-1.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/logmanager/jboss-logmanager/1.0.0.GA/jboss-logmanager-1.0.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.GA/jboss-metatype-2.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.GA/jboss-metatype-2.1.1.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.GA/jboss-profileservice-spi-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.GA/jboss-profileservice-spi-5.1.0.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.1.0.GA/jboss-vfs-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.1.0.GA/jboss-vfs-2.1.0.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR11/jbossxb-2.0.0.CR11.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.0.CR11/jbossxb-2.0.0.CR11-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.1.3.SP1/jboss-vfs-2.1.3.SP1.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.1.3.SP1/jboss-vfs-2.1.3.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
   <classpathentry kind="src" path="/pluggable-instrumentor"/>
   <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar" sourcepath="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 </classpath>
\ No newline at end of file

Deleted: projects/aop/trunk/asintegration-jmx/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerService.java
===================================================================
--- projects/aop/trunk/asintegration-jmx/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerService.java	2009-09-29 11:53:07 UTC (rev 94095)
+++ projects/aop/trunk/asintegration-jmx/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerService.java	2009-09-29 12:03:37 UTC (rev 94096)
@@ -1,335 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.aop.deployment;
-
-import java.io.File;
-
-import javassist.scopedpool.ScopedClassPoolFactory;
-
-import javax.management.Notification;
-
-import org.jboss.aop.AspectManager;
-import org.jboss.aop.AspectNotificationHandler;
-import org.jboss.aop.ClassLoaderValidation;
-import org.jboss.aop.asintegration.JBossIntegration;
-import org.jboss.aop.asintegration.core.AspectManagerServiceDelegate;
-import org.jboss.logging.Logger;
-import org.jboss.system.ServiceMBeanSupport;
-
-/**
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @author adrian at jboss.org
- * @version $Revision: 70855 $
- */
-public class AbstractAspectManagerService
-        extends ServiceMBeanSupport
-        implements AbstractAspectManagerServiceMBean, AspectNotificationHandler
-{
-
-   Logger log = Logger.getLogger(AbstractAspectManagerService.class);
-   
-   private static final String BASE_XML = "base-aop.xml";
-   
-   //private boolean registerHappensAfterStart;
-   
-   private AspectManagerServiceDelegate delegate;
-   
-   // Static -------------------------------------------------------
-
-   // Constructors -------------------------------------------------
-   /**
-    * This constructor shouuld only get called when used in JBoss 4.x.x, not in JBoss 5.
-    */
-   public AbstractAspectManagerService()
-   {
-      //Initialise the manager and delegate
-      delegate = createDelegate();
-      delegate.setBaseXml(BASE_XML);
-      delegate.setAspectManager(AspectManager.getTopLevelAspectManager());
-
-      //This constructor shouuld only get called when used in JBoss 4.x.x, not in JBoss 5.
-      //In JBoss 4 we need to maintain this field
-      delegate.setAspectManagerMaintainAdvisorInterceptors(true);
-      
-      //Default 
-      delegate.setUseBaseXml(true);
-   }
-
-   /**
-    * This constructor should only get called when used in JBoss 5 by JBossAspectLibrary.
-    */
-   public AbstractAspectManagerService(AspectManagerServiceDelegate delegate)
-   {
-      this.delegate = delegate;
-   }
-
-   
-   protected AspectManagerServiceDelegate createDelegate()
-   {
-      throw new RuntimeException("Should not use this class directly");
-   }
-
-   // Public -------------------------------------------------------
-
-   public void setJBossIntegrationWrapper(JBossIntegrationWrapperMBean integration)
-   {
-      JBossIntegration intgr = integration != null ? integration.getIntegration() : null;
-      delegate.setJBossIntegration(intgr);
-   }
-
-   protected ScopedClassPoolFactory createFactory() throws Exception
-   {
-      return delegate.createFactory();
-   }
-   
-   protected ClassLoaderValidation createClassLoaderValidation()
-   {
-      return delegate.createClassLoaderValidation();
-   }
-
-   @Override
-   protected void createService()
-           throws Exception
-   {
-      delegate.create();
-      AspectManager.notificationHandler = this;
-   }
-   
-   @Override
-   protected void destroyService() throws Exception
-   {
-      delegate.destroy();
-   }
-
-   @Override
-   protected void startService() throws Exception
-   {
-      delegate.start();
-   }
-
-   @Override
-   protected void stopService() throws Exception
-   {
-      delegate.stop();
-   }
-
-   public void attachClass(String classname)
-   {
-      Notification msg = new Notification("AOP class attached", this, getNextNotificationSequenceNumber());
-      msg.setUserData(classname);
-      sendNotification(msg);
-   }
-
-   public boolean getPrune()
-   {
-      return delegate.getPrune();
-   }
-
-   public void setPrune(boolean prune)
-   {
-      delegate.setPrune(prune);
-   }
-
-   public String getExclude()
-   {
-      return delegate.getExclude();
-   }
-
-   public void setExclude(String exclude)
-   {
-      delegate.setExclude(exclude);
-   }
-
-   public String getInclude()
-   {
-      return delegate.getInclude();
-   }
-
-   public void setInclude(String include)
-   {
-      delegate.setInclude(include);
-   }
-
-   public String getIgnore()
-   {
-      return delegate.getIgnore();
-   }
-
-   public void setIgnore(String ignore)
-   {
-      delegate.setIgnore(ignore);
-   }
-   
-   public String getIncludedInvisibleAnnotations()
-   {
-      return delegate.getIncludedInvisibleAnnotations();
-   }
-   
-   public void setIncludedInvisibleAnnotations(String ia)
-   {
-      delegate.setIncludedInvisibleAnnotations(ia);
-   }
-
-   /**
-    * The temporary directory to which dyn class files are written
-    */
-   public File getTmpClassesDir()
-   {
-      return delegate.getTmpClassesDir();
-   }
-
-   /**
-    * The temporary directory to which dyn class files are written
-    */
-   public void setTmpClassesDir(File tmpClassesDir)
-   {
-      delegate.setTmpClassesDir(tmpClassesDir);
-   }
-
-   /**
-    * Set the verbosity of aop logging.  It doesn't use log4j
-    */
-   public boolean getVerbose()
-   {
-      return delegate.getVerbose();
-   }
-
-   /**
-    * Set the verbosity of aop logging.
-    */
-   public void setVerbose(boolean verbose)
-   {
-      delegate.setVerbose(verbose);
-   }
-
-   /**
-    * Use aop optimizations.  Optional just in case there is a bug
-    */
-   public boolean getOptimized()
-   {
-      return delegate.getOptimized();
-   }
-
-   /**
-    * Use aop optimizations.  Optional just in case there is a bug
-    */
-   public void setOptimized(boolean verbose)
-   {
-      delegate.setOptimized(verbose);
-   }
-
-   public boolean getSuppressTransformationErrors()
-   {
-      return delegate.getSuppressReferenceErrors();
-   }
-
-   public void setSuppressTransformationErrors(boolean suppressTransformationErrors)
-   {
-      delegate.setSuppressTransformationErrors(suppressTransformationErrors);
-   }
-
-   public boolean getSuppressReferenceErrors()
-   {
-      return delegate.getSuppressReferenceErrors();
-   }
-
-   public void setSuppressReferenceErrors(boolean suppressReferenceErrors)
-   {
-      delegate.setSuppressReferenceErrors(suppressReferenceErrors);
-   }
-
-   public boolean getEnableTransformer()
-   {
-      return delegate.getEnableTransformer();
-   }
-
-   public String interceptorFactories()
-   {
-      return delegate.interceptorFactories();
-   }
-
-   public String aspectDefinitions()
-   {
-      return delegate.aspectDefinitions();
-   }
-
-   public String introductions()
-   {
-      return delegate.introductions();
-   }
-
-   public String stacks()
-   {
-      return delegate.stacks();
-   }
-
-   public String bindings()
-   {
-      return delegate.bindings();
-   }
-
-   public String pointcuts()
-   {
-      return delegate.pointcuts();
-   }
-
-   public String registeredClassLoaders()
-   {
-      return delegate.registeredClassLoaders();
-   }
-
-   public void setEnableTransformer(boolean enableTransformer)
-   {
-      delegate.setEnableTransformer(enableTransformer);
-   }
-
-   public boolean getEnableLoadtimeWeaving()
-   {
-      return delegate.getEnableLoadtimeWeaving();
-   }
-
-   public void setEnableLoadtimeWeaving(boolean enableTransformer)
-   {
-      delegate.setEnableLoadtimeWeaving(enableTransformer);
-   }
-
-   public String getInstrumentor()
-   {
-      return delegate.getInstrumentor();
-   }
-
-   public void setInstrumentor(String instrumentor)
-   {
-      delegate.setInstrumentor(instrumentor);
-   }
-   
-   public boolean getUseBaseXml()
-   {
-      return delegate.getUseBaseXml();
-   }
-
-   public synchronized void setUseBaseXml(boolean useBaseXml)
-   {
-      delegate.setUseBaseXml(useBaseXml);
-   }
-
-}

Deleted: projects/aop/trunk/asintegration-jmx/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerServiceMBean.java
===================================================================
--- projects/aop/trunk/asintegration-jmx/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerServiceMBean.java	2009-09-29 11:53:07 UTC (rev 94095)
+++ projects/aop/trunk/asintegration-jmx/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerServiceMBean.java	2009-09-29 12:03:37 UTC (rev 94096)
@@ -1,146 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.aop.deployment;
-
-/**
- * MBean interface.
- */
-public interface AbstractAspectManagerServiceMBean extends org.jboss.system.ServiceMBean {
-
-   /**
-    * The temporary directory to which dyn class files are written
-    */
-  java.io.File getTmpClassesDir() ;
-
-   /**
-    * The temporary directory to which dyn class files are written
-    */
-  void setTmpClassesDir(java.io.File tmpClassesDir) ;
-
-   /**
-    * Set the verbosity of aop logging. It doesn't use log4j
-    */
-  boolean getVerbose() ;
-
-   /**
-    * Set the verbosity of aop logging. It doesn't use log4j
-    */
-  void setVerbose(boolean verbose) ;
-
-   /**
-    * Use aop optimizations. Optional just in case there is a bug
-    */
-  boolean getOptimized() ;
-
-   /**
-    * Use aop optimizations. Optional just in case there is a bug
-    */
-  void setOptimized(boolean verbose) ;
-
-  boolean getSuppressTransformationErrors() ;
-
-  void setSuppressTransformationErrors(boolean suppressTransformationErrors) ;
-
-   /**
-    * The temporary directory to which dyn class files are written
-    */
-  boolean getEnableTransformer() ;
-
-   /**
-    * The temporary directory to which dyn class files are written
-    */
-  boolean getEnableLoadtimeWeaving() ;
-
-   /**
-    * The temporary directory to which dyn class files are written
-    */
-  java.lang.String interceptorFactories() ;
-
-   /**
-    * The temporary directory to which dyn class files are written
-    */
-  java.lang.String aspectDefinitions() ;
-
-  java.lang.String introductions() ;
-
-   /**
-    * The temporary directory to which dyn class files are written
-    */
-  java.lang.String stacks() ;
-
-   /**
-    * The temporary directory to which dyn class files are written
-    */
-  java.lang.String bindings() ;
-
-  java.lang.String pointcuts();
-  
-   /**
-    * The temporary directory to which dyn class files are written
-    */
-  java.lang.String registeredClassLoaders() ;
-
-   /**
-    * The temporary directory to which dyn class files are written
-    */
-   void setEnableTransformer(boolean enableTransformer) ;
-   void setEnableLoadtimeWeaving(boolean enableTransformer) ;
-
-   String getExclude();
-
-   void setExclude(String exclude);
-
-   String getInclude();
-
-   void setInclude(String include);
-   
-   String getIncludedInvisibleAnnotations();
-   
-   void setIncludedInvisibleAnnotations(String ia);
-
-   boolean getPrune();
-
-   void setPrune(boolean prune);
-   
-   String getIgnore();
-
-   void setIgnore(String ignore);
-   
-   String getInstrumentor();
-   
-   void setInstrumentor(String instrumentor);
-
-   /**
-    * Whether or not tu use base-aop.xml
-    */
-   boolean getUseBaseXml();
-   
-   /**
-    * Whether or not tu use base-aop.xml
-    */
-   void setUseBaseXml(boolean useBaseXml);
-   
-   /**
-    * Sets the MBean containing the JBossIntegration implementation
-    */
-   void setJBossIntegrationWrapper(JBossIntegrationWrapperMBean integration);
-}

Deleted: projects/aop/trunk/asintegration-jmx/src/main/java/org/jboss/aop/deployment/JBoss4IntegrationWrapperMBean.java
===================================================================
--- projects/aop/trunk/asintegration-jmx/src/main/java/org/jboss/aop/deployment/JBoss4IntegrationWrapperMBean.java	2009-09-29 11:53:07 UTC (rev 94095)
+++ projects/aop/trunk/asintegration-jmx/src/main/java/org/jboss/aop/deployment/JBoss4IntegrationWrapperMBean.java	2009-09-29 12:03:37 UTC (rev 94096)
@@ -1,33 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors. 
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.aop.deployment;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public interface JBoss4IntegrationWrapperMBean extends JBossIntegrationWrapperMBean
-{
-   void setClassPoolFactoryClassName(String classname);
-   String getClassPoolFactoryClassName();
-}

Added: projects/aop/trunk/asintegration-jmx/src/main/java/org/jboss/aop/deployment/JBoss4IntegrationWrapperMBean.java
===================================================================
--- projects/aop/trunk/asintegration-jmx/src/main/java/org/jboss/aop/deployment/JBoss4IntegrationWrapperMBean.java	                        (rev 0)
+++ projects/aop/trunk/asintegration-jmx/src/main/java/org/jboss/aop/deployment/JBoss4IntegrationWrapperMBean.java	2009-09-29 12:03:37 UTC (rev 94096)
@@ -0,0 +1,33 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors. 
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/ 
+package org.jboss.aop.deployment;
+
+/**
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface JBoss4IntegrationWrapperMBean extends JBossIntegrationWrapperMBean
+{
+   void setClassPoolFactoryClassName(String classname);
+   String getClassPoolFactoryClassName();
+}

Deleted: projects/aop/trunk/asintegration-jmx/src/main/java/org/jboss/aop/deployment/JBossIntegrationWrapperMBean.java
===================================================================
--- projects/aop/trunk/asintegration-jmx/src/main/java/org/jboss/aop/deployment/JBossIntegrationWrapperMBean.java	2009-09-29 11:53:07 UTC (rev 94095)
+++ projects/aop/trunk/asintegration-jmx/src/main/java/org/jboss/aop/deployment/JBossIntegrationWrapperMBean.java	2009-09-29 12:03:37 UTC (rev 94096)
@@ -1,34 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors. 
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.aop.deployment;
-
-import org.jboss.aop.asintegration.JBossIntegration;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public interface JBossIntegrationWrapperMBean
-{
-   JBossIntegration getIntegration();
-}

Modified: projects/aop/trunk/asintegration-mc/.classpath
===================================================================
--- projects/aop/trunk/asintegration-mc/.classpath	2009-09-29 11:53:07 UTC (rev 94095)
+++ projects/aop/trunk/asintegration-mc/.classpath	2009-09-29 12:03:37 UTC (rev 94096)
@@ -13,50 +13,55 @@
   <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar" sourcepath="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/urbanophile/java-getopt/1.0.9/java-getopt-1.0.9.jar"/>
+  <classpathentry kind="var" path="M2_REPO/gnu-getopt/getopt/1.0.12-brew/getopt-1.0.12-brew.jar"/>
   <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.10.0.GA/javassist-3.10.0.GA.jar"/>
-  <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/>
   <classpathentry kind="src" path="/jboss-aop"/>
   <classpathentry kind="src" path="/jboss-aop-asintegration-core"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.4.GA/jboss-aop-mc-int-2.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.4.GA/jboss-aop-mc-int-2.0.4.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-bootstrap/5.0.0.CR1/jboss-as-bootstrap-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-bootstrap/5.0.0.CR1/jboss-as-bootstrap-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.0.0.CR1/jboss-as-j2se-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.0.0.CR1/jboss-as-j2se-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.0.0.CR1/jboss-as-j2se-5.0.0.CR1-tests.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.0.0.CR1/jboss-as-jmx-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.0.0.CR1/jboss-as-jmx-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-main/5.0.0.CR1/jboss-as-main-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-main/5.0.0.CR1/jboss-as-main-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.0.0.CR1/jboss-as-mbeans-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.0.0.CR1/jboss-as-mbeans-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system/5.0.0.CR1/jboss-as-system-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system/5.0.0.CR1/jboss-as-system-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.0.0.CR1/jboss-as-system-jmx-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.0.0.CR1/jboss-as-system-jmx-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloader/2.0.3.GA/jboss-classloader-2.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloader/2.0.3.GA/jboss-classloader-2.0.3.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading/2.0.3.GA/jboss-classloading-2.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading/2.0.3.GA/jboss-classloading-2.0.3.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.3.GA/jboss-classloading-spi-5.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.3.GA/jboss-classloading-spi-5.0.3.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.3.GA/jboss-classloading-vfs-2.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.3.GA/jboss-classloading-vfs-2.0.3.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.11.GA/jboss-common-core-2.2.11.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.11.GA/jboss-common-core-2.2.11.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.4.GA/jboss-dependency-2.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.4.GA/jboss-dependency-2.0.4.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.5.GA/jboss-deployers-client-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.5.GA/jboss-deployers-client-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.5.GA/jboss-deployers-client-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.5.GA/jboss-deployers-client-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.5.GA/jboss-deployers-core-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.5.GA/jboss-deployers-core-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.5.GA/jboss-deployers-core-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.5.GA/jboss-deployers-core-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.5.GA/jboss-deployers-impl-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.5.GA/jboss-deployers-impl-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.5.GA/jboss-deployers-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.5.GA/jboss-deployers-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.5.GA/jboss-deployers-structure-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.5.GA/jboss-deployers-structure-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.5.GA/jboss-deployers-vfs-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.5.GA/jboss-deployers-vfs-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.5.GA/jboss-deployers-vfs-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.5.GA/jboss-deployers-vfs-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.4.GA/jboss-kernel-2.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.4.GA/jboss-kernel-2.0.4.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.0.0.GA/jboss-managed-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.0.0.GA/jboss-managed-2.0.0.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.0.0.GA/jboss-metatype-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.0.0.GA/jboss-metatype-2.0.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.9.GA/jboss-aop-mc-int-2.0.9.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.9.GA/jboss-aop-mc-int-2.0.9.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA-tests.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.1.0.GA/jboss-as-jmx-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.1.0.GA/jboss-as-jmx-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-main/5.1.0.GA/jboss-as-main-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-main/5.1.0.GA/jboss-as-main-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.1.0.GA/jboss-as-mbeans-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.1.0.GA/jboss-as-mbeans-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system/5.1.0.GA/jboss-as-system-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system/5.1.0.GA/jboss-as-system-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.1.0.GA/jboss-as-system-jmx-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.1.0.GA/jboss-as-system-jmx-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/bootstrap/jboss-bootstrap/1.0.0-Beta-3/jboss-bootstrap-1.0.0-Beta-3.jar" sourcepath="M2_REPO/org/jboss/bootstrap/jboss-bootstrap/1.0.0-Beta-3/jboss-bootstrap-1.0.0-Beta-3-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloader/2.0.6.SP1/jboss-classloader-2.0.6.SP1.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloader/2.0.6.SP1/jboss-classloader-2.0.6.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading/2.0.6.SP1/jboss-classloading-2.0.6.SP1.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading/2.0.6.SP1/jboss-classloading-2.0.6.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.SP1/jboss-classloading-spi-5.1.0.SP1.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.SP1/jboss-classloading-spi-5.1.0.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.6.SP1/jboss-classloading-vfs-2.0.6.SP1.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.6.SP1/jboss-classloading-vfs-2.0.6.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.9.GA/jboss-dependency-2.0.9.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.9.GA/jboss-dependency-2.0.9.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.8.GA/jboss-deployers-client-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.8.GA/jboss-deployers-client-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.8.GA/jboss-deployers-client-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.8.GA/jboss-deployers-client-spi-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.8.GA/jboss-deployers-core-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.8.GA/jboss-deployers-core-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.8.GA/jboss-deployers-core-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.8.GA/jboss-deployers-core-spi-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.8.GA/jboss-deployers-impl-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.8.GA/jboss-deployers-impl-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.8.GA/jboss-deployers-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.8.GA/jboss-deployers-spi-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.8.GA/jboss-deployers-structure-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.8.GA/jboss-deployers-structure-spi-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.8.GA/jboss-deployers-vfs-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.8.GA/jboss-deployers-vfs-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.8.GA/jboss-deployers-vfs-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.8.GA/jboss-deployers-vfs-spi-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.9.GA/jboss-kernel-2.0.9.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.9.GA/jboss-kernel-2.0.9.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logbridge/jboss-logbridge/1.0.0.GA/jboss-logbridge-1.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/logbridge/jboss-logbridge/1.0.0.GA/jboss-logbridge-1.0.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logmanager/jboss-logmanager/1.0.0.GA/jboss-logmanager-1.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/logmanager/jboss-logmanager/1.0.0.GA/jboss-logmanager-1.0.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.GA/jboss-metatype-2.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.GA/jboss-metatype-2.1.1.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.GA/jboss-profileservice-spi-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.GA/jboss-profileservice-spi-5.1.0.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.0.GA/jboss-server-manager-0.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.0.GA/jboss-server-manager-0.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.3.SP1/jboss-security-spi-2.0.3.SP1.jar" sourcepath="M2_REPO/org/jboss/security/jboss-security-spi/2.0.3.SP1/jboss-security-spi-2.0.3.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-server-manager/1.0.2.GA/jboss-server-manager-1.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-server-manager/1.0.2.GA/jboss-server-manager-1.0.2.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.0.GA/jboss-test-1.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/test/jboss-test/1.1.0.GA/jboss-test-1.1.0.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.1.0.GA/jboss-vfs-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.1.0.GA/jboss-vfs-2.1.0.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.4.GA/jboss-test-1.1.4.GA.jar" sourcepath="M2_REPO/org/jboss/test/jboss-test/1.1.4.GA/jboss-test-1.1.4.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.1.3.SP1/jboss-vfs-2.1.3.SP1.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.1.3.SP1/jboss-vfs-2.1.3.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx-client/2.0.3.SP1/jbosssx-client-2.0.3.SP1.jar" sourcepath="M2_REPO/org/jboss/security/jbosssx-client/2.0.3.SP1/jbosssx-client-2.0.3.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/naming/jnp-client/5.0.1.GA/jnp-client-5.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/naming/jnp-client/5.0.1.GA/jnp-client-5.0.1.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
   <classpathentry kind="src" path="/pluggable-instrumentor"/>
   <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar" sourcepath="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1-sources.jar"/>
@@ -64,6 +69,5 @@
   <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 </classpath>
\ No newline at end of file

Modified: projects/aop/trunk/aspects/.classpath
===================================================================
--- projects/aop/trunk/aspects/.classpath	2009-09-29 11:53:07 UTC (rev 94095)
+++ projects/aop/trunk/aspects/.classpath	2009-09-29 12:03:37 UTC (rev 94096)
@@ -10,11 +10,11 @@
 	<classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar" sourcepath="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1-sources.jar"/>
 	<classpathentry kind="var" path="M2_REPO/javassist/javassist/3.10.0.GA/javassist-3.10.0.GA.jar"/>
 	<classpathentry kind="src" path="/jboss-aop"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.11.GA/jboss-common-core-2.2.11.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.11.GA/jboss-common-core-2.2.11.GA-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA-sources.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jca-api/1.5.0.CR2/jboss-jca-api-1.5.0.CR2.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jca-api/1.5.0.CR2/jboss-jca-api-1.5.0.CR2-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA-sources.jar"/>
 	<classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA-sources.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-servlet-api/2.5.0.CR2/jboss-servlet-api-2.5.0.CR2.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-servlet-api/2.5.0.CR2/jboss-servlet-api-2.5.0.CR2-sources.jar"/>

Modified: projects/aop/trunk/build/.classpath
===================================================================
--- projects/aop/trunk/build/.classpath	2009-09-29 11:53:07 UTC (rev 94095)
+++ projects/aop/trunk/build/.classpath	2009-09-29 12:03:37 UTC (rev 94096)
@@ -7,10 +7,10 @@
   <classpathentry kind="var" path="M2_REPO/com/google/code/jarjar/1.0/jarjar-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.10.0.GA/javassist-3.10.0.GA.jar"/>
   <classpathentry kind="src" path="/jboss-aop"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.11.GA/jboss-common-core-2.2.11.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.11.GA/jboss-common-core-2.2.11.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA-sources.jar"/>

Modified: projects/aop/trunk/deployers/.classpath
===================================================================
--- projects/aop/trunk/deployers/.classpath	2009-09-29 11:53:07 UTC (rev 94095)
+++ projects/aop/trunk/deployers/.classpath	2009-09-29 12:03:37 UTC (rev 94096)
@@ -10,51 +10,56 @@
   <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar" sourcepath="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/urbanophile/java-getopt/1.0.9/java-getopt-1.0.9.jar"/>
+  <classpathentry kind="var" path="M2_REPO/gnu-getopt/getopt/1.0.12-brew/getopt-1.0.12-brew.jar"/>
   <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.10.0.GA/javassist-3.10.0.GA.jar"/>
-  <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/>
   <classpathentry kind="src" path="/jboss-aop"/>
   <classpathentry kind="src" path="/jboss-aop-asintegration-core"/>
   <classpathentry kind="src" path="/jboss-aop-asintegration-mc"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.4.GA/jboss-aop-mc-int-2.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.4.GA/jboss-aop-mc-int-2.0.4.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-bootstrap/5.0.0.CR1/jboss-as-bootstrap-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-bootstrap/5.0.0.CR1/jboss-as-bootstrap-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.0.0.CR1/jboss-as-j2se-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.0.0.CR1/jboss-as-j2se-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.0.0.CR1/jboss-as-j2se-5.0.0.CR1-tests.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.0.0.CR1/jboss-as-jmx-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.0.0.CR1/jboss-as-jmx-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-main/5.0.0.CR1/jboss-as-main-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-main/5.0.0.CR1/jboss-as-main-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.0.0.CR1/jboss-as-mbeans-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.0.0.CR1/jboss-as-mbeans-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system/5.0.0.CR1/jboss-as-system-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system/5.0.0.CR1/jboss-as-system-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.0.0.CR1/jboss-as-system-jmx-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.0.0.CR1/jboss-as-system-jmx-5.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloader/2.0.3.GA/jboss-classloader-2.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloader/2.0.3.GA/jboss-classloader-2.0.3.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading/2.0.3.GA/jboss-classloading-2.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading/2.0.3.GA/jboss-classloading-2.0.3.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.3.GA/jboss-classloading-spi-5.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.3.GA/jboss-classloading-spi-5.0.3.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.3.GA/jboss-classloading-vfs-2.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.3.GA/jboss-classloading-vfs-2.0.3.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.11.GA/jboss-common-core-2.2.11.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.11.GA/jboss-common-core-2.2.11.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.4.GA/jboss-dependency-2.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.4.GA/jboss-dependency-2.0.4.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.5.GA/jboss-deployers-client-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.5.GA/jboss-deployers-client-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.5.GA/jboss-deployers-client-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.5.GA/jboss-deployers-client-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.5.GA/jboss-deployers-core-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.5.GA/jboss-deployers-core-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.5.GA/jboss-deployers-core-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.5.GA/jboss-deployers-core-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.5.GA/jboss-deployers-impl-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.5.GA/jboss-deployers-impl-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.5.GA/jboss-deployers-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.5.GA/jboss-deployers-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.5.GA/jboss-deployers-structure-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.5.GA/jboss-deployers-structure-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.5.GA/jboss-deployers-vfs-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.5.GA/jboss-deployers-vfs-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.5.GA/jboss-deployers-vfs-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.5.GA/jboss-deployers-vfs-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.4.GA/jboss-kernel-2.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.4.GA/jboss-kernel-2.0.4.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.0.0.GA/jboss-managed-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.0.0.GA/jboss-managed-2.0.0.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.0.0.GA/jboss-metatype-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.0.0.GA/jboss-metatype-2.0.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.9.GA/jboss-aop-mc-int-2.0.9.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.9.GA/jboss-aop-mc-int-2.0.9.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA-tests.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.1.0.GA/jboss-as-jmx-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.1.0.GA/jboss-as-jmx-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-main/5.1.0.GA/jboss-as-main-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-main/5.1.0.GA/jboss-as-main-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.1.0.GA/jboss-as-mbeans-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.1.0.GA/jboss-as-mbeans-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system/5.1.0.GA/jboss-as-system-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system/5.1.0.GA/jboss-as-system-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.1.0.GA/jboss-as-system-jmx-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.1.0.GA/jboss-as-system-jmx-5.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/bootstrap/jboss-bootstrap/1.0.0-Beta-3/jboss-bootstrap-1.0.0-Beta-3.jar" sourcepath="M2_REPO/org/jboss/bootstrap/jboss-bootstrap/1.0.0-Beta-3/jboss-bootstrap-1.0.0-Beta-3-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloader/2.0.6.SP1/jboss-classloader-2.0.6.SP1.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloader/2.0.6.SP1/jboss-classloader-2.0.6.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading/2.0.6.SP1/jboss-classloading-2.0.6.SP1.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading/2.0.6.SP1/jboss-classloading-2.0.6.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.SP1/jboss-classloading-spi-5.1.0.SP1.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.SP1/jboss-classloading-spi-5.1.0.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.6.SP1/jboss-classloading-vfs-2.0.6.SP1.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.6.SP1/jboss-classloading-vfs-2.0.6.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.15.GA/jboss-common-core-2.2.15.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.9.GA/jboss-dependency-2.0.9.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.9.GA/jboss-dependency-2.0.9.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.8.GA/jboss-deployers-client-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.8.GA/jboss-deployers-client-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.8.GA/jboss-deployers-client-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.8.GA/jboss-deployers-client-spi-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.8.GA/jboss-deployers-core-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.8.GA/jboss-deployers-core-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.8.GA/jboss-deployers-core-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.8.GA/jboss-deployers-core-spi-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.8.GA/jboss-deployers-impl-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.8.GA/jboss-deployers-impl-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.8.GA/jboss-deployers-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.8.GA/jboss-deployers-spi-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.8.GA/jboss-deployers-structure-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.8.GA/jboss-deployers-structure-spi-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.8.GA/jboss-deployers-vfs-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.8.GA/jboss-deployers-vfs-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.8.GA/jboss-deployers-vfs-spi-2.0.8.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.8.GA/jboss-deployers-vfs-spi-2.0.8.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.9.GA/jboss-kernel-2.0.9.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.9.GA/jboss-kernel-2.0.9.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logbridge/jboss-logbridge/1.0.0.GA/jboss-logbridge-1.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/logbridge/jboss-logbridge/1.0.0.GA/jboss-logbridge-1.0.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logmanager/jboss-logmanager/1.0.0.GA/jboss-logmanager-1.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/logmanager/jboss-logmanager/1.0.0.GA/jboss-logmanager-1.0.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.2.GA/jboss-mdr-2.0.2.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.GA/jboss-metatype-2.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.GA/jboss-metatype-2.1.1.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.GA/jboss-profileservice-spi-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.GA/jboss-profileservice-spi-5.1.0.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.0.GA/jboss-server-manager-0.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.0.GA/jboss-server-manager-0.1.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.3.SP1/jboss-security-spi-2.0.3.SP1.jar" sourcepath="M2_REPO/org/jboss/security/jboss-security-spi/2.0.3.SP1/jboss-security-spi-2.0.3.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-server-manager/1.0.2.GA/jboss-server-manager-1.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-server-manager/1.0.2.GA/jboss-server-manager-1.0.2.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.0.GA/jboss-test-1.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/test/jboss-test/1.1.0.GA/jboss-test-1.1.0.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.1.0.GA/jboss-vfs-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.1.0.GA/jboss-vfs-2.1.0.GA-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.4.GA/jboss-test-1.1.4.GA.jar" sourcepath="M2_REPO/org/jboss/test/jboss-test/1.1.4.GA/jboss-test-1.1.4.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.1.3.SP1/jboss-vfs-2.1.3.SP1.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.1.3.SP1/jboss-vfs-2.1.3.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx-client/2.0.3.SP1/jbosssx-client-2.0.3.SP1.jar" sourcepath="M2_REPO/org/jboss/security/jbosssx-client/2.0.3.SP1/jbosssx-client-2.0.3.SP1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/naming/jnp-client/5.0.1.GA/jnp-client-5.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/naming/jnp-client/5.0.1.GA/jnp-client-5.0.1.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
   <classpathentry kind="src" path="/pluggable-instrumentor"/>
   <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar" sourcepath="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1-sources.jar"/>
@@ -62,6 +67,5 @@
   <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 </classpath>
\ No newline at end of file

Modified: projects/aop/trunk/pom.xml
===================================================================
--- projects/aop/trunk/pom.xml	2009-09-29 11:53:07 UTC (rev 94095)
+++ projects/aop/trunk/pom.xml	2009-09-29 12:03:37 UTC (rev 94096)
@@ -21,20 +21,17 @@
   
   <properties>
     <version.javassist.javassist>3.10.0.GA</version.javassist.javassist>
-    <version.jboss.jbossas.core-libs>4.0.4.GA</version.jboss.jbossas.core-libs>
-    <version.org.jboss.jbossas>5.0.0.CR1</version.org.jboss.jbossas>
-    <version.org.jboss.jboss-common-core>2.2.11.GA</version.org.jboss.jboss-common-core>
-    <version.org.jboss.cl>2.0.3.GA</version.org.jboss.cl>
-    <version.org.jboss.deployers>2.0.5.GA</version.org.jboss.deployers>
-    <version.org.jboss.integration>5.0.3.GA</version.org.jboss.integration>
+    <version.org.jboss.jbossas>5.1.0.GA</version.org.jboss.jbossas>
+    <version.org.jboss.jboss-common-core>2.2.15.GA</version.org.jboss.jboss-common-core>
+    <version.org.jboss.cl>2.0.6.SP1</version.org.jboss.cl>
+    <version.org.jboss.deployers>2.0.8.GA</version.org.jboss.deployers>
+    <version.org.jboss.integration>5.1.0.SP1</version.org.jboss.integration>
     <version.org.jboss.jboss-reflect>2.0.2.GA</version.org.jboss.jboss-reflect>
-    <version.org.jboss.jboss-vfs>2.1.0.GA</version.org.jboss.jboss-vfs>
-    <version.org.jboss.microcontainer.jboss-kernel>2.0.4.GA</version.org.jboss.microcontainer.jboss-kernel>
-    <version.org.jboss.microcontainer.jboss-aop-mc-int>2.0.4.GA</version.org.jboss.microcontainer.jboss-aop-mc-int>
-    <version.org.jboss.microcontainer.jboss-dependency>2.0.4.GA</version.org.jboss.microcontainer.jboss-dependency>
-    <version.org.jboss.logging>2.0.5.GA</version.org.jboss.logging>
-    <version.org.jboss.man>2.0.0.GA</version.org.jboss.man>
-    <version.org.jboss.mdr>2.0.1.GA</version.org.jboss.mdr>
+    <version.org.jboss.jboss-vfs>2.1.3.SP1</version.org.jboss.jboss-vfs>
+    <version.org.jboss.microcontainer.jboss-kernel>2.0.9.GA</version.org.jboss.microcontainer.jboss-kernel>
+    <version.org.jboss.logging>2.1.0.GA</version.org.jboss.logging>
+    <version.org.jboss.man>2.1.1.GA</version.org.jboss.man>
+    <version.org.jboss.mdr>2.0.2.GA</version.org.jboss.mdr>
     <version.xdoclet>1.2.3</version.xdoclet>
     <version.jarjar>1.0</version.jarjar>
   </properties>
@@ -112,121 +109,7 @@
         <version>1.0.0.CR5</version>
         <scope>test</scope>
       </dependency>
-      
-      <!-- JBossAS core libs -->
       <dependency>
-        <groupId>jboss.jbossas.core-libs</groupId>
-        <artifactId>jboss-aspect-library</artifactId>
-        <version>${version.jboss.jbossas.core-libs}</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss.jbossas.core-libs</groupId>
-        <artifactId>jbossha</artifactId>
-        <version>${version.jboss.jbossas.core-libs}</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss.jbossas.core-libs</groupId>
-        <artifactId>jboss-jaxrpc</artifactId>
-        <version>${version.jboss.jbossas.core-libs}</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss.jbossas.core-libs</groupId>
-        <artifactId>jboss-saaj</artifactId>
-        <version>${version.jboss.jbossas.core-libs}</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss.jbossas.core-libs</groupId>
-        <artifactId>jboss-xml-binding</artifactId>
-        <version>${version.jboss.jbossas.core-libs}</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss.jbossas.core-libs</groupId>
-        <artifactId>namespace</artifactId>
-        <version>${version.jboss.jbossas.core-libs}</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss.jbossas.core-libs</groupId>
-        <artifactId>jboss-common-client</artifactId>
-        <version>${version.jboss.jbossas.core-libs}</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss.jbossas.core-libs</groupId>
-        <artifactId>jboss-hibernate</artifactId>
-        <version>${version.jboss.jbossas.core-libs}</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss.jbossas.core-libs</groupId>
-        <artifactId>jboss-jca</artifactId>
-        <version>${version.jboss.jbossas.core-libs}</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss.jbossas.core-libs</groupId>
-        <artifactId>jboss-jca</artifactId>
-        <version>${version.jboss.jbossas.core-libs}</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss.jbossas.core-libs</groupId>
-        <artifactId>jbosssx</artifactId>
-        <version>${version.jboss.jbossas.core-libs}</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss.jbossas.core-libs</groupId>
-        <artifactId>jmx-invoker-adaptor-client</artifactId>
-        <version>${version.jboss.jbossas.core-libs}</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss.jbossas.core-libs</groupId>
-        <artifactId>jboss-common</artifactId>
-        <version>${version.jboss.jbossas.core-libs}</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss.jbossas.core-libs</groupId>
-        <artifactId>jboss-j2ee</artifactId>
-        <version>${version.jboss.jbossas.core-libs}</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss.jbossas.core-libs</groupId>
-        <artifactId>jboss-jmx</artifactId>
-        <version>${version.jboss.jbossas.core-libs}</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss.jbossas.core-libs</groupId>
-        <artifactId>jboss-system</artifactId>
-        <version>${version.jboss.jbossas.core-libs}</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss.jbossas.core-libs</groupId>
-        <artifactId>jnp-client</artifactId>
-        <version>${version.jboss.jbossas.core-libs}</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss.jbossas.core-libs</groupId>
-        <artifactId>jboss-common-jdbc-wrapper</artifactId>
-        <version>${version.jboss.jbossas.core-libs}</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss.jbossas.core-libs</groupId>
-        <artifactId>jboss</artifactId>
-        <version>${version.jboss.jbossas.core-libs}</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss.jbossas.core-libs</groupId>
-        <artifactId>jboss-local-jdbc</artifactId>
-        <version>${version.jboss.jbossas.core-libs}</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss.jbossas.core-libs</groupId>
-        <artifactId>jboss-transaction</artifactId>
-        <version>${version.jboss.jbossas.core-libs}</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss.jbossas.core-libs</groupId>
-        <artifactId>jnpserver</artifactId>
-        <version>${version.jboss.jbossas.core-libs}</version>
-      </dependency>
-      <!-- End JBoss AS core libs -->
-              
-      <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>3.8.1</version>
@@ -422,12 +305,12 @@
       <dependency>
         <groupId>org.jboss.microcontainer</groupId>
         <artifactId>jboss-aop-mc-int</artifactId>
-        <version>${version.org.jboss.microcontainer.jboss-aop-mc-int}</version>
+        <version>${version.org.jboss.microcontainer.jboss-kernel}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.microcontainer</groupId>
         <artifactId>jboss-dependency</artifactId>
-        <version>${version.org.jboss.microcontainer.jboss-dependency}</version>
+        <version>${version.org.jboss.microcontainer.jboss-kernel}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.javaee</groupId>
@@ -467,6 +350,11 @@
         </exclusions>
       </dependency>
       <dependency>
+        <groupId>org.jboss.jbossas</groupId>
+        <artifactId>jboss-as-main</artifactId>
+        <version>${version.org.jboss.jbossas}</version>
+      </dependency>
+      <dependency>
         <groupId>org.jboss.logging</groupId>
         <artifactId>jboss-logging-spi</artifactId>
         <version>${version.org.jboss.logging}</version>




More information about the jboss-cvs-commits mailing list