From afaa961b294eca20fa9d54359c53a1de2d3c41fd Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Wed, 23 Jan 2019 18:53:51 -0800 Subject: [PATCH] mavenized org.aspectj.matcher module - wip --- org.aspectj.matcher/.classpath | 12 ------ org.aspectj.matcher/.cvsignore | 6 --- org.aspectj.matcher/.isJava5 | 1 - org.aspectj.matcher/.project | 22 ---------- .../.settings/org.eclipse.jdt.ui.prefs | 3 -- org.aspectj.matcher/pom.xml | 42 +++++++++++++++++++ .../aspectj/weaver/AbstractAnnotationAJ.java | 0 .../weaver/AbstractReferenceTypeDelegate.java | 0 .../java}/org/aspectj/weaver/Advice.java | 0 .../java}/org/aspectj/weaver/AdviceKind.java | 0 .../java}/org/aspectj/weaver/AjAttribute.java | 0 .../org/aspectj/weaver/AjcMemberMaker.java | 0 .../org/aspectj/weaver/AnnotatedElement.java | 0 .../org/aspectj/weaver/AnnotationAJ.java | 0 .../weaver/AnnotationAnnotationValue.java | 0 .../weaver/AnnotationNameValuePair.java | 0 .../weaver/AnnotationOnTypeMunger.java | 0 .../aspectj/weaver/AnnotationTargetKind.java | 0 .../org/aspectj/weaver/AnnotationValue.java | 0 .../aspectj/weaver/ArrayAnnotationValue.java | 0 .../aspectj/weaver/ArrayReferenceType.java | 0 .../java}/org/aspectj/weaver/BCException.java | 0 .../org/aspectj/weaver/BindingScope.java | 0 .../aspectj/weaver/BoundedReferenceType.java | 0 .../weaver/BoundedReferenceTypeDelegate.java | 0 .../java}/org/aspectj/weaver/Checker.java | 0 .../aspectj/weaver/ClassAnnotationValue.java | 0 .../weaver/CompressingDataOutputStream.java | 0 .../aspectj/weaver/ConcreteTypeMunger.java | 0 .../aspectj/weaver/ConstantPoolReader.java | 0 .../aspectj/weaver/ConstantPoolWriter.java | 0 .../java}/org/aspectj/weaver/Constants.java | 0 .../aspectj/weaver/CrosscuttingMembers.java | 0 .../weaver/CrosscuttingMembersSet.java | 0 .../aspectj/weaver/CustomMungerFactory.java | 0 .../java}/org/aspectj/weaver/Dump.java | 0 .../aspectj/weaver/EnumAnnotationValue.java | 0 .../org/aspectj/weaver/ExposeTypeMunger.java | 0 .../GeneratedReferenceTypeDelegate.java | 0 .../org/aspectj/weaver/IClassWeaver.java | 0 .../weaver/ICrossReferenceHandler.java | 0 .../aspectj/weaver/IEclipseSourceContext.java | 0 .../org/aspectj/weaver/IHasPosition.java | 0 .../aspectj/weaver/IHasSourceLocation.java | 0 .../org/aspectj/weaver/ISourceContext.java | 0 .../org/aspectj/weaver/IUnwovenClassFile.java | 0 .../org/aspectj/weaver/IWeaveRequestor.java | 0 .../org/aspectj/weaver/IWeavingSupport.java | 0 .../java}/org/aspectj/weaver/IntMap.java | 0 .../java}/org/aspectj/weaver/Iterators.java | 0 .../aspectj/weaver/JoinPointSignature.java | 0 .../weaver/JoinPointSignatureIterator.java | 0 .../java}/org/aspectj/weaver/Lint.java | 0 .../java}/org/aspectj/weaver/LintMessage.java | 0 .../java}/org/aspectj/weaver/Member.java | 0 .../java}/org/aspectj/weaver/MemberImpl.java | 0 .../java}/org/aspectj/weaver/MemberKind.java | 0 .../java}/org/aspectj/weaver/MemberUtils.java | 0 .../weaver/MethodDelegateTypeMunger.java | 0 ...MissingResolvedTypeWithKnownSignature.java | 0 .../java}/org/aspectj/weaver/NameMangler.java | 0 .../weaver/NewConstructorTypeMunger.java | 0 .../aspectj/weaver/NewFieldTypeMunger.java | 0 .../weaver/NewMemberClassTypeMunger.java | 0 .../aspectj/weaver/NewMethodTypeMunger.java | 0 .../aspectj/weaver/NewParentTypeMunger.java | 0 .../weaver/PerObjectInterfaceTypeMunger.java | 0 .../weaver/PerTypeWithinTargetTypeMunger.java | 0 .../aspectj/weaver/PersistenceSupport.java | 0 .../aspectj/weaver/PoliceExtensionUse.java | 0 .../java}/org/aspectj/weaver/Position.java | 0 .../weaver/PrivilegedAccessMunger.java | 0 .../org/aspectj/weaver/ReferenceType.java | 0 .../aspectj/weaver/ReferenceTypeDelegate.java | 0 .../aspectj/weaver/ResolvableTypeList.java | 0 .../org/aspectj/weaver/ResolvedMember.java | 0 .../aspectj/weaver/ResolvedMemberImpl.java | 0 .../weaver/ResolvedPointcutDefinition.java | 0 .../org/aspectj/weaver/ResolvedType.java | 0 .../aspectj/weaver/ResolvedTypeMunger.java | 0 .../org/aspectj/weaver/RuntimeVersion.java | 0 .../java}/org/aspectj/weaver/Shadow.java | 0 .../org/aspectj/weaver/ShadowMunger.java | 0 .../org/aspectj/weaver/SignatureUtils.java | 0 .../aspectj/weaver/SimpleAnnotationValue.java | 0 .../org/aspectj/weaver/SourceContextImpl.java | 0 .../aspectj/weaver/StandardAnnotation.java | 0 .../weaver/StaticJoinPointFactory.java | 0 .../aspectj/weaver/TemporaryTypeMunger.java | 0 .../java}/org/aspectj/weaver/TypeFactory.java | 0 .../org/aspectj/weaver/TypeVariable.java | 0 .../weaver/TypeVariableDeclaringElement.java | 0 .../aspectj/weaver/TypeVariableReference.java | 0 .../weaver/TypeVariableReferenceType.java | 0 .../org/aspectj/weaver/UnresolvedType.java | 0 .../UnresolvedTypeVariableReferenceType.java | 0 .../java}/org/aspectj/weaver/Utils.java | 0 .../weaver/VersionedDataInputStream.java | 0 .../weaver/WeakClassLoaderReference.java | 0 .../org/aspectj/weaver/WeaverMessages.java | 0 .../org/aspectj/weaver/WeaverStateInfo.java | 0 .../weaver/WildcardedUnresolvedType.java | 0 .../java}/org/aspectj/weaver/World.java | 0 .../aspectj/weaver/XlintDefault.properties | 0 .../java}/org/aspectj/weaver/ast/ASTNode.java | 0 .../java}/org/aspectj/weaver/ast/And.java | 0 .../java}/org/aspectj/weaver/ast/Call.java | 0 .../org/aspectj/weaver/ast/CallExpr.java | 0 .../java}/org/aspectj/weaver/ast/Expr.java | 0 .../org/aspectj/weaver/ast/FieldGet.java | 0 .../org/aspectj/weaver/ast/FieldGetCall.java | 0 .../org/aspectj/weaver/ast/HasAnnotation.java | 0 .../org/aspectj/weaver/ast/IExprVisitor.java | 0 .../org/aspectj/weaver/ast/ITestVisitor.java | 0 .../org/aspectj/weaver/ast/Instanceof.java | 0 .../java}/org/aspectj/weaver/ast/Literal.java | 0 .../java}/org/aspectj/weaver/ast/Not.java | 0 .../java}/org/aspectj/weaver/ast/Or.java | 0 .../java}/org/aspectj/weaver/ast/Test.java | 0 .../java}/org/aspectj/weaver/ast/Var.java | 0 .../tools/MatchingContextBasedTest.java | 0 ...ointcutDesignatorHandlerBasedPointcut.java | 0 .../tools/PointcutExpressionImpl.java | 0 .../tools/StandardPointcutExpressionImpl.java | 0 .../tools/TypePatternMatcherImpl.java | 0 .../patterns/AbstractPatternNodeVisitor.java | 0 .../patterns/AbstractSignaturePattern.java | 0 .../patterns/AndAnnotationTypePattern.java | 0 .../aspectj/weaver/patterns/AndPointcut.java | 0 .../weaver/patterns/AndSignaturePattern.java | 0 .../weaver/patterns/AndTypePattern.java | 0 .../patterns/AnnotationPatternList.java | 0 .../weaver/patterns/AnnotationPointcut.java | 0 .../patterns/AnnotationTypePattern.java | 0 .../patterns/AnyAnnotationTypePattern.java | 0 .../weaver/patterns/AnyTypePattern.java | 0 .../AnyWithAnnotationTypePattern.java | 0 .../patterns/ArgsAnnotationPointcut.java | 0 .../aspectj/weaver/patterns/ArgsPointcut.java | 0 .../aspectj/weaver/patterns/BasicToken.java | 0 .../weaver/patterns/BasicTokenSource.java | 0 .../BindingAnnotationFieldTypePattern.java | 0 .../BindingAnnotationTypePattern.java | 0 .../weaver/patterns/BindingPattern.java | 0 .../weaver/patterns/BindingTypePattern.java | 0 .../org/aspectj/weaver/patterns/Bindings.java | 0 .../weaver/patterns/CflowPointcut.java | 0 .../patterns/ConcreteCflowPointcut.java | 0 .../org/aspectj/weaver/patterns/Declare.java | 0 .../weaver/patterns/DeclareAnnotation.java | 0 .../patterns/DeclareErrorOrWarning.java | 0 .../weaver/patterns/DeclareParents.java | 0 .../weaver/patterns/DeclareParentsMixin.java | 0 .../weaver/patterns/DeclarePrecedence.java | 0 .../aspectj/weaver/patterns/DeclareSoft.java | 0 .../patterns/DeclareTypeErrorOrWarning.java | 0 .../weaver/patterns/EllipsisTypePattern.java | 0 .../ExactAnnotationFieldTypePattern.java | 0 .../patterns/ExactAnnotationTypePattern.java | 0 .../weaver/patterns/ExactTypePattern.java | 0 .../aspectj/weaver/patterns/ExposedState.java | 0 .../weaver/patterns/FastMatchInfo.java | 0 .../weaver/patterns/FormalBinding.java | 0 .../weaver/patterns/HandlerPointcut.java | 0 .../weaver/patterns/HasMemberTypePattern.java | 0 .../patterns/HasMemberTypePatternFinder.java | 0 ...asMemberTypePatternForPerThisMatching.java | 0 ...pePatternMatchingStuffAnywhereVisitor.java | 0 .../org/aspectj/weaver/patterns/IScope.java | 0 .../weaver/patterns/ISignaturePattern.java | 0 .../org/aspectj/weaver/patterns/IToken.java | 0 .../aspectj/weaver/patterns/ITokenSource.java | 0 .../patterns/IVerificationRequired.java | 0 .../aspectj/weaver/patterns/IfPointcut.java | 0 .../weaver/patterns/KindedPointcut.java | 6 ++- .../weaver/patterns/ModifiersPattern.java | 0 .../weaver/patterns/NameBindingPointcut.java | 0 .../aspectj/weaver/patterns/NamePattern.java | 0 .../weaver/patterns/NoTypePattern.java | 0 .../patterns/NotAnnotationTypePattern.java | 0 .../aspectj/weaver/patterns/NotPointcut.java | 0 .../weaver/patterns/NotSignaturePattern.java | 0 .../weaver/patterns/NotTypePattern.java | 0 .../patterns/OrAnnotationTypePattern.java | 0 .../aspectj/weaver/patterns/OrPointcut.java | 0 .../weaver/patterns/OrSignaturePattern.java | 0 .../weaver/patterns/OrTypePattern.java | 0 .../weaver/patterns/ParserException.java | 0 .../aspectj/weaver/patterns/PatternNode.java | 0 .../weaver/patterns/PatternNodeVisitor.java | 0 .../weaver/patterns/PatternParser.java | 0 .../org/aspectj/weaver/patterns/PerCflow.java | 0 .../aspectj/weaver/patterns/PerClause.java | 0 .../aspectj/weaver/patterns/PerFromSuper.java | 0 .../aspectj/weaver/patterns/PerObject.java | 0 .../aspectj/weaver/patterns/PerSingleton.java | 0 .../PerThisOrTargetPointcutVisitor.java | 0 .../weaver/patterns/PerTypeWithin.java | 0 .../org/aspectj/weaver/patterns/Pointcut.java | 0 .../PointcutEvaluationExpenseComparator.java | 0 .../weaver/patterns/PointcutRewriter.java | 0 .../weaver/patterns/ReferencePointcut.java | 0 .../patterns/ScopeWithTypeVariables.java | 0 .../weaver/patterns/SignaturePattern.java | 0 .../aspectj/weaver/patterns/SimpleScope.java | 0 .../ThisOrTargetAnnotationPointcut.java | 0 .../weaver/patterns/ThisOrTargetPointcut.java | 0 .../weaver/patterns/ThrowsPattern.java | 0 .../patterns/TypeCategoryTypePattern.java | 0 .../aspectj/weaver/patterns/TypePattern.java | 0 .../weaver/patterns/TypePatternList.java | 0 .../weaver/patterns/TypePatternQuestions.java | 0 .../weaver/patterns/TypeVariablePattern.java | 0 .../patterns/TypeVariablePatternList.java | 0 .../patterns/WildAnnotationTypePattern.java | 0 .../weaver/patterns/WildChildFinder.java | 0 .../weaver/patterns/WildTypePattern.java | 0 .../patterns/WithinAnnotationPointcut.java | 0 .../WithinCodeAnnotationPointcut.java | 0 .../weaver/patterns/WithinPointcut.java | 0 .../weaver/patterns/WithincodePointcut.java | 0 .../weaver/reflect/AnnotationFinder.java | 0 .../GenericSignatureInformationProvider.java | 0 .../weaver/reflect/IReflectionWorld.java | 0 ...14GenericSignatureInformationProvider.java | 0 .../weaver/reflect/JoinPointMatchImpl.java | 0 .../weaver/reflect/PointcutParameterImpl.java | 0 .../ReflectionBasedReferenceTypeDelegate.java | 0 ...tionBasedReferenceTypeDelegateFactory.java | 0 .../ReflectionBasedResolvedMemberImpl.java | 0 .../reflect/ReflectionFastMatchInfo.java | 0 .../weaver/reflect/ReflectionShadow.java | 0 .../aspectj/weaver/reflect/ReflectionVar.java | 0 .../weaver/reflect/ReflectionWorld.java | 0 .../weaver/reflect/ShadowMatchImpl.java | 0 .../weaver/reflect/StandardShadow.java | 0 .../reflect/StandardShadowMatchImpl.java | 0 .../aspectj/weaver/tools/AbstractTrace.java | 0 .../aspectj/weaver/tools/CommonsTrace.java | 0 .../weaver/tools/CommonsTraceFactory.java | 0 .../weaver/tools/ContextBasedMatcher.java | 0 .../weaver/tools/DefaultMatchingContext.java | 0 .../aspectj/weaver/tools/DefaultTrace.java | 0 .../weaver/tools/DefaultTraceFactory.java | 0 .../aspectj/weaver/tools/FuzzyBoolean.java | 0 .../weaver/tools/GeneratedClassHandler.java | 0 .../weaver/tools/ISupportsMessageContext.java | 0 .../aspectj/weaver/tools/JoinPointMatch.java | 0 .../aspectj/weaver/tools/MatchingContext.java | 0 .../tools/PointcutDesignatorHandler.java | 0 .../weaver/tools/PointcutExpression.java | 0 .../weaver/tools/PointcutParameter.java | 0 .../aspectj/weaver/tools/PointcutParser.java | 0 .../weaver/tools/PointcutPrimitive.java | 0 .../org/aspectj/weaver/tools/ShadowMatch.java | 0 .../tools/StandardPointcutExpression.java | 0 .../weaver/tools/StandardPointcutParser.java | 0 .../java}/org/aspectj/weaver/tools/Trace.java | 0 .../aspectj/weaver/tools/TraceFactory.java | 0 .../org/aspectj/weaver/tools/Traceable.java | 0 .../weaver/tools/TypePatternMatcher.java | 0 ...UnsupportedPointcutPrimitiveException.java | 0 .../weaver/tools/WeavingClassLoader.java | 0 .../aspectj/weaver/weaver-messages.properties | 0 ...CommonAdvancedPointcutExpressionTests.java | 0 .../tools/CommonPointcutExpressionTests.java | 0 ...eflectionWorldPointcutExpressionTests.java | 0 .../org/aspectj/weaver/CommonWorldTests.java | 0 .../aspectj/weaver/MatcherModuleTests.java | 0 .../java}/org/aspectj/weaver/TestShadow.java | 0 .../java}/org/aspectj/weaver/TestUtils.java | 0 .../org/aspectj/weaver/TypeFactoryTests.java | 0 .../weaver/patterns/AndOrNotTestCase.java | 0 .../aspectj/weaver/patterns/ArgsTestCase.java | 0 .../weaver/patterns/BindingTestCase.java | 0 .../patterns/ConstantPoolSimulator.java | 0 .../DeclareErrorOrWarningTestCase.java | 0 .../weaver/patterns/DumpPointcutVisitor.java | 0 .../patterns/ModifiersPatternTestCase.java | 0 .../patterns/NamePatternParserTestCase.java | 0 .../weaver/patterns/NamePatternTestCase.java | 0 .../weaver/patterns/ParserTestCase.java | 0 .../weaver/patterns/PatternsTestCase.java | 0 .../weaver/patterns/PatternsTests.java | 0 .../weaver/patterns/PointcutRewriterTest.java | 0 .../SignaturePatternMatchSpeedTestCase.java | 0 .../patterns/SignaturePatternTestCase.java | 0 .../weaver/patterns/SimpleScopeTests.java | 0 .../aspectj/weaver/patterns/TestScope.java | 0 .../weaver/patterns/ThisOrTargetTestCase.java | 0 .../patterns/TypePatternListTestCase.java | 0 .../weaver/patterns/TypePatternTestCase.java | 0 .../weaver/patterns/VisitorTestCase.java | 0 .../weaver/patterns/WithinTestCase.java | 0 .../reflect/ReflectionWorldBasicTest.java | 0 .../reflect/ReflectionWorldSpecificTest.java | 0 .../org/aspectj/weaver/testcode/Aspect.java | 0 .../org/aspectj/weaver/testcode/Base.java | 0 .../org/aspectj/weaver/testcode/Derived.java | 0 .../test/java}/testdata/AnnotatedClass.java | 0 .../java}/testdata/MethodLevelAnnotation.java | 0 .../test/java}/testdata/SomeAnnotation.java | 0 302 files changed, 47 insertions(+), 45 deletions(-) delete mode 100644 org.aspectj.matcher/.classpath delete mode 100644 org.aspectj.matcher/.cvsignore delete mode 100644 org.aspectj.matcher/.isJava5 delete mode 100644 org.aspectj.matcher/.project delete mode 100644 org.aspectj.matcher/.settings/org.eclipse.jdt.ui.prefs create mode 100644 org.aspectj.matcher/pom.xml rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/AbstractAnnotationAJ.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/AbstractReferenceTypeDelegate.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/Advice.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/AdviceKind.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/AjAttribute.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/AjcMemberMaker.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/AnnotatedElement.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/AnnotationAJ.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/AnnotationAnnotationValue.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/AnnotationNameValuePair.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/AnnotationOnTypeMunger.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/AnnotationTargetKind.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/AnnotationValue.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ArrayAnnotationValue.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ArrayReferenceType.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/BCException.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/BindingScope.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/BoundedReferenceType.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/BoundedReferenceTypeDelegate.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/Checker.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ClassAnnotationValue.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/CompressingDataOutputStream.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ConcreteTypeMunger.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ConstantPoolReader.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ConstantPoolWriter.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/Constants.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/CrosscuttingMembers.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/CrosscuttingMembersSet.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/CustomMungerFactory.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/Dump.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/EnumAnnotationValue.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ExposeTypeMunger.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/GeneratedReferenceTypeDelegate.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/IClassWeaver.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ICrossReferenceHandler.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/IEclipseSourceContext.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/IHasPosition.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/IHasSourceLocation.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ISourceContext.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/IUnwovenClassFile.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/IWeaveRequestor.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/IWeavingSupport.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/IntMap.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/Iterators.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/JoinPointSignature.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/JoinPointSignatureIterator.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/Lint.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/LintMessage.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/Member.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/MemberImpl.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/MemberKind.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/MemberUtils.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/MethodDelegateTypeMunger.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/MissingResolvedTypeWithKnownSignature.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/NameMangler.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/NewConstructorTypeMunger.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/NewFieldTypeMunger.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/NewMemberClassTypeMunger.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/NewMethodTypeMunger.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/NewParentTypeMunger.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/PerObjectInterfaceTypeMunger.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/PerTypeWithinTargetTypeMunger.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/PersistenceSupport.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/PoliceExtensionUse.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/Position.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/PrivilegedAccessMunger.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ReferenceType.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ReferenceTypeDelegate.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ResolvableTypeList.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ResolvedMember.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ResolvedMemberImpl.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ResolvedPointcutDefinition.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ResolvedType.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ResolvedTypeMunger.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/RuntimeVersion.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/Shadow.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ShadowMunger.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/SignatureUtils.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/SimpleAnnotationValue.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/SourceContextImpl.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/StandardAnnotation.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/StaticJoinPointFactory.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/TemporaryTypeMunger.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/TypeFactory.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/TypeVariable.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/TypeVariableDeclaringElement.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/TypeVariableReference.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/TypeVariableReferenceType.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/UnresolvedType.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/UnresolvedTypeVariableReferenceType.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/Utils.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/VersionedDataInputStream.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/WeakClassLoaderReference.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/WeaverMessages.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/WeaverStateInfo.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/WildcardedUnresolvedType.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/World.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/XlintDefault.properties (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ast/ASTNode.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ast/And.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ast/Call.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ast/CallExpr.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ast/Expr.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ast/FieldGet.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ast/FieldGetCall.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ast/HasAnnotation.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ast/IExprVisitor.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ast/ITestVisitor.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ast/Instanceof.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ast/Literal.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ast/Not.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ast/Or.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ast/Test.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/ast/Var.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/internal/tools/MatchingContextBasedTest.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/internal/tools/PointcutDesignatorHandlerBasedPointcut.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/internal/tools/PointcutExpressionImpl.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/internal/tools/StandardPointcutExpressionImpl.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/internal/tools/TypePatternMatcherImpl.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/AbstractPatternNodeVisitor.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/AbstractSignaturePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/AndAnnotationTypePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/AndPointcut.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/AndSignaturePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/AndTypePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/AnnotationPatternList.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/AnnotationPointcut.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/AnnotationTypePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/AnyAnnotationTypePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/AnyTypePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/AnyWithAnnotationTypePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/ArgsAnnotationPointcut.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/ArgsPointcut.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/BasicToken.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/BasicTokenSource.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/BindingAnnotationFieldTypePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/BindingAnnotationTypePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/BindingPattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/BindingTypePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/Bindings.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/CflowPointcut.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/ConcreteCflowPointcut.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/Declare.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/DeclareAnnotation.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/DeclareParents.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/DeclareParentsMixin.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/DeclarePrecedence.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/DeclareSoft.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/DeclareTypeErrorOrWarning.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/EllipsisTypePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/ExactAnnotationFieldTypePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/ExactAnnotationTypePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/ExactTypePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/ExposedState.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/FastMatchInfo.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/FormalBinding.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/HandlerPointcut.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/HasMemberTypePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/HasMemberTypePatternFinder.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/HasMemberTypePatternForPerThisMatching.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/HasThisTypePatternTriedToSneakInSomeGenericOrParameterizedTypePatternMatchingStuffAnywhereVisitor.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/IScope.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/ISignaturePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/IToken.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/ITokenSource.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/IVerificationRequired.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/IfPointcut.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/KindedPointcut.java (98%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/ModifiersPattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/NameBindingPointcut.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/NamePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/NoTypePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/NotAnnotationTypePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/NotPointcut.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/NotSignaturePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/NotTypePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/OrAnnotationTypePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/OrPointcut.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/OrSignaturePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/OrTypePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/ParserException.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/PatternNode.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/PatternNodeVisitor.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/PatternParser.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/PerCflow.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/PerClause.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/PerFromSuper.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/PerObject.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/PerSingleton.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/PerThisOrTargetPointcutVisitor.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/PerTypeWithin.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/Pointcut.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/PointcutEvaluationExpenseComparator.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/PointcutRewriter.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/ReferencePointcut.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/ScopeWithTypeVariables.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/SignaturePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/SimpleScope.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/ThisOrTargetAnnotationPointcut.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/ThisOrTargetPointcut.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/ThrowsPattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/TypeCategoryTypePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/TypePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/TypePatternList.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/TypePatternQuestions.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/TypeVariablePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/TypeVariablePatternList.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/WildAnnotationTypePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/WildChildFinder.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/WildTypePattern.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/WithinAnnotationPointcut.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/WithinCodeAnnotationPointcut.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/WithinPointcut.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/patterns/WithincodePointcut.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/reflect/AnnotationFinder.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/reflect/GenericSignatureInformationProvider.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/reflect/IReflectionWorld.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/reflect/Java14GenericSignatureInformationProvider.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/reflect/JoinPointMatchImpl.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/reflect/PointcutParameterImpl.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegate.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateFactory.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/reflect/ReflectionBasedResolvedMemberImpl.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/reflect/ReflectionFastMatchInfo.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/reflect/ReflectionShadow.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/reflect/ReflectionVar.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/reflect/ReflectionWorld.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/reflect/ShadowMatchImpl.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/reflect/StandardShadow.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/reflect/StandardShadowMatchImpl.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/AbstractTrace.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/CommonsTrace.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/CommonsTraceFactory.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/ContextBasedMatcher.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/DefaultMatchingContext.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/DefaultTrace.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/DefaultTraceFactory.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/FuzzyBoolean.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/GeneratedClassHandler.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/ISupportsMessageContext.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/JoinPointMatch.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/MatchingContext.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/PointcutDesignatorHandler.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/PointcutExpression.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/PointcutParameter.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/PointcutParser.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/PointcutPrimitive.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/ShadowMatch.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/StandardPointcutExpression.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/StandardPointcutParser.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/Trace.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/TraceFactory.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/Traceable.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/TypePatternMatcher.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/UnsupportedPointcutPrimitiveException.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/tools/WeavingClassLoader.java (100%) rename org.aspectj.matcher/src/{ => main/java}/org/aspectj/weaver/weaver-messages.properties (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/matcher/tools/CommonAdvancedPointcutExpressionTests.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/matcher/tools/CommonPointcutExpressionTests.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/matcher/tools/ReflectionWorldPointcutExpressionTests.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/CommonWorldTests.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/MatcherModuleTests.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/TestShadow.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/TestUtils.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/TypeFactoryTests.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/patterns/AndOrNotTestCase.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/patterns/ArgsTestCase.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/patterns/BindingTestCase.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/patterns/ConstantPoolSimulator.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/patterns/DeclareErrorOrWarningTestCase.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/patterns/DumpPointcutVisitor.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/patterns/ModifiersPatternTestCase.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/patterns/NamePatternParserTestCase.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/patterns/NamePatternTestCase.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/patterns/ParserTestCase.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/patterns/PatternsTestCase.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/patterns/PatternsTests.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/patterns/PointcutRewriterTest.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/patterns/SignaturePatternMatchSpeedTestCase.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/patterns/SignaturePatternTestCase.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/patterns/SimpleScopeTests.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/patterns/TestScope.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/patterns/TypePatternListTestCase.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/patterns/TypePatternTestCase.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/patterns/VisitorTestCase.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/patterns/WithinTestCase.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/reflect/ReflectionWorldBasicTest.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/reflect/ReflectionWorldSpecificTest.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/testcode/Aspect.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/testcode/Base.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/org/aspectj/weaver/testcode/Derived.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/testdata/AnnotatedClass.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/testdata/MethodLevelAnnotation.java (100%) rename org.aspectj.matcher/{testsrc => src/test/java}/testdata/SomeAnnotation.java (100%) diff --git a/org.aspectj.matcher/.classpath b/org.aspectj.matcher/.classpath deleted file mode 100644 index 856780f91..000000000 --- a/org.aspectj.matcher/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/org.aspectj.matcher/.cvsignore b/org.aspectj.matcher/.cvsignore deleted file mode 100644 index e1b17a04f..000000000 --- a/org.aspectj.matcher/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -out -bin -default.lst -default.ajsym -.clover -bintest diff --git a/org.aspectj.matcher/.isJava5 b/org.aspectj.matcher/.isJava5 deleted file mode 100644 index c18a7b867..000000000 --- a/org.aspectj.matcher/.isJava5 +++ /dev/null @@ -1 +0,0 @@ -.isJava5 \ No newline at end of file diff --git a/org.aspectj.matcher/.project b/org.aspectj.matcher/.project deleted file mode 100644 index 787cfd0b6..000000000 --- a/org.aspectj.matcher/.project +++ /dev/null @@ -1,22 +0,0 @@ - - - org.aspectj.matcher - - - asm - bridge - runtime - testing-util - util - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/org.aspectj.matcher/.settings/org.eclipse.jdt.ui.prefs b/org.aspectj.matcher/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index e591fe798..000000000 --- a/org.aspectj.matcher/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Thu Sep 22 08:32:30 PDT 2005 -eclipse.preferences.version=1 -internal.default.compliance=default diff --git a/org.aspectj.matcher/pom.xml b/org.aspectj.matcher/pom.xml new file mode 100644 index 000000000..d2b02f44a --- /dev/null +++ b/org.aspectj.matcher/pom.xml @@ -0,0 +1,42 @@ + + 4.0.0 + + + org.aspectj + aspectj-parent + 1.9.3.BUILD-SNAPSHOT + .. + + + org.aspectj.matcher + jar + org.aspectj.matcher + + + + org.aspectj + util + ${project.version} + + + org.aspectj + bridge + ${project.version} + + + org.aspectj + testing-util + ${project.version} + + + commons + commons + 1.0 + system + ${project.basedir}/../lib/commons/commons.jar + + + + diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AbstractAnnotationAJ.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AbstractAnnotationAJ.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/AbstractAnnotationAJ.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/AbstractAnnotationAJ.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AbstractReferenceTypeDelegate.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AbstractReferenceTypeDelegate.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/AbstractReferenceTypeDelegate.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/AbstractReferenceTypeDelegate.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Advice.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Advice.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/Advice.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/Advice.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AdviceKind.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AdviceKind.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/AdviceKind.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/AdviceKind.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AjAttribute.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AjAttribute.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/AjAttribute.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/AjAttribute.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AjcMemberMaker.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AjcMemberMaker.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/AjcMemberMaker.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/AjcMemberMaker.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AnnotatedElement.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotatedElement.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/AnnotatedElement.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotatedElement.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AnnotationAJ.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationAJ.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/AnnotationAJ.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationAJ.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AnnotationAnnotationValue.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationAnnotationValue.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/AnnotationAnnotationValue.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationAnnotationValue.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AnnotationNameValuePair.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationNameValuePair.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/AnnotationNameValuePair.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationNameValuePair.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AnnotationOnTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationOnTypeMunger.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/AnnotationOnTypeMunger.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationOnTypeMunger.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AnnotationTargetKind.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationTargetKind.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/AnnotationTargetKind.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationTargetKind.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AnnotationValue.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationValue.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/AnnotationValue.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationValue.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ArrayAnnotationValue.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ArrayAnnotationValue.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ArrayAnnotationValue.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ArrayAnnotationValue.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ArrayReferenceType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ArrayReferenceType.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ArrayReferenceType.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ArrayReferenceType.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/BCException.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BCException.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/BCException.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/BCException.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/BindingScope.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BindingScope.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/BindingScope.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/BindingScope.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/BoundedReferenceType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BoundedReferenceType.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/BoundedReferenceType.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/BoundedReferenceType.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/BoundedReferenceTypeDelegate.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BoundedReferenceTypeDelegate.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/BoundedReferenceTypeDelegate.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/BoundedReferenceTypeDelegate.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Checker.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Checker.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/Checker.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/Checker.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ClassAnnotationValue.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ClassAnnotationValue.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ClassAnnotationValue.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ClassAnnotationValue.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/CompressingDataOutputStream.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CompressingDataOutputStream.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/CompressingDataOutputStream.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/CompressingDataOutputStream.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ConcreteTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConcreteTypeMunger.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ConcreteTypeMunger.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConcreteTypeMunger.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ConstantPoolReader.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConstantPoolReader.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ConstantPoolReader.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConstantPoolReader.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ConstantPoolWriter.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConstantPoolWriter.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ConstantPoolWriter.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConstantPoolWriter.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Constants.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Constants.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/Constants.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/Constants.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/CrosscuttingMembers.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembers.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/CrosscuttingMembers.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembers.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/CrosscuttingMembersSet.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembersSet.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/CrosscuttingMembersSet.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembersSet.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/CustomMungerFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CustomMungerFactory.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/CustomMungerFactory.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/CustomMungerFactory.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Dump.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Dump.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/Dump.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/Dump.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/EnumAnnotationValue.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/EnumAnnotationValue.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/EnumAnnotationValue.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/EnumAnnotationValue.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ExposeTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ExposeTypeMunger.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ExposeTypeMunger.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ExposeTypeMunger.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/GeneratedReferenceTypeDelegate.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/GeneratedReferenceTypeDelegate.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/GeneratedReferenceTypeDelegate.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/GeneratedReferenceTypeDelegate.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/IClassWeaver.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IClassWeaver.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/IClassWeaver.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/IClassWeaver.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ICrossReferenceHandler.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ICrossReferenceHandler.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ICrossReferenceHandler.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ICrossReferenceHandler.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/IEclipseSourceContext.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IEclipseSourceContext.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/IEclipseSourceContext.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/IEclipseSourceContext.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/IHasPosition.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IHasPosition.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/IHasPosition.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/IHasPosition.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/IHasSourceLocation.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IHasSourceLocation.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/IHasSourceLocation.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/IHasSourceLocation.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ISourceContext.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ISourceContext.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ISourceContext.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ISourceContext.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/IUnwovenClassFile.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IUnwovenClassFile.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/IUnwovenClassFile.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/IUnwovenClassFile.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/IWeaveRequestor.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IWeaveRequestor.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/IWeaveRequestor.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/IWeaveRequestor.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/IWeavingSupport.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IWeavingSupport.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/IWeavingSupport.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/IWeavingSupport.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/IntMap.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IntMap.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/IntMap.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/IntMap.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Iterators.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Iterators.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/Iterators.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/Iterators.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignature.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/JoinPointSignature.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignature.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/JoinPointSignature.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignatureIterator.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/JoinPointSignatureIterator.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignatureIterator.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/JoinPointSignatureIterator.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Lint.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Lint.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/Lint.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/Lint.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/LintMessage.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/LintMessage.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/LintMessage.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/LintMessage.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Member.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Member.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/Member.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/Member.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/MemberImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberImpl.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/MemberImpl.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberImpl.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/MemberKind.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberKind.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/MemberKind.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberKind.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/MemberUtils.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberUtils.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/MemberUtils.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberUtils.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/MethodDelegateTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MethodDelegateTypeMunger.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/MethodDelegateTypeMunger.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/MethodDelegateTypeMunger.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/MissingResolvedTypeWithKnownSignature.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MissingResolvedTypeWithKnownSignature.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/MissingResolvedTypeWithKnownSignature.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/MissingResolvedTypeWithKnownSignature.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/NameMangler.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NameMangler.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/NameMangler.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/NameMangler.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/NewConstructorTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewConstructorTypeMunger.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/NewConstructorTypeMunger.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewConstructorTypeMunger.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/NewFieldTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewFieldTypeMunger.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/NewFieldTypeMunger.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewFieldTypeMunger.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/NewMemberClassTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewMemberClassTypeMunger.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/NewMemberClassTypeMunger.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewMemberClassTypeMunger.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/NewMethodTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewMethodTypeMunger.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/NewMethodTypeMunger.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewMethodTypeMunger.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/NewParentTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewParentTypeMunger.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/NewParentTypeMunger.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewParentTypeMunger.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/PerObjectInterfaceTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PerObjectInterfaceTypeMunger.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/PerObjectInterfaceTypeMunger.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/PerObjectInterfaceTypeMunger.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/PerTypeWithinTargetTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PerTypeWithinTargetTypeMunger.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/PerTypeWithinTargetTypeMunger.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/PerTypeWithinTargetTypeMunger.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/PersistenceSupport.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PersistenceSupport.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/PersistenceSupport.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/PersistenceSupport.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/PoliceExtensionUse.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PoliceExtensionUse.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/PoliceExtensionUse.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/PoliceExtensionUse.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Position.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Position.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/Position.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/Position.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/PrivilegedAccessMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PrivilegedAccessMunger.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/PrivilegedAccessMunger.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/PrivilegedAccessMunger.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ReferenceType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceType.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ReferenceType.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceType.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ReferenceTypeDelegate.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceTypeDelegate.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ReferenceTypeDelegate.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceTypeDelegate.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvableTypeList.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvableTypeList.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ResolvableTypeList.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvableTypeList.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMember.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMember.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMember.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMember.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMemberImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMemberImpl.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMemberImpl.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMemberImpl.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedPointcutDefinition.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedPointcutDefinition.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ResolvedPointcutDefinition.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedPointcutDefinition.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedType.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ResolvedType.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedType.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedTypeMunger.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ResolvedTypeMunger.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedTypeMunger.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/RuntimeVersion.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/RuntimeVersion.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/RuntimeVersion.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/RuntimeVersion.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Shadow.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Shadow.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/Shadow.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/Shadow.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ShadowMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ShadowMunger.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ShadowMunger.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ShadowMunger.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/SignatureUtils.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SignatureUtils.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/SignatureUtils.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/SignatureUtils.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/SimpleAnnotationValue.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SimpleAnnotationValue.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/SimpleAnnotationValue.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/SimpleAnnotationValue.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/SourceContextImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SourceContextImpl.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/SourceContextImpl.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/SourceContextImpl.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/StandardAnnotation.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/StandardAnnotation.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/StandardAnnotation.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/StandardAnnotation.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/StaticJoinPointFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/StaticJoinPointFactory.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/StaticJoinPointFactory.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/StaticJoinPointFactory.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/TemporaryTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TemporaryTypeMunger.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/TemporaryTypeMunger.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/TemporaryTypeMunger.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/TypeFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeFactory.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/TypeFactory.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeFactory.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/TypeVariable.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariable.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/TypeVariable.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariable.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/TypeVariableDeclaringElement.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableDeclaringElement.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/TypeVariableDeclaringElement.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableDeclaringElement.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/TypeVariableReference.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableReference.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/TypeVariableReference.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableReference.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/TypeVariableReferenceType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableReferenceType.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/TypeVariableReferenceType.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableReferenceType.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/UnresolvedType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/UnresolvedType.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/UnresolvedType.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/UnresolvedType.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/UnresolvedTypeVariableReferenceType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/UnresolvedTypeVariableReferenceType.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/UnresolvedTypeVariableReferenceType.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/UnresolvedTypeVariableReferenceType.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Utils.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Utils.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/Utils.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/Utils.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/VersionedDataInputStream.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/VersionedDataInputStream.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/VersionedDataInputStream.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/VersionedDataInputStream.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/WeakClassLoaderReference.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeakClassLoaderReference.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/WeakClassLoaderReference.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeakClassLoaderReference.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/WeaverMessages.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeaverMessages.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/WeaverMessages.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeaverMessages.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/WeaverStateInfo.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeaverStateInfo.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/WeaverStateInfo.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeaverStateInfo.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/WildcardedUnresolvedType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WildcardedUnresolvedType.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/WildcardedUnresolvedType.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/WildcardedUnresolvedType.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/World.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/World.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/World.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/World.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/XlintDefault.properties b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/XlintDefault.properties similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/XlintDefault.properties rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/XlintDefault.properties diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/ASTNode.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/ASTNode.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ast/ASTNode.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/ASTNode.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/And.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/And.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ast/And.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/And.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Call.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Call.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ast/Call.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Call.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/CallExpr.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/CallExpr.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ast/CallExpr.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/CallExpr.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Expr.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Expr.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ast/Expr.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Expr.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/FieldGet.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/FieldGet.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ast/FieldGet.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/FieldGet.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/FieldGetCall.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/FieldGetCall.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ast/FieldGetCall.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/FieldGetCall.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/HasAnnotation.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/HasAnnotation.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ast/HasAnnotation.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/HasAnnotation.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/IExprVisitor.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/IExprVisitor.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ast/IExprVisitor.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/IExprVisitor.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/ITestVisitor.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/ITestVisitor.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ast/ITestVisitor.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/ITestVisitor.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Instanceof.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Instanceof.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ast/Instanceof.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Instanceof.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Literal.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Literal.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ast/Literal.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Literal.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Not.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Not.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ast/Not.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Not.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Or.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Or.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ast/Or.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Or.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Test.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Test.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ast/Test.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Test.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Var.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Var.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/ast/Var.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Var.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/internal/tools/MatchingContextBasedTest.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/MatchingContextBasedTest.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/internal/tools/MatchingContextBasedTest.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/MatchingContextBasedTest.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/internal/tools/PointcutDesignatorHandlerBasedPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/PointcutDesignatorHandlerBasedPointcut.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/internal/tools/PointcutDesignatorHandlerBasedPointcut.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/PointcutDesignatorHandlerBasedPointcut.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/internal/tools/PointcutExpressionImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/PointcutExpressionImpl.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/internal/tools/PointcutExpressionImpl.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/PointcutExpressionImpl.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/internal/tools/StandardPointcutExpressionImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/StandardPointcutExpressionImpl.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/internal/tools/StandardPointcutExpressionImpl.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/StandardPointcutExpressionImpl.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/internal/tools/TypePatternMatcherImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/TypePatternMatcherImpl.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/internal/tools/TypePatternMatcherImpl.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/TypePatternMatcherImpl.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AbstractPatternNodeVisitor.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AbstractPatternNodeVisitor.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/AbstractPatternNodeVisitor.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AbstractPatternNodeVisitor.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AbstractSignaturePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AbstractSignaturePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/AbstractSignaturePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AbstractSignaturePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AndAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndAnnotationTypePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/AndAnnotationTypePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndAnnotationTypePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AndPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndPointcut.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/AndPointcut.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndPointcut.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AndSignaturePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndSignaturePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/AndSignaturePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndSignaturePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AndTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndTypePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/AndTypePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndTypePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnnotationPatternList.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPatternList.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnnotationPatternList.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPatternList.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnnotationPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPointcut.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnnotationPointcut.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPointcut.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationTypePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnnotationTypePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationTypePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnyAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyAnnotationTypePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnyAnnotationTypePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyAnnotationTypePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnyTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyTypePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnyTypePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyTypePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnyWithAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyWithAnnotationTypePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnyWithAnnotationTypePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyWithAnnotationTypePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ArgsAnnotationPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ArgsAnnotationPointcut.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/ArgsAnnotationPointcut.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ArgsAnnotationPointcut.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ArgsPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ArgsPointcut.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/ArgsPointcut.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ArgsPointcut.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/BasicToken.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BasicToken.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/BasicToken.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BasicToken.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/BasicTokenSource.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BasicTokenSource.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/BasicTokenSource.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BasicTokenSource.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/BindingAnnotationFieldTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingAnnotationFieldTypePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/BindingAnnotationFieldTypePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingAnnotationFieldTypePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/BindingAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingAnnotationTypePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/BindingAnnotationTypePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingAnnotationTypePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/BindingPattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingPattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/BindingPattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingPattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/BindingTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingTypePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/BindingTypePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingTypePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/Bindings.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Bindings.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/Bindings.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Bindings.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/CflowPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/CflowPointcut.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/CflowPointcut.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/CflowPointcut.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ConcreteCflowPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ConcreteCflowPointcut.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/ConcreteCflowPointcut.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ConcreteCflowPointcut.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/Declare.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Declare.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/Declare.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Declare.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareAnnotation.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareAnnotation.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareAnnotation.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareAnnotation.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareParents.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParents.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareParents.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParents.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareParentsMixin.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParentsMixin.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareParentsMixin.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParentsMixin.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclarePrecedence.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclarePrecedence.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclarePrecedence.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclarePrecedence.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareSoft.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareSoft.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareSoft.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareSoft.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareTypeErrorOrWarning.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareTypeErrorOrWarning.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareTypeErrorOrWarning.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareTypeErrorOrWarning.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/EllipsisTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/EllipsisTypePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/EllipsisTypePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/EllipsisTypePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ExactAnnotationFieldTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactAnnotationFieldTypePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/ExactAnnotationFieldTypePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactAnnotationFieldTypePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ExactAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactAnnotationTypePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/ExactAnnotationTypePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactAnnotationTypePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ExactTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactTypePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/ExactTypePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactTypePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ExposedState.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExposedState.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/ExposedState.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExposedState.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/FastMatchInfo.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/FastMatchInfo.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/FastMatchInfo.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/FastMatchInfo.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/FormalBinding.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/FormalBinding.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/FormalBinding.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/FormalBinding.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/HandlerPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HandlerPointcut.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/HandlerPointcut.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HandlerPointcut.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/HasMemberTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/HasMemberTypePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/HasMemberTypePatternFinder.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePatternFinder.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/HasMemberTypePatternFinder.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePatternFinder.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/HasMemberTypePatternForPerThisMatching.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePatternForPerThisMatching.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/HasMemberTypePatternForPerThisMatching.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePatternForPerThisMatching.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/HasThisTypePatternTriedToSneakInSomeGenericOrParameterizedTypePatternMatchingStuffAnywhereVisitor.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasThisTypePatternTriedToSneakInSomeGenericOrParameterizedTypePatternMatchingStuffAnywhereVisitor.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/HasThisTypePatternTriedToSneakInSomeGenericOrParameterizedTypePatternMatchingStuffAnywhereVisitor.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasThisTypePatternTriedToSneakInSomeGenericOrParameterizedTypePatternMatchingStuffAnywhereVisitor.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/IScope.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IScope.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/IScope.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IScope.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ISignaturePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ISignaturePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/ISignaturePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ISignaturePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/IToken.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IToken.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/IToken.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IToken.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ITokenSource.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ITokenSource.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/ITokenSource.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ITokenSource.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/IVerificationRequired.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IVerificationRequired.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/IVerificationRequired.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IVerificationRequired.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/IfPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IfPointcut.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/IfPointcut.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IfPointcut.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/KindedPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/KindedPointcut.java similarity index 98% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/KindedPointcut.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/KindedPointcut.java index 968c420e9..56a45892d 100644 --- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/KindedPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/KindedPointcut.java @@ -174,7 +174,11 @@ public class KindedPointcut extends Pointcut { } } } - } + } else if (this.getSignature().getDeclaringType() instanceof WildTypePattern) { + final WildTypePattern pattern = (WildTypePattern) this.getSignature().getDeclaringType(); + final ResolvedType type = info.getType(); + return pattern.matches(type, TypePattern.STATIC); + } } } diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ModifiersPattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ModifiersPattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/ModifiersPattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ModifiersPattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NameBindingPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NameBindingPointcut.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/NameBindingPointcut.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NameBindingPointcut.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NamePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NamePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/NamePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NamePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NoTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NoTypePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/NoTypePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NoTypePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NotAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotAnnotationTypePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/NotAnnotationTypePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotAnnotationTypePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NotPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotPointcut.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/NotPointcut.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotPointcut.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NotSignaturePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotSignaturePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/NotSignaturePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotSignaturePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NotTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotTypePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/NotTypePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotTypePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/OrAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrAnnotationTypePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/OrAnnotationTypePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrAnnotationTypePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/OrPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrPointcut.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/OrPointcut.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrPointcut.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/OrSignaturePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrSignaturePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/OrSignaturePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrSignaturePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/OrTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrTypePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/OrTypePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrTypePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ParserException.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ParserException.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/ParserException.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ParserException.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PatternNode.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternNode.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/PatternNode.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternNode.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PatternNodeVisitor.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternNodeVisitor.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/PatternNodeVisitor.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternNodeVisitor.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PatternParser.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternParser.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/PatternParser.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternParser.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerCflow.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerCflow.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerCflow.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerCflow.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerClause.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerClause.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerClause.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerClause.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerFromSuper.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerFromSuper.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerFromSuper.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerFromSuper.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerObject.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerObject.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerObject.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerObject.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerSingleton.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerSingleton.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerSingleton.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerSingleton.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerThisOrTargetPointcutVisitor.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerThisOrTargetPointcutVisitor.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerThisOrTargetPointcutVisitor.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerThisOrTargetPointcutVisitor.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerTypeWithin.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerTypeWithin.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerTypeWithin.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerTypeWithin.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/Pointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Pointcut.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/Pointcut.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Pointcut.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PointcutEvaluationExpenseComparator.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PointcutEvaluationExpenseComparator.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/PointcutEvaluationExpenseComparator.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PointcutEvaluationExpenseComparator.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PointcutRewriter.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PointcutRewriter.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/PointcutRewriter.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PointcutRewriter.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ReferencePointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ReferencePointcut.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/ReferencePointcut.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ReferencePointcut.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ScopeWithTypeVariables.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ScopeWithTypeVariables.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/ScopeWithTypeVariables.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ScopeWithTypeVariables.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/SignaturePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/SignaturePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/SimpleScope.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SimpleScope.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/SimpleScope.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SimpleScope.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ThisOrTargetAnnotationPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThisOrTargetAnnotationPointcut.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/ThisOrTargetAnnotationPointcut.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThisOrTargetAnnotationPointcut.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ThisOrTargetPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThisOrTargetPointcut.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/ThisOrTargetPointcut.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThisOrTargetPointcut.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ThrowsPattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThrowsPattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/ThrowsPattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThrowsPattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypeCategoryTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeCategoryTypePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypeCategoryTypePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeCategoryTypePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypePatternList.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternList.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypePatternList.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternList.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypePatternQuestions.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternQuestions.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypePatternQuestions.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternQuestions.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypeVariablePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeVariablePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypeVariablePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeVariablePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypeVariablePatternList.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeVariablePatternList.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypeVariablePatternList.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeVariablePatternList.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WildAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildAnnotationTypePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/WildAnnotationTypePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildAnnotationTypePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WildChildFinder.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildChildFinder.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/WildChildFinder.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildChildFinder.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WildTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildTypePattern.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/WildTypePattern.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildTypePattern.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WithinAnnotationPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinAnnotationPointcut.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/WithinAnnotationPointcut.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinAnnotationPointcut.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WithinCodeAnnotationPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinCodeAnnotationPointcut.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/WithinCodeAnnotationPointcut.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinCodeAnnotationPointcut.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WithinPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinPointcut.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/WithinPointcut.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinPointcut.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WithincodePointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithincodePointcut.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/patterns/WithincodePointcut.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithincodePointcut.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/AnnotationFinder.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/AnnotationFinder.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/reflect/AnnotationFinder.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/AnnotationFinder.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/GenericSignatureInformationProvider.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/GenericSignatureInformationProvider.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/reflect/GenericSignatureInformationProvider.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/GenericSignatureInformationProvider.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/IReflectionWorld.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/IReflectionWorld.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/reflect/IReflectionWorld.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/IReflectionWorld.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/Java14GenericSignatureInformationProvider.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/Java14GenericSignatureInformationProvider.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/reflect/Java14GenericSignatureInformationProvider.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/Java14GenericSignatureInformationProvider.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/JoinPointMatchImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/JoinPointMatchImpl.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/reflect/JoinPointMatchImpl.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/JoinPointMatchImpl.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/PointcutParameterImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/PointcutParameterImpl.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/reflect/PointcutParameterImpl.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/PointcutParameterImpl.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegate.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegate.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegate.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegate.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateFactory.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateFactory.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateFactory.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionBasedResolvedMemberImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedResolvedMemberImpl.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionBasedResolvedMemberImpl.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedResolvedMemberImpl.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionFastMatchInfo.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionFastMatchInfo.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionFastMatchInfo.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionFastMatchInfo.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionShadow.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionShadow.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionShadow.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionShadow.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionVar.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionVar.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionVar.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionVar.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionWorld.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionWorld.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionWorld.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionWorld.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ShadowMatchImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ShadowMatchImpl.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/reflect/ShadowMatchImpl.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ShadowMatchImpl.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/StandardShadow.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/StandardShadow.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/reflect/StandardShadow.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/StandardShadow.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/StandardShadowMatchImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/StandardShadowMatchImpl.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/reflect/StandardShadowMatchImpl.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/StandardShadowMatchImpl.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/AbstractTrace.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/AbstractTrace.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/AbstractTrace.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/AbstractTrace.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/CommonsTrace.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/CommonsTrace.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/CommonsTrace.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/CommonsTrace.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/CommonsTraceFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/CommonsTraceFactory.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/CommonsTraceFactory.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/CommonsTraceFactory.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/ContextBasedMatcher.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ContextBasedMatcher.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/ContextBasedMatcher.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ContextBasedMatcher.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/DefaultMatchingContext.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultMatchingContext.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/DefaultMatchingContext.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultMatchingContext.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/DefaultTrace.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultTrace.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/DefaultTrace.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultTrace.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/DefaultTraceFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultTraceFactory.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/DefaultTraceFactory.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultTraceFactory.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/FuzzyBoolean.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/FuzzyBoolean.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/FuzzyBoolean.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/FuzzyBoolean.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/GeneratedClassHandler.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/GeneratedClassHandler.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/GeneratedClassHandler.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/GeneratedClassHandler.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/ISupportsMessageContext.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ISupportsMessageContext.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/ISupportsMessageContext.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ISupportsMessageContext.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/JoinPointMatch.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/JoinPointMatch.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/JoinPointMatch.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/JoinPointMatch.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/MatchingContext.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/MatchingContext.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/MatchingContext.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/MatchingContext.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/PointcutDesignatorHandler.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutDesignatorHandler.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/PointcutDesignatorHandler.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutDesignatorHandler.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/PointcutExpression.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutExpression.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/PointcutExpression.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutExpression.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/PointcutParameter.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutParameter.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/PointcutParameter.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutParameter.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/PointcutParser.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutParser.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/PointcutParser.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutParser.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/PointcutPrimitive.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutPrimitive.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/PointcutPrimitive.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutPrimitive.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/ShadowMatch.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ShadowMatch.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/ShadowMatch.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ShadowMatch.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/StandardPointcutExpression.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutExpression.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/StandardPointcutExpression.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutExpression.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/StandardPointcutParser.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutParser.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/StandardPointcutParser.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutParser.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/Trace.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Trace.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/Trace.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Trace.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/TraceFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TraceFactory.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/TraceFactory.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TraceFactory.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/Traceable.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Traceable.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/Traceable.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Traceable.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/TypePatternMatcher.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TypePatternMatcher.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/TypePatternMatcher.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TypePatternMatcher.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/UnsupportedPointcutPrimitiveException.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/UnsupportedPointcutPrimitiveException.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/UnsupportedPointcutPrimitiveException.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/UnsupportedPointcutPrimitiveException.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/WeavingClassLoader.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/WeavingClassLoader.java similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/tools/WeavingClassLoader.java rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/WeavingClassLoader.java diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/weaver-messages.properties b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/weaver-messages.properties similarity index 100% rename from org.aspectj.matcher/src/org/aspectj/weaver/weaver-messages.properties rename to org.aspectj.matcher/src/main/java/org/aspectj/weaver/weaver-messages.properties diff --git a/org.aspectj.matcher/testsrc/org/aspectj/matcher/tools/CommonAdvancedPointcutExpressionTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/CommonAdvancedPointcutExpressionTests.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/matcher/tools/CommonAdvancedPointcutExpressionTests.java rename to org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/CommonAdvancedPointcutExpressionTests.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/matcher/tools/CommonPointcutExpressionTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/CommonPointcutExpressionTests.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/matcher/tools/CommonPointcutExpressionTests.java rename to org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/CommonPointcutExpressionTests.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/matcher/tools/ReflectionWorldPointcutExpressionTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/ReflectionWorldPointcutExpressionTests.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/matcher/tools/ReflectionWorldPointcutExpressionTests.java rename to org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/ReflectionWorldPointcutExpressionTests.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/CommonWorldTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/CommonWorldTests.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/CommonWorldTests.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/CommonWorldTests.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/MatcherModuleTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/MatcherModuleTests.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/MatcherModuleTests.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/MatcherModuleTests.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/TestShadow.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TestShadow.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/TestShadow.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/TestShadow.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/TestUtils.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TestUtils.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/TestUtils.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/TestUtils.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/TypeFactoryTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TypeFactoryTests.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/TypeFactoryTests.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/TypeFactoryTests.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/AndOrNotTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/AndOrNotTestCase.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/AndOrNotTestCase.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/AndOrNotTestCase.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/ArgsTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ArgsTestCase.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/ArgsTestCase.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ArgsTestCase.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/BindingTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/BindingTestCase.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/BindingTestCase.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/BindingTestCase.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/ConstantPoolSimulator.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ConstantPoolSimulator.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/ConstantPoolSimulator.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ConstantPoolSimulator.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/DeclareErrorOrWarningTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/DeclareErrorOrWarningTestCase.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/DeclareErrorOrWarningTestCase.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/DeclareErrorOrWarningTestCase.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/DumpPointcutVisitor.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/DumpPointcutVisitor.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/DumpPointcutVisitor.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/DumpPointcutVisitor.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/ModifiersPatternTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ModifiersPatternTestCase.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/ModifiersPatternTestCase.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ModifiersPatternTestCase.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/NamePatternParserTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/NamePatternParserTestCase.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/NamePatternParserTestCase.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/NamePatternParserTestCase.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/NamePatternTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/NamePatternTestCase.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/NamePatternTestCase.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/NamePatternTestCase.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ParserTestCase.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ParserTestCase.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/PatternsTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PatternsTestCase.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/PatternsTestCase.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PatternsTestCase.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/PatternsTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PatternsTests.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/PatternsTests.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PatternsTests.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/PointcutRewriterTest.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PointcutRewriterTest.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/PointcutRewriterTest.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PointcutRewriterTest.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/SignaturePatternMatchSpeedTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SignaturePatternMatchSpeedTestCase.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/SignaturePatternMatchSpeedTestCase.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SignaturePatternMatchSpeedTestCase.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/SignaturePatternTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SignaturePatternTestCase.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/SignaturePatternTestCase.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SignaturePatternTestCase.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/SimpleScopeTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SimpleScopeTests.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/SimpleScopeTests.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SimpleScopeTests.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/TestScope.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TestScope.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/TestScope.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TestScope.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/TypePatternListTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TypePatternListTestCase.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/TypePatternListTestCase.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TypePatternListTestCase.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/TypePatternTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TypePatternTestCase.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/TypePatternTestCase.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TypePatternTestCase.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/VisitorTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/VisitorTestCase.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/VisitorTestCase.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/VisitorTestCase.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/WithinTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/WithinTestCase.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/WithinTestCase.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/WithinTestCase.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/reflect/ReflectionWorldBasicTest.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/reflect/ReflectionWorldBasicTest.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/reflect/ReflectionWorldBasicTest.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/reflect/ReflectionWorldBasicTest.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/reflect/ReflectionWorldSpecificTest.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/reflect/ReflectionWorldSpecificTest.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/reflect/ReflectionWorldSpecificTest.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/reflect/ReflectionWorldSpecificTest.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/testcode/Aspect.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/testcode/Aspect.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/testcode/Aspect.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/testcode/Aspect.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/testcode/Base.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/testcode/Base.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/testcode/Base.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/testcode/Base.java diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/testcode/Derived.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/testcode/Derived.java similarity index 100% rename from org.aspectj.matcher/testsrc/org/aspectj/weaver/testcode/Derived.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/testcode/Derived.java diff --git a/org.aspectj.matcher/testsrc/testdata/AnnotatedClass.java b/org.aspectj.matcher/src/test/java/testdata/AnnotatedClass.java similarity index 100% rename from org.aspectj.matcher/testsrc/testdata/AnnotatedClass.java rename to org.aspectj.matcher/src/test/java/testdata/AnnotatedClass.java diff --git a/org.aspectj.matcher/testsrc/testdata/MethodLevelAnnotation.java b/org.aspectj.matcher/src/test/java/testdata/MethodLevelAnnotation.java similarity index 100% rename from org.aspectj.matcher/testsrc/testdata/MethodLevelAnnotation.java rename to org.aspectj.matcher/src/test/java/testdata/MethodLevelAnnotation.java diff --git a/org.aspectj.matcher/testsrc/testdata/SomeAnnotation.java b/org.aspectj.matcher/src/test/java/testdata/SomeAnnotation.java similarity index 100% rename from org.aspectj.matcher/testsrc/testdata/SomeAnnotation.java rename to org.aspectj.matcher/src/test/java/testdata/SomeAnnotation.java -- 2.39.5