[jboss-cvs] JBossAS SVN: r101543 - in projects/aop/branches/classpool_JBAOP-742: aop and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 26 08:43:47 EST 2010
Author: flavia.rainone at jboss.com
Date: 2010-02-26 08:43:46 -0500 (Fri, 26 Feb 2010)
New Revision: 101543
Modified:
projects/aop/branches/classpool_JBAOP-742/aop/pom.xml
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/AspectManager.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/reflectprototype/JavassistAopTypeInfoFactoryImpl.java
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-jmx/pom.xml
projects/aop/branches/classpool_JBAOP-742/asintegration-mc/pom.xml
projects/aop/branches/classpool_JBAOP-742/aspects/pom.xml
projects/aop/branches/classpool_JBAOP-742/build/pom.xml
projects/aop/branches/classpool_JBAOP-742/deployers/pom.xml
projects/aop/branches/classpool_JBAOP-742/pom.xml
Log:
[JBAOP-742] Updated pom references.
Modified: projects/aop/branches/classpool_JBAOP-742/aop/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/pom.xml 2010-02-26 13:29:35 UTC (rev 101542)
+++ projects/aop/branches/classpool_JBAOP-742/aop/pom.xml 2010-02-26 13:43:46 UTC (rev 101543)
@@ -348,7 +348,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<scope>test</scope>
</dependency>
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/AspectManager.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/AspectManager.java 2010-02-26 13:29:35 UTC (rev 101542)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/AspectManager.java 2010-02-26 13:43:46 UTC (rev 101543)
@@ -294,7 +294,7 @@
ClassLoaderRepository classLoaderRepository = ClassLoaderRepository.getInstance();
ClassPoolRepository classPoolRepository = ClassPoolRepository.getInstance();
classLoaderRepository.setAspectManager(manager);
- classPoolRepository.setClassPoolRepositoryCallback(classLoaderRepository);
+ classPoolRepository.addClassPoolRepositoryCallback(classLoaderRepository);
//classPoolRepository.setClassPoolFactory(new AOPClassPoolFactory());
if (!verbose)
@@ -1028,15 +1028,22 @@
public boolean isNonAdvisableClassName(String classname)
{
if (ignoreClass(classname)) return true;
+ if (classname.startsWith("org.jboss.aop.") ||
+ classname.endsWith("$aop") ||
+ classname.contains('.' + JoinPointGenerator.JOINPOINT_CLASS_PREFIX) ||
+ // System classes
+ classname.startsWith("$Proxy")
+ || (classname.indexOf('$')!= 0 && (classname.contains("$JoinPoint_") || classname.endsWith("Advisor")))
+ ) return true;
if (includeClass(classname)) return false;
if (excludeClass(classname)) return true;
- return (classname.startsWith("org.jboss.aop.") ||
- classname.endsWith("$aop") ||
+ return (/*classname.startsWith("org.jboss.aop.") ||
+ classname.endsWith("$aop") ||*/
classname.startsWith("javassist") ||
classname.startsWith("org.jboss.util.") ||
classname.startsWith("gnu.trove.") ||
classname.startsWith("EDU.oswego.cs.dl.util.concurrent.") ||
- classname.contains('.' + JoinPointGenerator.JOINPOINT_CLASS_PREFIX) ||
+ //classname.contains('.' + JoinPointGenerator.JOINPOINT_CLASS_PREFIX) ||
// System classes
classname.startsWith("org.apache.tools.ant") ||
classname.startsWith("org.apache.crimson") ||
@@ -1054,8 +1061,9 @@
classname.startsWith("com.sun.") ||
classname.startsWith("junit") ||
classname.startsWith("jrockit.") ||
- classname.startsWith("com.bea.vm.") ||
- classname.startsWith("$Proxy")
+ classname.startsWith("com.bea.vm.") //||
+ //classname.startsWith("$Proxy")
+ //|| (classname.indexOf('$')!= 0 && (classname.contains("$JoinPoint_") || classname.endsWith("Advisor")))
);
}
@@ -1110,6 +1118,10 @@
return null;
}
lock.lockRead();
+/* if (className.contains("POJO"))
+ {
+ System.out.println("HERE");
+ }*/
try
{
if (weavingStrategy == null)
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/reflectprototype/JavassistAopTypeInfoFactoryImpl.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/reflectprototype/JavassistAopTypeInfoFactoryImpl.java 2010-02-26 13:29:35 UTC (rev 101542)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/reflectprototype/JavassistAopTypeInfoFactoryImpl.java 2010-02-26 13:43:46 UTC (rev 101543)
@@ -129,7 +129,7 @@
* @return the info
*/
@Override
- public Object get(Class clazz)
+ public TypeInfo get(Class clazz)
{
throw new RuntimeException("This method is void!!!");
}
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 2010-02-26 13:29:35 UTC (rev 101542)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/util/logging/SystemOutLoggerPlugin.java 2010-02-26 13:43:46 UTC (rev 101543)
@@ -22,6 +22,8 @@
package org.jboss.aop.util.logging;
import org.jboss.logging.LoggerPlugin;
+import org.jboss.logging.LoggerPluginInstance;
+import org.jboss.logging.NullLoggerPluginInstance;
/**
*
@@ -38,6 +40,12 @@
private static final String DEBUG = "[aop-debug]";
String name;
+
+ public LoggerPluginInstance getInstance(String name, final String resourceBundleName)
+ {
+ return new NullLoggerPluginInstance(name, this);
+ }
+
public void debug(Object message)
{
print(DEBUG, message, null);
Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-core/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-core/pom.xml 2010-02-26 13:29:35 UTC (rev 101542)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-core/pom.xml 2010-02-26 13:43:46 UTC (rev 101543)
@@ -123,7 +123,7 @@
<artifactId>jboss-logging-spi</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<scope>test</scope>
</dependency>
Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/pom.xml 2010-02-26 13:29:35 UTC (rev 101542)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/pom.xml 2010-02-26 13:43:46 UTC (rev 101543)
@@ -129,12 +129,12 @@
<artifactId>jboss-common-core</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-jmx</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-jmx</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -149,7 +149,7 @@
<artifactId>jboss-classpool-ucl</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<scope>test</scope>
</dependency>
Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-mc/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-mc/pom.xml 2010-02-26 13:29:35 UTC (rev 101542)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-mc/pom.xml 2010-02-26 13:43:46 UTC (rev 101543)
@@ -182,11 +182,11 @@
<artifactId>jboss-mdr</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-dependency</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<scope>compile</scope>
</dependency>
Modified: projects/aop/branches/classpool_JBAOP-742/aspects/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aspects/pom.xml 2010-02-26 13:29:35 UTC (rev 101542)
+++ projects/aop/branches/classpool_JBAOP-742/aspects/pom.xml 2010-02-26 13:43:46 UTC (rev 101543)
@@ -66,7 +66,7 @@
<artifactId>jboss-logging-spi</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
</dependency>
@@ -77,8 +77,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-servlet-api</artifactId>
+ <groupId>jboss.web</groupId>
+ <artifactId>servlet-api</artifactId>
<scope>test</scope>
</dependency>
<!--<dependency>
Modified: projects/aop/branches/classpool_JBAOP-742/build/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/build/pom.xml 2010-02-26 13:29:35 UTC (rev 101542)
+++ projects/aop/branches/classpool_JBAOP-742/build/pom.xml 2010-02-26 13:43:46 UTC (rev 101543)
@@ -34,7 +34,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<scope>test</scope>
</dependency>
Modified: projects/aop/branches/classpool_JBAOP-742/deployers/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/deployers/pom.xml 2010-02-26 13:29:35 UTC (rev 101542)
+++ projects/aop/branches/classpool_JBAOP-742/deployers/pom.xml 2010-02-26 13:43:46 UTC (rev 101543)
@@ -49,11 +49,11 @@
<artifactId>jboss-vfs</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
</dependency>
</dependencies>
Modified: projects/aop/branches/classpool_JBAOP-742/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/pom.xml 2010-02-26 13:29:35 UTC (rev 101542)
+++ projects/aop/branches/classpool_JBAOP-742/pom.xml 2010-02-26 13:43:46 UTC (rev 101543)
@@ -20,24 +20,23 @@
</scm>
<properties>
- <version.javassist.javassist>3.10.0.GA</version.javassist.javassist>
+ <version.javassist.javassist>3.11.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.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.jbossas>6.0.0.M1</version.org.jboss.jbossas>
+ <version.org.jboss.jboss-common-core>2.2.17.GA</version.org.jboss.jboss-common-core>
+ <version.org.jboss.cl>2.2.0.Alpha2</version.org.jboss.cl>
+ <version.org.jboss.deployers>2.2.0.Alpha1</version.org.jboss.deployers>
+ <version.org.jboss.integration>6.0.0-Alpha8</version.org.jboss.integration>
+ <version.org.jboss.jboss-reflect>2.2.0.Alpha2</version.org.jboss.jboss-reflect>
+ <version.org.jboss.jboss-vfs>2.2.0.Alpha2</version.org.jboss.jboss-vfs>
+ <version.org.jboss.kernel>2.2.0.Alpha6</version.org.jboss.kernel>
+ <version.org.jboss.logging>2.2.0.CR1</version.org.jboss.logging>
+ <version.org.jboss.man>2.1.1.SP1</version.org.jboss.man>
+ <version.org.jboss.mdr>2.2.0.Alpha1</version.org.jboss.mdr>
<version.xdoclet>1.2.3</version.xdoclet>
<version.jarjar>1.0</version.jarjar>
- <version.org.jboss.classpool>1.0.0-SNAPSHOT</version.org.jboss.classpool>
+ <version.org.jboss.classpool>1.0.0.Alpha2</version.org.jboss.classpool>
+ <version.org.jboss.mx>6.0.0.Beta5</version.org.jboss.mx>
</properties>
<build>
@@ -117,7 +116,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>3.8.2</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -132,7 +131,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.7.0</version>
+ <version>1.7.1</version>
</dependency>
<dependency>
<groupId>javassist</groupId>
@@ -318,39 +317,39 @@
<version>${version.org.jboss.integration}</version>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>${version.org.jboss.microcontainer.jboss-kernel}</version>
+ <version>${version.org.jboss.kernel}</version>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
- <version>${version.org.jboss.microcontainer.jboss-kernel}</version>
+ <version>${version.org.jboss.kernel}</version>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-dependency</artifactId>
- <version>${version.org.jboss.microcontainer.jboss-kernel}</version>
+ <version>${version.org.jboss.kernel}</version>
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jca-api</artifactId>
- <version>1.5.0.CR2</version>
+ <version>1.5.0.GA</version>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-servlet-api</artifactId>
- <version>2.5.0.CR2</version>
+ <groupId>jboss.web</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>3.0.0-beta-2</version>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
- <version>${version.org.jboss.jbossas}</version>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
+ <version>${version.org.jboss.mx}</version>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-jmx</artifactId>
- <version>${version.org.jboss.jbossas}</version>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ <version>${version.org.jboss.mx}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.test</groupId>
@@ -401,14 +400,9 @@
<version>${version.org.jboss.man}</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- <version>${version.org.jboss.mdr}</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
- <version>1.0.3.GA</version>
+ <version>1.1.5.GA</version>
<exclusions>
<exclusion>
<groupId>apache-log4j</groupId>
More information about the jboss-cvs-commits
mailing list