[jboss-cvs] JBossAS SVN: r63589 - in projects/aop/trunk/aop: src/main/org/jboss/aop and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 21 07:27:44 EDT 2007
Author: kabir.khan at jboss.com
Date: 2007-06-21 07:27:44 -0400 (Thu, 21 Jun 2007)
New Revision: 63589
Removed:
projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/factory/
Modified:
projects/aop/trunk/aop/build-tests-jdk14.xml
projects/aop/trunk/aop/build-tests-jdk50.xml
projects/aop/trunk/aop/build.xml
projects/aop/trunk/aop/src/main/org/jboss/aop/AspectAnnotationLoader.java
projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/AnnotationRepository.java
projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/PortableAnnotationElement.java
projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/AnnotationDocletTag.java
projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/AnnotationInfoCreator.java
projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/XmlAnnotationVisitor.java
projects/aop/trunk/aop/src/main/org/jboss/aop/introduction/AnnotationIntroduction.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/AnnotationTester.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/jdk15/AOPTester.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/jdk15base/AOPTester.java
Log:
[JBAOP-287] Tighten integration with MC. Use annotation proxy stuff from MC
Modified: projects/aop/trunk/aop/build-tests-jdk14.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk14.xml 2007-06-21 06:20:53 UTC (rev 63588)
+++ projects/aop/trunk/aop/build-tests-jdk14.xml 2007-06-21 11:27:44 UTC (rev 63589)
@@ -707,8 +707,6 @@
<include name="org/jboss/test/aop/annotationc/*.java"/>
</annotationc>
- <echo>org/jboss/test/aop/methodhashing/MethodHashingTestCase will fail until the microcontainer has been updated in the repository</echo>
-
<junit printsummary="yes" fork="no" haltonfailure="no" jvm="${java14}">
<sysproperty key="jboss-junit-configuration" value="jdk14"/>
<sysproperty key="jboss.aop.debug.classes" value="${jboss.aop.debug.classes}"/>
Modified: projects/aop/trunk/aop/build-tests-jdk50.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk50.xml 2007-06-21 06:20:53 UTC (rev 63588)
+++ projects/aop/trunk/aop/build-tests-jdk50.xml 2007-06-21 11:27:44 UTC (rev 63589)
@@ -774,7 +774,7 @@
<src path="${build.tests.classes}"/>
<include name="org/jboss/test/aop/${test}/**"/>
<exclude name="${exclude}"/>
- <aopclasspath path="${build.tests.classes}"/>
+ <aopclasspath path="${build.tests.classes}"/>
</aopc>
<!-- Get -Djboss.aop.path from passed in parameters -->
Modified: projects/aop/trunk/aop/build.xml
===================================================================
--- projects/aop/trunk/aop/build.xml 2007-06-21 06:20:53 UTC (rev 63588)
+++ projects/aop/trunk/aop/build.xml 2007-06-21 11:27:44 UTC (rev 63589)
@@ -85,8 +85,8 @@
<path refid="jboss/common.core.classpath"/>
<path refid="jboss/common.logging.log4j.classpath"/>
<path refid="jboss/common.logging.jdk.classpath"/>
- <path refid="jboss/common.logging.spi.classpath"/>
- <!--<path refid="jboss.microcontainer.classpath"/>-->
+ <path refid="jboss/common.logging.spi.classpath"/>
+ <path refid="jboss.microcontainer.classpath"/>
<path refid="jboss.test.classpath"/>
</path>
@@ -147,7 +147,6 @@
<!-- The classpath required to build classes. -->
<path id="javac.classpath">
- <path refid="jboss.microcontainer.classpath"/>
<pathelement path="${classpath}"/>
<pathelement path="${local.classpath}"/>
<path refid="thirdparty.classpath"/>
@@ -243,7 +242,6 @@
<src path="${source.java}"/>
<exclude name="org/jboss/aop/definition/**"/>
<exclude name="org/jboss/aop/hook/JRockit*"/>
- <exclude name="**/methodhashing/*"/>
<classpath refid="javac.classpath"/>
</javac>
</target>
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/AspectAnnotationLoader.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/AspectAnnotationLoader.java 2007-06-21 06:20:53 UTC (rev 63588)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AspectAnnotationLoader.java 2007-06-21 11:27:44 UTC (rev 63589)
@@ -55,7 +55,7 @@
import org.jboss.aop.advice.PrecedenceDefEntry;
import org.jboss.aop.advice.Scope;
import org.jboss.aop.advice.ScopedInterceptorFactory;
-import org.jboss.aop.annotation.factory.duplicate.javassist.AnnotationProxy;
+import org.jboss.annotation.factory.javassist.AnnotationProxy;
import org.jboss.aop.introduction.AnnotationIntroduction;
import org.jboss.aop.introduction.InterfaceIntroduction;
import org.jboss.aop.pointcut.CFlow;
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/AnnotationRepository.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/AnnotationRepository.java 2007-06-21 06:20:53 UTC (rev 63588)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/AnnotationRepository.java 2007-06-21 11:27:44 UTC (rev 63589)
@@ -32,7 +32,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.jboss.aop.annotation.factory.duplicate.AnnotationCreator;
+import org.jboss.annotation.factory.AnnotationCreator;
import org.jboss.aop.util.UnmodifiableEmptyCollections;
import javassist.CtMember;
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/PortableAnnotationElement.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/PortableAnnotationElement.java 2007-06-21 06:20:53 UTC (rev 63588)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/PortableAnnotationElement.java 2007-06-21 11:27:44 UTC (rev 63589)
@@ -33,7 +33,7 @@
import javassist.bytecode.MethodInfo;
import org.jboss.aop.AspectManager;
-import org.jboss.aop.annotation.factory.duplicate.javassist.AnnotationProxy;
+import org.jboss.annotation.factory.javassist.AnnotationProxy;
import org.jboss.aop.util.ReflectToJavassist;
import java.lang.reflect.Constructor;
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/AnnotationDocletTag.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/AnnotationDocletTag.java 2007-06-21 06:20:53 UTC (rev 63588)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/AnnotationDocletTag.java 2007-06-21 11:27:44 UTC (rev 63589)
@@ -24,10 +24,10 @@
import com.thoughtworks.qdox.model.AbstractJavaEntity;
import com.thoughtworks.qdox.model.DocletTag;
-import org.jboss.aop.annotation.factory.duplicate.ast.ASTAnnotation;
-import org.jboss.aop.annotation.factory.duplicate.ast.ASTStart;
-import org.jboss.aop.annotation.factory.duplicate.ast.AnnotationParser;
-import org.jboss.aop.annotation.factory.duplicate.ast.ParseException;
+import org.jboss.annotation.factory.ast.ASTAnnotation;
+import org.jboss.annotation.factory.ast.ASTStart;
+import org.jboss.annotation.factory.ast.AnnotationParser;
+import org.jboss.annotation.factory.ast.ParseException;
import java.io.StringReader;
import java.util.Map;
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/AnnotationInfoCreator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/AnnotationInfoCreator.java 2007-06-21 06:20:53 UTC (rev 63588)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/AnnotationInfoCreator.java 2007-06-21 11:27:44 UTC (rev 63589)
@@ -31,17 +31,17 @@
import javassist.bytecode.annotation.MemberValue;
import javassist.bytecode.annotation.StringMemberValue;
-import org.jboss.aop.annotation.factory.duplicate.ast.ASTAnnotation;
-import org.jboss.aop.annotation.factory.duplicate.ast.ASTChar;
-import org.jboss.aop.annotation.factory.duplicate.ast.ASTIdentifier;
-import org.jboss.aop.annotation.factory.duplicate.ast.ASTMemberValueArrayInitializer;
-import org.jboss.aop.annotation.factory.duplicate.ast.ASTMemberValuePair;
-import org.jboss.aop.annotation.factory.duplicate.ast.ASTMemberValuePairs;
-import org.jboss.aop.annotation.factory.duplicate.ast.ASTSingleMemberValue;
-import org.jboss.aop.annotation.factory.duplicate.ast.ASTStart;
-import org.jboss.aop.annotation.factory.duplicate.ast.ASTString;
-import org.jboss.aop.annotation.factory.duplicate.ast.AnnotationParserVisitor;
-import org.jboss.aop.annotation.factory.duplicate.ast.SimpleNode;
+import org.jboss.annotation.factory.ast.ASTAnnotation;
+import org.jboss.annotation.factory.ast.ASTChar;
+import org.jboss.annotation.factory.ast.ASTIdentifier;
+import org.jboss.annotation.factory.ast.ASTMemberValueArrayInitializer;
+import org.jboss.annotation.factory.ast.ASTMemberValuePair;
+import org.jboss.annotation.factory.ast.ASTMemberValuePairs;
+import org.jboss.annotation.factory.ast.ASTSingleMemberValue;
+import org.jboss.annotation.factory.ast.ASTStart;
+import org.jboss.annotation.factory.ast.ASTString;
+import org.jboss.annotation.factory.ast.AnnotationParserVisitor;
+import org.jboss.annotation.factory.ast.SimpleNode;
import java.util.Set;
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/XmlAnnotationVisitor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/XmlAnnotationVisitor.java 2007-06-21 06:20:53 UTC (rev 63588)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/XmlAnnotationVisitor.java 2007-06-21 11:27:44 UTC (rev 63589)
@@ -21,17 +21,17 @@
*/
package org.jboss.aop.annotation.compiler;
-import org.jboss.aop.annotation.factory.duplicate.ast.ASTAnnotation;
-import org.jboss.aop.annotation.factory.duplicate.ast.ASTChar;
-import org.jboss.aop.annotation.factory.duplicate.ast.ASTIdentifier;
-import org.jboss.aop.annotation.factory.duplicate.ast.ASTMemberValueArrayInitializer;
-import org.jboss.aop.annotation.factory.duplicate.ast.ASTMemberValuePair;
-import org.jboss.aop.annotation.factory.duplicate.ast.ASTMemberValuePairs;
-import org.jboss.aop.annotation.factory.duplicate.ast.ASTSingleMemberValue;
-import org.jboss.aop.annotation.factory.duplicate.ast.ASTStart;
-import org.jboss.aop.annotation.factory.duplicate.ast.ASTString;
-import org.jboss.aop.annotation.factory.duplicate.ast.AnnotationParserVisitor;
-import org.jboss.aop.annotation.factory.duplicate.ast.SimpleNode;
+import org.jboss.annotation.factory.ast.ASTAnnotation;
+import org.jboss.annotation.factory.ast.ASTChar;
+import org.jboss.annotation.factory.ast.ASTIdentifier;
+import org.jboss.annotation.factory.ast.ASTMemberValueArrayInitializer;
+import org.jboss.annotation.factory.ast.ASTMemberValuePair;
+import org.jboss.annotation.factory.ast.ASTMemberValuePairs;
+import org.jboss.annotation.factory.ast.ASTSingleMemberValue;
+import org.jboss.annotation.factory.ast.ASTStart;
+import org.jboss.annotation.factory.ast.ASTString;
+import org.jboss.annotation.factory.ast.AnnotationParserVisitor;
+import org.jboss.annotation.factory.ast.SimpleNode;
import java.io.PrintWriter;
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/introduction/AnnotationIntroduction.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/introduction/AnnotationIntroduction.java 2007-06-21 06:20:53 UTC (rev 63588)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/introduction/AnnotationIntroduction.java 2007-06-21 11:27:44 UTC (rev 63589)
@@ -26,9 +26,9 @@
import javassist.CtField;
import javassist.CtMethod;
import org.jboss.aop.Advisor;
-import org.jboss.aop.annotation.factory.duplicate.ast.ASTAnnotation;
-import org.jboss.aop.annotation.factory.duplicate.ast.AnnotationParser;
-import org.jboss.aop.annotation.factory.duplicate.ast.ParseException;
+import org.jboss.annotation.factory.ast.ASTAnnotation;
+import org.jboss.annotation.factory.ast.AnnotationParser;
+import org.jboss.annotation.factory.ast.ParseException;
import org.jboss.aop.pointcut.AnnotationMatcher;
import org.jboss.aop.pointcut.ast.ASTStart;
import org.jboss.aop.pointcut.ast.TypeExpressionParser;
@@ -90,7 +90,7 @@
try
{
AnnotationParser parser = new AnnotationParser(new StringReader(annotationExpr));
- org.jboss.aop.annotation.factory.duplicate.ast.ASTStart start = parser.Start();
+ org.jboss.annotation.factory.ast.ASTStart start = parser.Start();
annotation = (ASTAnnotation) start.jjtGetChild(0);
}
catch (ParseException e)
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/AnnotationTester.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/AnnotationTester.java 2007-06-21 06:20:53 UTC (rev 63588)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotationc/AnnotationTester.java 2007-06-21 11:27:44 UTC (rev 63589)
@@ -27,7 +27,7 @@
import org.jboss.aop.annotation.AnnotationElement;
import org.jboss.aop.annotation.PortableAnnotationElement;
-import org.jboss.aop.annotation.factory.duplicate.AnnotationCreator;
+import org.jboss.annotation.factory.AnnotationCreator;
import org.jboss.aop.util.ConstructorComparator;
import org.jboss.test.aop.AOPTestWithSetup;
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/jdk15/AOPTester.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/jdk15/AOPTester.java 2007-06-21 06:20:53 UTC (rev 63588)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/jdk15/AOPTester.java 2007-06-21 11:27:44 UTC (rev 63589)
@@ -26,7 +26,7 @@
import junit.textui.TestRunner;
import org.jboss.aop.annotation.AnnotationElement;
-import org.jboss.aop.annotation.factory.duplicate.AnnotationCreator;
+import org.jboss.annotation.factory.AnnotationCreator;
import org.jboss.test.aop.AOPTestWithSetup;
/**
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/jdk15base/AOPTester.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/jdk15base/AOPTester.java 2007-06-21 06:20:53 UTC (rev 63588)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/jdk15base/AOPTester.java 2007-06-21 11:27:44 UTC (rev 63589)
@@ -26,7 +26,7 @@
import junit.textui.TestRunner;
import org.jboss.aop.annotation.AnnotationElement;
-import org.jboss.aop.annotation.factory.duplicate.AnnotationCreator;
+import org.jboss.annotation.factory.AnnotationCreator;
import org.jboss.test.aop.AOPTestWithSetup;
/**
More information about the jboss-cvs-commits
mailing list