[jboss-cvs] JBossAS SVN: r97849 - in projects/aop/branches/classpool_JBAOP-742: aop/src/main/java/org/jboss/aop/util/logging and 5 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Dec 15 11:40:16 EST 2009


Author: flavia.rainone at jboss.com
Date: 2009-12-15 11:40:15 -0500 (Tue, 15 Dec 2009)
New Revision: 97849

Added:
   projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/deployment/
   projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerService.java
   projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerServiceMBean.java
   projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/deployment/JBossIntegrationWrapperMBean.java
Removed:
   projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/deployers/
Modified:
   projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/util/logging/SystemOutLoggerPlugin.java
   projects/aop/branches/classpool_JBAOP-742/asintegration-core/pom.xml
   projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/asintegration/core/AspectManagerServiceDelegate.java
   projects/aop/branches/classpool_JBAOP-742/pom.xml
Log:
[JBAOP-751] Remove depdencies on JMX internals by classes in asintegration-mc

Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/util/logging/SystemOutLoggerPlugin.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/util/logging/SystemOutLoggerPlugin.java	2009-12-15 16:35:15 UTC (rev 97848)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/util/logging/SystemOutLoggerPlugin.java	2009-12-15 16:40:15 UTC (rev 97849)
@@ -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/branches/classpool_JBAOP-742/asintegration-core/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-core/pom.xml	2009-12-15 16:35:15 UTC (rev 97848)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-core/pom.xml	2009-12-15 16:40:15 UTC (rev 97849)
@@ -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/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/asintegration/core/AspectManagerServiceDelegate.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/asintegration/core/AspectManagerServiceDelegate.java	2009-12-15 16:35:15 UTC (rev 97848)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/asintegration/core/AspectManagerServiceDelegate.java	2009-12-15 16:40:15 UTC (rev 97849)
@@ -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");

Added: projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerService.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerService.java	                        (rev 0)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerService.java	2009-12-15 16:40:15 UTC (rev 97849)
@@ -0,0 +1,323 @@
+/*
+* 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 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;
+
+/**
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @author adrian at jboss.org
+ * @version $Revision$
+ */
+public class AbstractAspectManagerService
+        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();
+   }
+
+   public void create()
+           throws Exception
+   {
+      delegate.create();
+      AspectManager.notificationHandler = this;
+   }
+   
+   public void destroy()
+   {
+      delegate.destroy();
+   }
+
+   public void start() throws Exception
+   {
+      delegate.start();
+   }
+
+   public void stop()
+   {
+      delegate.stop();
+   }
+
+   public void attachClass(String classname)
+   {
+   }
+
+   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);
+   }
+
+}


Property changes on: projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerService.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerServiceMBean.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerServiceMBean.java	                        (rev 0)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerServiceMBean.java	2009-12-15 16:40:15 UTC (rev 97849)
@@ -0,0 +1,170 @@
+/*
+* 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 {
+
+   /**
+    * create the service, do expensive operations etc
+    * 
+    * @throws Exception for any error
+    */
+   void create() throws Exception;
+   
+   /**
+    * start the service, create is already called
+    * 
+    * @throws Exception for any error
+    */
+   void start() throws Exception;
+   
+   /**
+    * stop the service
+    */
+   void stop();
+   
+   /**
+    * destroy the service, tear down 
+    */
+   void destroy();
+
+   /**
+    * 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);
+}


Property changes on: projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerServiceMBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/deployment/JBossIntegrationWrapperMBean.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/deployment/JBossIntegrationWrapperMBean.java	                        (rev 0)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/deployment/JBossIntegrationWrapperMBean.java	2009-12-15 16:40:15 UTC (rev 97849)
@@ -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$
+ */
+public interface JBossIntegrationWrapperMBean
+{
+   JBossIntegration getIntegration();
+}


Property changes on: projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/deployment/JBossIntegrationWrapperMBean.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: projects/aop/branches/classpool_JBAOP-742/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/pom.xml	2009-12-15 16:35:15 UTC (rev 97848)
+++ projects/aop/branches/classpool_JBAOP-742/pom.xml	2009-12-15 16:40:15 UTC (rev 97849)
@@ -113,121 +113,8 @@
         <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>
@@ -438,12 +325,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>
@@ -483,6 +370,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