From c17032a561dc4b7643c2d1ee667482c18093b6df Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Tue, 29 Jan 2019 12:57:37 -0800 Subject: [PATCH] mavenizing org.aspectj.ajdt.core - wip --- org.aspectj.ajdt.core/.classpath | 21 -- org.aspectj.ajdt.core/.cvsignore | 5 - org.aspectj.ajdt.core/.isJava5 | 1 - org.aspectj.ajdt.core/.project | 25 -- org.aspectj.ajdt.core/build.xml | 6 - .../java5-testsrc/Eajc515ModuleTests.java | 24 -- org.aspectj.ajdt.core/pom.xml | 74 ++++++ .../pr107313-SourceLocation.patch | 242 ------------------ org.aspectj.ajdt.core/scripts/file_replace.py | 31 --- org.aspectj.ajdt.core/scripts/makedelegate.py | 28 -- org.aspectj.ajdt.core/scripts/makeparser.py | 125 --------- .../org/aspectj/ajdt/ajc/AjdtCommand.java | 0 .../org/aspectj/ajdt/ajc/BuildArgParser.java | 0 .../org/aspectj/ajdt/ajc/ConfigParser.java | 0 .../ajdt/compiler/IAjTerminalSymbols.java | 0 .../org/aspectj/ajdt/core/AspectJCore.java | 0 .../ajdt/core/dom/AjASTConverterFactory.java | 0 .../aspectj/ajdt/core/dom/AjASTFactory.java | 0 .../ajdt/core/dom/AjTypeDeclFactory.java | 0 .../compiler/AbstractCompilerAdapter.java | 0 .../ajdt/internal/compiler/AjClassFile.java | 0 .../ajdt/internal/compiler/AjCompiler.java | 0 .../internal/compiler/AjCompilerAdapter.java | 0 .../compiler/AjPipeliningCompilerAdapter.java | 0 .../ClassFileBasedByteCodeProvider.java | 0 .../ajdt/internal/compiler/CommonPrinter.java | 0 .../CompilationResultDestinationManager.java | 0 .../compiler/DeclareAnnotationsPrinter.java | 0 .../compiler/IBinarySourceProvider.java | 0 .../IIntermediateResultsRequestor.java | 0 .../IOutputClassFileNameProvider.java | 0 .../compiler/ITDConstructorPrinter.java | 0 .../internal/compiler/ITDFieldPrinter.java | 0 .../internal/compiler/ITDMethodPrinter.java | 0 .../compiler/InterimCompilationResult.java | 0 .../ajdt/internal/compiler/WeaverAdapter.java | 0 .../compiler/WeaverMessageHandler.java | 0 .../compiler/ast/AccessForInlineVisitor.java | 0 .../ast/AddAtAspectJAnnotationsVisitor.java | 0 .../compiler/ast/AdviceDeclaration.java | 0 .../ast/AjConstructorDeclaration.java | 0 .../compiler/ast/AjMethodDeclaration.java | 0 .../internal/compiler/ast/AspectClinit.java | 0 .../compiler/ast/AspectDeclaration.java | 0 .../ajdt/internal/compiler/ast/AstUtil.java | 0 .../ast/AtAspectJAnnotationFactory.java | 0 .../ast/DeclareAnnotationDeclaration.java | 0 .../compiler/ast/DeclareDeclaration.java | 0 .../compiler/ast/EclipseAttributeAdapter.java | 0 .../ast/EclipseConstantPoolWriter.java | 0 .../compiler/ast/IfMethodDeclaration.java | 0 .../internal/compiler/ast/IfPseudoToken.java | 0 .../compiler/ast/InterSuperFixerVisitor.java | 0 .../compiler/ast/InterSuperReference.java | 0 .../ast/InterTypeConstructorDeclaration.java | 0 .../compiler/ast/InterTypeDeclaration.java | 0 .../ast/InterTypeFieldDeclaration.java | 0 .../ast/InterTypeMethodDeclaration.java | 0 .../ast/IntertypeMemberClassDeclaration.java | 0 .../compiler/ast/KnownFieldReference.java | 0 .../compiler/ast/KnownMessageSend.java | 0 .../compiler/ast/MakeDeclsPublicVisitor.java | 0 .../compiler/ast/PointcutDeclaration.java | 0 .../compiler/ast/PointcutDesignator.java | 0 .../ajdt/internal/compiler/ast/Proceed.java | 0 .../internal/compiler/ast/ProceedVisitor.java | 0 .../internal/compiler/ast/PseudoToken.java | 0 .../internal/compiler/ast/PseudoTokens.java | 0 .../compiler/ast/SuperFixerVisitor.java | 0 .../compiler/ast/ThisJoinPointVisitor.java | 0 .../ValidateAtAspectJAnnotationsVisitor.java | 0 .../compiler/lookup/AjLookupEnvironment.java | 0 .../compiler/lookup/AjTypeConstants.java | 0 .../lookup/EclipseAnnotationConvertor.java | 0 .../compiler/lookup/EclipseFactory.java | 0 .../lookup/EclipseResolvedMember.java | 0 .../compiler/lookup/EclipseScope.java | 0 .../compiler/lookup/EclipseShadow.java | 0 .../lookup/EclipseSourceLocation.java | 0 .../compiler/lookup/EclipseSourceType.java | 0 .../compiler/lookup/EclipseTypeMunger.java | 0 .../lookup/HelperInterfaceBinding.java | 0 .../lookup/InlineAccessFieldBinding.java | 0 .../lookup/InterTypeFieldBinding.java | 0 .../lookup/InterTypeMemberFinder.java | 0 .../lookup/InterTypeMethodBinding.java | 0 .../compiler/lookup/InterTypeScope.java | 0 .../lookup/IntertypeMemberTypeFinder.java | 0 .../compiler/lookup/PointcutBinding.java | 0 .../lookup/PrivilegedFieldBinding.java | 0 .../compiler/lookup/PrivilegedHandler.java | 0 .../compiler/lookup/PushinCollector.java | 0 .../SimpleSyntheticAccessMethodBinding.java | 0 .../compiler/parser/DeclarationFactory.java | 0 .../compiler/problem/AjProblemReporter.java | 0 .../core/builder/AbstractStateListener.java | 0 .../core/builder/AjBatchImageBuilder.java | 0 .../internal/core/builder/AjBuildConfig.java | 0 .../internal/core/builder/AjBuildManager.java | 0 .../core/builder/AjBuildNotifier.java | 0 .../core/builder/AjCompilerOptions.java | 0 .../builder/AjIncrementalImageBuilder.java | 0 .../ajdt/internal/core/builder/AjState.java | 0 .../core/builder/AsmElementFormatter.java | 0 .../core/builder/AsmHierarchyBuilder.java | 0 .../internal/core/builder/AspectJBuilder.java | 0 .../CompactTypeStructureRepresentation.java | 0 .../CompilerConfigurationChangeFlags.java | 0 .../core/builder/EclipseAdapterUtils.java | 0 .../core/builder/EclipseClassPathManager.java | 0 .../core/builder/EclipseSourceContext.java | 0 .../builder/EmacsStructureModelManager.java | 0 .../internal/core/builder/IStateListener.java | 0 .../core/builder/IncrementalStateManager.java | 0 .../core/builder/StatefulNameEnvironment.java | 0 .../core/dom/AbstractBooleanTypePattern.java | 0 .../jdt/core/dom/AdviceDeclaration.java | 0 .../jdt/core/dom/AfterAdviceDeclaration.java | 0 .../dom/AfterReturningAdviceDeclaration.java | 0 .../dom/AfterThrowingAdviceDeclaration.java | 0 .../org/eclipse/jdt/core/dom/AjAST.java | 0 .../eclipse/jdt/core/dom/AjASTConverter.java | 0 .../eclipse/jdt/core/dom/AjASTMatcher.java | 0 .../eclipse/jdt/core/dom/AjASTVisitor.java | 0 .../jdt/core/dom/AjNaiveASTFlattener.java | 0 .../jdt/core/dom/AjTypeDeclaration.java | 0 .../org/eclipse/jdt/core/dom/AndPointcut.java | 0 .../eclipse/jdt/core/dom/AndTypePattern.java | 0 .../eclipse/jdt/core/dom/AnyTypePattern.java | 0 .../dom/AnyWithAnnotationTypePattern.java | 0 .../jdt/core/dom/AroundAdviceDeclaration.java | 0 .../jdt/core/dom/AspectDeclaration.java | 0 .../jdt/core/dom/BeforeAdviceDeclaration.java | 0 .../jdt/core/dom/BindingTypePattern.java | 0 .../eclipse/jdt/core/dom/CflowPointcut.java | 0 .../dom/DeclareAnnotationDeclaration.java | 0 .../dom/DeclareAtConstructorDeclaration.java | 0 .../core/dom/DeclareAtFieldDeclaration.java | 0 .../core/dom/DeclareAtMethodDeclaration.java | 0 .../core/dom/DeclareAtTypeDeclaration.java | 0 .../jdt/core/dom/DeclareDeclaration.java | 0 .../jdt/core/dom/DeclareErrorDeclaration.java | 0 .../core/dom/DeclareParentsDeclaration.java | 0 .../dom/DeclarePrecedenceDeclaration.java | 0 .../jdt/core/dom/DeclareSoftDeclaration.java | 0 .../core/dom/DeclareWarningDeclaration.java | 0 .../eclipse/jdt/core/dom/DefaultPointcut.java | 0 .../jdt/core/dom/DefaultTypePattern.java | 0 .../jdt/core/dom/EllipsisTypePattern.java | 0 .../jdt/core/dom/ExactTypePattern.java | 0 .../eclipse/jdt/core/dom/FormalBinding.java | 0 .../jdt/core/dom/HasMemberTypePattern.java | 0 .../jdt/core/dom/IdentifierTypePattern.java | 0 .../core/dom/InterTypeFieldDeclaration.java | 0 .../core/dom/InterTypeMethodDeclaration.java | 0 .../eclipse/jdt/core/dom/NoTypePattern.java | 0 .../org/eclipse/jdt/core/dom/NotPointcut.java | 0 .../eclipse/jdt/core/dom/NotTypePattern.java | 0 .../org/eclipse/jdt/core/dom/OrPointcut.java | 0 .../eclipse/jdt/core/dom/OrTypePattern.java | 0 .../org/eclipse/jdt/core/dom/PatternNode.java | 0 .../org/eclipse/jdt/core/dom/PerCflow.java | 0 .../org/eclipse/jdt/core/dom/PerObject.java | 0 .../eclipse/jdt/core/dom/PerTypeWithin.java | 0 .../jdt/core/dom/PointcutDeclaration.java | 0 .../jdt/core/dom/PointcutDesignator.java | 0 .../jdt/core/dom/ReferencePointcut.java | 0 .../jdt/core/dom/SignaturePattern.java | 0 .../jdt/core/dom/TypeCategoryTypePattern.java | 0 .../org/eclipse/jdt/core/dom/TypePattern.java | 0 .../eclipse/jdt/core/dom/WildTypePattern.java | 0 .../java}/org/aspectj/tools/ajc/Main.java | 0 .../org/aspectj/ajdt/ajc/messages.properties | 0 .../compiler/parser/readableNames.properties | 0 .../test/java}/AroundAMain.java | 4 +- .../src/test/java/Eajc515ModuleTests.java | 24 ++ .../test/java}/RunWeaveTests.java | 62 ++--- .../test/java/WeaveTest.java} | 2 +- .../org/aspectj/ajdt/EajcModuleTests.java | 43 ++++ .../org/aspectj/ajdt/StreamPrintWriter.java | 0 .../aspectj/ajdt/ajc/AjdtCommandTestCase.java | 2 +- .../ajdt/ajc/BuildArgParserTestCase.java | 41 +-- .../ajc/ConsoleMessageHandlerTestCase.java | 0 .../java/org/aspectj/ajdt/ajc/Constants.java} | 32 ++- .../compiler/batch/AjdtBatchTests.java | 45 ++++ .../compiler/batch/BasicCommandTestCase.java | 20 +- .../compiler/batch/BcweaverJarMaker.java | 75 +++--- .../compiler/batch/BinaryFormsTestCase.java | 37 ++- .../compiler/batch/CommandTestCase.java | 11 +- .../compiler/batch/CompileAndRunTestCase.java | 0 .../compiler/batch/CompilerDumpTestCase.java | 6 +- .../compiler/batch/DeclareParentsTest.java} | 2 +- .../internal/compiler/batch/DumpTestCase.java | 148 +++++++++++ .../compiler/batch/ImageTestCase.java | 0 .../compiler/batch/IncrementalCase.java | 0 .../internal/compiler/batch/JavadocTest.java | 0 .../batch/MultipleCompileTestCase.java | 0 .../PartiallyExposedHierarchyTestCase.java | 0 .../compiler/batch/PerformanceTestCase.java | 0 .../batch/ProceedOnErrorTestCase.java | 0 .../compiler/batch/VerifyWeaveTestCase.java | 0 .../compiler/batch/WorkingTestMain.java | 6 +- .../core/builder/AjBuildConfigTest.java} | 2 +- .../core/builder/AjBuildManagerTest.java | 10 +- .../core/builder/AjCompilerOptionsTest.java | 0 .../internal/core/builder/AjStateTest.java | 0 .../core/builder/AjdtBuilderTests.java | 38 +++ .../internal/core/builder/AsmBuilderTest.java | 0 .../internal/core/builder/OutjarTest.java | 0 .../org/aspectj/tools/ajc/ASTVisitorTest.java | 0 .../org/aspectj/tools/ajc/ASTitdTest.java | 0 .../org/aspectj/tools/ajc/AjAST5Test.java | 0 .../org/aspectj/tools/ajc/AjASTTest.java | 0 .../org/aspectj/tools/ajc/AjASTTestCase.java | 0 .../tools/ajc/AjNaiveASTFlattenerTest.java | 0 .../test/java}/org/aspectj/tools/ajc/Ajc.java | 86 ++++--- .../java/org/aspectj/tools/ajc/Ajc5Tests.java | 30 +++ .../org/aspectj/tools/ajc/AjcTestCase.java | 0 .../aspectj/tools/ajc/AjcTestCaseTest.java | 0 .../java/org/aspectj/tools/ajc/AjcTests.java | 36 +++ .../aspectj/tools/ajc/CompilationResult.java | 0 .../tools/ajc/DelegatingOutputStream.java | 0 .../java}/org/aspectj/tools/ajc/MainTest.java | 0 .../aspectj/tools/ajc/TestMessageHolder.java | 0 .../org/aspectj/ajdt/EajcModuleTests.java | 43 ---- .../org/aspectj/ajdt/ajc/AjdtAjcTests.java | 39 --- .../compiler/batch/AjdtBatchTests.java | 45 ---- .../core/builder/AjdtBuilderTests.java | 38 --- .../org/aspectj/tools/ajc/AjcTests.java | 36 --- 229 files changed, 642 insertions(+), 903 deletions(-) delete mode 100644 org.aspectj.ajdt.core/.classpath delete mode 100644 org.aspectj.ajdt.core/.cvsignore delete mode 100644 org.aspectj.ajdt.core/.isJava5 delete mode 100644 org.aspectj.ajdt.core/.project delete mode 100644 org.aspectj.ajdt.core/build.xml delete mode 100644 org.aspectj.ajdt.core/java5-testsrc/Eajc515ModuleTests.java create mode 100644 org.aspectj.ajdt.core/pom.xml delete mode 100644 org.aspectj.ajdt.core/pr107313-SourceLocation.patch delete mode 100644 org.aspectj.ajdt.core/scripts/file_replace.py delete mode 100644 org.aspectj.ajdt.core/scripts/makedelegate.py delete mode 100644 org.aspectj.ajdt.core/scripts/makeparser.py rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/ajc/AjdtCommand.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/ajc/BuildArgParser.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/ajc/ConfigParser.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/compiler/IAjTerminalSymbols.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/core/AspectJCore.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/core/dom/AjASTConverterFactory.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/core/dom/AjASTFactory.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/core/dom/AjTypeDeclFactory.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/AbstractCompilerAdapter.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/AjClassFile.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/AjCompiler.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ClassFileBasedByteCodeProvider.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/CommonPrinter.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/CompilationResultDestinationManager.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/DeclareAnnotationsPrinter.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/IBinarySourceProvider.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/IIntermediateResultsRequestor.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/IOutputClassFileNameProvider.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ITDConstructorPrinter.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ITDFieldPrinter.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ITDMethodPrinter.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/InterimCompilationResult.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/WeaverAdapter.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/AccessForInlineVisitor.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/AddAtAspectJAnnotationsVisitor.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/AjConstructorDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/AjMethodDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/AspectClinit.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/AtAspectJAnnotationFactory.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/DeclareAnnotationDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/DeclareDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/EclipseAttributeAdapter.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/EclipseConstantPoolWriter.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/IfMethodDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/InterSuperFixerVisitor.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/InterSuperReference.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/InterTypeDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/IntertypeMemberClassDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/KnownFieldReference.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/KnownMessageSend.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/MakeDeclsPublicVisitor.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/Proceed.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/PseudoToken.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/PseudoTokens.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/SuperFixerVisitor.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/ast/ValidateAtAspectJAnnotationsVisitor.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/lookup/AjTypeConstants.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/lookup/EclipseAnnotationConvertor.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/lookup/EclipseResolvedMember.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/lookup/EclipseShadow.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceLocation.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/lookup/EclipseTypeMunger.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/lookup/HelperInterfaceBinding.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/lookup/InlineAccessFieldBinding.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/lookup/InterTypeFieldBinding.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMethodBinding.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/lookup/InterTypeScope.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/lookup/IntertypeMemberTypeFinder.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/lookup/PointcutBinding.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedFieldBinding.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedHandler.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/lookup/PushinCollector.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/lookup/SimpleSyntheticAccessMethodBinding.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/parser/DeclarationFactory.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/core/builder/AbstractStateListener.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/core/builder/AjBatchImageBuilder.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/core/builder/AjBuildNotifier.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/core/builder/AjIncrementalImageBuilder.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/core/builder/AjState.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/core/builder/CompactTypeStructureRepresentation.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/core/builder/CompilerConfigurationChangeFlags.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/core/builder/EclipseAdapterUtils.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/core/builder/EclipseClassPathManager.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/core/builder/EclipseSourceContext.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/core/builder/IStateListener.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/core/builder/IncrementalStateManager.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/ajdt/internal/core/builder/StatefulNameEnvironment.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/AbstractBooleanTypePattern.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/AdviceDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/AfterAdviceDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/AfterReturningAdviceDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/AfterThrowingAdviceDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/AjAST.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/AjASTMatcher.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/AjASTVisitor.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/AjNaiveASTFlattener.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/AjTypeDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/AndPointcut.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/AndTypePattern.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/AnyTypePattern.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/AnyWithAnnotationTypePattern.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/AroundAdviceDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/AspectDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/BeforeAdviceDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/BindingTypePattern.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/CflowPointcut.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/DeclareAnnotationDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtConstructorDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtFieldDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtMethodDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtTypeDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/DeclareDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/DeclareErrorDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/DeclareParentsDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/DeclarePrecedenceDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/DeclareSoftDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/DeclareWarningDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/DefaultPointcut.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/DefaultTypePattern.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/EllipsisTypePattern.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/ExactTypePattern.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/FormalBinding.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/HasMemberTypePattern.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/IdentifierTypePattern.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/InterTypeFieldDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/InterTypeMethodDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/NoTypePattern.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/NotPointcut.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/NotTypePattern.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/OrPointcut.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/OrTypePattern.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/PatternNode.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/PerCflow.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/PerObject.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/PerTypeWithin.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/PointcutDeclaration.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/PointcutDesignator.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/ReferencePointcut.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/SignaturePattern.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/TypeCategoryTypePattern.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/TypePattern.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/org/eclipse/jdt/core/dom/WildTypePattern.java (100%) rename org.aspectj.ajdt.core/src/{ => main/java}/org/aspectj/tools/ajc/Main.java (100%) rename org.aspectj.ajdt.core/src/{ => main/resources}/org/aspectj/ajdt/ajc/messages.properties (100%) rename org.aspectj.ajdt.core/src/{ => main/resources}/org/aspectj/ajdt/internal/compiler/parser/readableNames.properties (100%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/AroundAMain.java (95%) create mode 100644 org.aspectj.ajdt.core/src/test/java/Eajc515ModuleTests.java rename org.aspectj.ajdt.core/{testsrc => src/test/java}/RunWeaveTests.java (84%) rename org.aspectj.ajdt.core/{testsrc/WeaveTests.java => src/test/java/WeaveTest.java} (99%) create mode 100644 org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/EajcModuleTests.java rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/StreamPrintWriter.java (100%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/ajc/AjdtCommandTestCase.java (99%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java (93%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/ajc/ConsoleMessageHandlerTestCase.java (100%) rename org.aspectj.ajdt.core/{java5-testsrc/org/aspectj/tools/ajc/Ajc5Tests.java => src/test/java/org/aspectj/ajdt/ajc/Constants.java} (50%) create mode 100644 org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/AjdtBatchTests.java rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/internal/compiler/batch/BasicCommandTestCase.java (88%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java (85%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/internal/compiler/batch/BinaryFormsTestCase.java (67%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/internal/compiler/batch/CommandTestCase.java (95%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/internal/compiler/batch/CompileAndRunTestCase.java (100%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/internal/compiler/batch/CompilerDumpTestCase.java (91%) rename org.aspectj.ajdt.core/{testsrc/org/aspectj/ajdt/internal/compiler/batch/DeclareParents.java => src/test/java/org/aspectj/ajdt/internal/compiler/batch/DeclareParentsTest.java} (99%) create mode 100644 org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/DumpTestCase.java rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/internal/compiler/batch/ImageTestCase.java (100%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/internal/compiler/batch/IncrementalCase.java (100%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/internal/compiler/batch/JavadocTest.java (100%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/internal/compiler/batch/MultipleCompileTestCase.java (100%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/internal/compiler/batch/PartiallyExposedHierarchyTestCase.java (100%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/internal/compiler/batch/PerformanceTestCase.java (100%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/internal/compiler/batch/ProceedOnErrorTestCase.java (100%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/internal/compiler/batch/VerifyWeaveTestCase.java (100%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java (96%) rename org.aspectj.ajdt.core/{testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildConfigTests.java => src/test/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfigTest.java} (99%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java (97%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/internal/core/builder/AjCompilerOptionsTest.java (100%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/internal/core/builder/AjStateTest.java (100%) create mode 100644 org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjdtBuilderTests.java rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/internal/core/builder/AsmBuilderTest.java (100%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/ajdt/internal/core/builder/OutjarTest.java (100%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/tools/ajc/ASTVisitorTest.java (100%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/tools/ajc/ASTitdTest.java (100%) rename org.aspectj.ajdt.core/{java5-testsrc => src/test/java}/org/aspectj/tools/ajc/AjAST5Test.java (100%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/tools/ajc/AjASTTest.java (100%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/tools/ajc/AjASTTestCase.java (100%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/tools/ajc/AjNaiveASTFlattenerTest.java (100%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/tools/ajc/Ajc.java (88%) create mode 100644 org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/Ajc5Tests.java rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/tools/ajc/AjcTestCase.java (100%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/tools/ajc/AjcTestCaseTest.java (100%) create mode 100644 org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTests.java rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/tools/ajc/CompilationResult.java (100%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/tools/ajc/DelegatingOutputStream.java (100%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/tools/ajc/MainTest.java (100%) rename org.aspectj.ajdt.core/{testsrc => src/test/java}/org/aspectj/tools/ajc/TestMessageHolder.java (100%) delete mode 100644 org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/EajcModuleTests.java delete mode 100644 org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/AjdtAjcTests.java delete mode 100644 org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/AjdtBatchTests.java delete mode 100644 org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjdtBuilderTests.java delete mode 100644 org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTests.java diff --git a/org.aspectj.ajdt.core/.classpath b/org.aspectj.ajdt.core/.classpath deleted file mode 100644 index 9dd83784d..000000000 --- a/org.aspectj.ajdt.core/.classpath +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/org.aspectj.ajdt.core/.cvsignore b/org.aspectj.ajdt.core/.cvsignore deleted file mode 100644 index 9c522ca46..000000000 --- a/org.aspectj.ajdt.core/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -out -bin -default.ajsym -default.lst -bintest diff --git a/org.aspectj.ajdt.core/.isJava5 b/org.aspectj.ajdt.core/.isJava5 deleted file mode 100644 index 0519ecba6..000000000 --- a/org.aspectj.ajdt.core/.isJava5 +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/org.aspectj.ajdt.core/.project b/org.aspectj.ajdt.core/.project deleted file mode 100644 index 55bb13722..000000000 --- a/org.aspectj.ajdt.core/.project +++ /dev/null @@ -1,25 +0,0 @@ - - - org.aspectj.ajdt.core - - - asm - bridge - org.eclipse.jdt.core - runtime - testing-client - testing-util - util - weaver - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/org.aspectj.ajdt.core/build.xml b/org.aspectj.ajdt.core/build.xml deleted file mode 100644 index 8765d7548..000000000 --- a/org.aspectj.ajdt.core/build.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/org.aspectj.ajdt.core/java5-testsrc/Eajc515ModuleTests.java b/org.aspectj.ajdt.core/java5-testsrc/Eajc515ModuleTests.java deleted file mode 100644 index 9efd128cc..000000000 --- a/org.aspectj.ajdt.core/java5-testsrc/Eajc515ModuleTests.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Matthew Webster - initial implementation - *******************************************************************************/ -import junit.framework.*; -import junit.framework.Test; - -public class Eajc515ModuleTests extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(Eajc515ModuleTests.class.getName()); - suite.addTest(org.aspectj.tools.ajc.Ajc5Tests.suite()); - return suite; - } - - public Eajc515ModuleTests(String name) { super(name); } - -} diff --git a/org.aspectj.ajdt.core/pom.xml b/org.aspectj.ajdt.core/pom.xml new file mode 100644 index 000000000..47bd8c56c --- /dev/null +++ b/org.aspectj.ajdt.core/pom.xml @@ -0,0 +1,74 @@ + + 4.0.0 + + + org.aspectj + aspectj-parent + 1.9.3.BUILD-SNAPSHOT + .. + + + org.aspectj.ajdt.core + jar + org.aspectj.ajdt.core + + + + org.aspectj + bridge + ${project.version} + + + org.aspectj + weaver + ${project.version} + + + org.aspectj + asm + ${project.version} + + + org.aspectj + util + ${project.version} + + + org.aspectj + runtime + ${project.version} + + + org.aspectj + bcel-builder + ${project.version} + + + org.aspectj + testing-util + ${project.version} + + + org.aspectj + testing-client + ${project.version} + + + org.aspectj + org.eclipse.jdt.core + ${project.version} + + + org.aspectj + loadtime + ${project.version} + + + org.aspectj + org.aspectj.matcher + ${project.version} + + + diff --git a/org.aspectj.ajdt.core/pr107313-SourceLocation.patch b/org.aspectj.ajdt.core/pr107313-SourceLocation.patch deleted file mode 100644 index 8a5ef11f8..000000000 --- a/org.aspectj.ajdt.core/pr107313-SourceLocation.patch +++ /dev/null @@ -1,242 +0,0 @@ -Index: .classpath -=================================================================== -RCS file: /home/technology/org.aspectj/modules/org.aspectj.ajdt.core/.classpath,v -retrieving revision 1.6 -diff -u -r1.6 .classpath ---- .classpath 3 May 2005 13:31:17 -0000 1.6 -+++ .classpath 2 Sep 2005 07:39:42 -0000 -@@ -13,5 +13,6 @@ - - - -+ - - -Index: .project -=================================================================== -RCS file: /home/technology/org.aspectj/modules/org.aspectj.ajdt.core/.project,v -retrieving revision 1.2 -diff -u -r1.2 .project ---- .project 13 Aug 2004 15:18:01 -0000 1.2 -+++ .project 2 Sep 2005 07:39:42 -0000 -@@ -4,6 +4,7 @@ - - - asm -+ aspectj5rt - bridge - org.eclipse.jdt.core - runtime -Index: src/org/aspectj/ajdt/ajc/BuildArgParser.java -=================================================================== -RCS file: /home/technology/org.aspectj/modules/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java,v -retrieving revision 1.40 -diff -u -r1.40 BuildArgParser.java ---- src/org/aspectj/ajdt/ajc/BuildArgParser.java 23 Aug 2005 08:47:32 -0000 1.40 -+++ src/org/aspectj/ajdt/ajc/BuildArgParser.java 2 Sep 2005 07:39:43 -0000 -@@ -171,6 +171,7 @@ - } - - buildConfig.setFiles(fileList); -+ buildConfig.setUserFileNameMap(parser.getUserFileNameMap()); - if (destinationPath != null) { // XXX ?? unparsed but set? - buildConfig.setOutputDir(new File(destinationPath)); - } -Index: src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java -=================================================================== -RCS file: /home/technology/org.aspectj/modules/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java,v -retrieving revision 1.28 -diff -u -r1.28 AjBuildConfig.java ---- src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java 23 Aug 2005 08:47:14 -0000 1.28 -+++ src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java 2 Sep 2005 07:39:43 -0000 -@@ -44,6 +44,7 @@ - private File outputJar; - private List/*File*/ sourceRoots = new ArrayList(); - private List/*File*/ files = new ArrayList(); -+ private Map/*File -> File*/ userFileNameMap = new HashMap(); - private List /*File*/ binaryFiles = new ArrayList(); // .class files in indirs... - private List/*File*/ inJars = new ArrayList(); - private List/*File*/ inPath = new ArrayList(); -@@ -117,6 +118,10 @@ - public List/*File*/ getFiles() { - return files; - } -+ -+ public Map/* File -> File*/ getUserFileNameMap() { -+ return userFileNameMap; -+ } - - /** - * returned files includes all .class files found in -@@ -134,6 +139,10 @@ - public void setFiles(List files) { - this.files = files; - } -+ -+ public void setUserFileNameMap(Map userFileNameMap) { -+ this.userFileNameMap = userFileNameMap; -+ } - - public void setOutputDir(File outputDir) { - this.outputDir = outputDir; -Index: src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java -=================================================================== -RCS file: /home/technology/org.aspectj/modules/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java,v -retrieving revision 1.73 -diff -u -r1.73 AjBuildManager.java ---- src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java 23 Aug 2005 21:30:11 -0000 1.73 -+++ src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java 2 Sep 2005 07:39:45 -0000 -@@ -165,8 +165,11 @@ - if (!canIncremental && !batch) { // retry as batch? - return doBuild(buildConfig, baseHandler, true); - } -+ IMessageHandler userTranslatingHandler = -+ new UserFileLocationTranslatingHandler(baseHandler,buildConfig.getUserFileNameMap()); - this.handler = -- CountingMessageHandler.makeCountingMessageHandler(baseHandler); -+ CountingMessageHandler.makeCountingMessageHandler(userTranslatingHandler); -+ ; - // XXX duplicate, no? remove? - String check = checkRtJar(buildConfig); - if (check != null) { -Index: testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java -=================================================================== -RCS file: /home/technology/org.aspectj/modules/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java,v -retrieving revision 1.16 -diff -u -r1.16 AjBuildManagerTest.java ---- testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java 23 Jan 2004 19:07:52 -0000 1.16 -+++ testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java 2 Sep 2005 07:39:46 -0000 -@@ -89,6 +89,29 @@ - // ((StructureNode)StructureModelManager.INSTANCE.getStructureModel().getRoot().getChildren().get(0)).getChildren() - // ); - } -+ -+ public void testUserFileTranslationInErrorMessages() throws IOException { -+ AjBuildManager manager = new AjBuildManager(messageWriter); -+ BuildArgParser parser = new BuildArgParser(messageWriter); -+ String javaClassPath = System.getProperty("java.class.path"); -+ AjBuildConfig buildConfig = -+ parser.genBuildConfig(new String[] { -+ "-d", "out", -+ "-classpath", -+ javaClassPath, -+ AjdtAjcTests.TESTDATA_PATH -+ + "/src1/DeclareWarning.java", -+// EajcModuleTests.TESTDATA_PATH + "/src1/Hello.java", -+ }); -+ String err = parser.getOtherMessages(true); -+ assertTrue(err, null == err); -+ manager.setStructureModel(AsmManager.getDefault().getHierarchy()); -+ MessageHandler handler = new MessageHandler(); -+ manager.batchBuild(buildConfig, handler); -+ IMessage[] warnings = handler.getMessages(IMessage.WARNING, false); -+ assertEquals("1 warning",1,warnings.length); -+ assertTrue("source file mapped back to user location",warnings[0].getSourceLocation().getSourceFile().getPath().startsWith("..")); -+ } - - - -Index: src/org/aspectj/ajdt/internal/core/builder/UserFileLocationTranslatingHandler.java -=================================================================== -RCS file: src/org/aspectj/ajdt/internal/core/builder/UserFileLocationTranslatingHandler.java -diff -N src/org/aspectj/ajdt/internal/core/builder/UserFileLocationTranslatingHandler.java ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ src/org/aspectj/ajdt/internal/core/builder/UserFileLocationTranslatingHandler.java 1 Jan 1970 00:00:00 -0000 -@@ -0,0 +1,97 @@ -+/* ******************************************************************* -+ * Copyright (c) 2005 Contributors. -+ * All rights reserved. -+ * This program and the accompanying materials are made available -+ * under the terms of the Eclipse Public License v1.0 -+ * which accompanies this distribution and is available at -+ * http://eclipse.org/legal/epl-v10.html -+ * -+ * Contributors: -+ * Adrian Colyer Initial implementation -+ * ******************************************************************/ -+package org.aspectj.ajdt.internal.core.builder; -+ -+import java.io.File; -+import java.util.ArrayList; -+import java.util.Iterator; -+import java.util.List; -+import java.util.Map; -+ -+import org.aspectj.bridge.AbortException; -+import org.aspectj.bridge.IMessage; -+import org.aspectj.bridge.IMessageHandler; -+import org.aspectj.bridge.ISourceLocation; -+import org.aspectj.bridge.Message; -+import org.aspectj.bridge.SourceLocation; -+import org.aspectj.bridge.IMessage.Kind; -+ -+/** -+ * @author colyer -+ * -+ */ -+public class UserFileLocationTranslatingHandler implements IMessageHandler { -+ -+ private IMessageHandler delegate; -+ private Map userFileNameMap; -+ -+ public UserFileLocationTranslatingHandler(IMessageHandler delegateHandler, Map canonicalFileToUserFile) { -+ this.delegate = delegateHandler; -+ this.userFileNameMap = canonicalFileToUserFile; -+ } -+ -+ /* (non-Javadoc) -+ * @see org.aspectj.bridge.IMessageHandler#handleMessage(org.aspectj.bridge.IMessage) -+ */ -+ public boolean handleMessage(IMessage message) throws AbortException { -+ IMessage messageToIssue = message; -+ ISourceLocation location = message.getSourceLocation(); -+ if (location != null) { -+ File sourceFile = location.getSourceFile(); -+ if (userFileNameMap.containsKey(sourceFile)) { -+ File userFile = (File) userFileNameMap.get(sourceFile); -+ if (!sourceFile.getPath().equals(userFile.getPath())) { -+ // path as known to user is different to the canonical path we have been -+ // working with. Could be due to eg. symbolic links in filesystem etc. -+ // this upsets clients such as AJDT -+ messageToIssue = replaceLocationsIn(message); -+ } -+ } -+ } -+ return delegate.handleMessage(messageToIssue); -+ } -+ -+ /* (non-Javadoc) -+ * @see org.aspectj.bridge.IMessageHandler#isIgnoring(org.aspectj.bridge.IMessage.Kind) -+ */ -+ public boolean isIgnoring(Kind kind) { -+ return delegate.isIgnoring(kind); -+ } -+ -+ /* (non-Javadoc) -+ * @see org.aspectj.bridge.IMessageHandler#dontIgnore(org.aspectj.bridge.IMessage.Kind) -+ */ -+ public void dontIgnore(Kind kind) { -+ delegate.dontIgnore(kind); -+ } -+ -+ private IMessage replaceLocationsIn(IMessage message) { -+ ISourceLocation newSourceLocation = replaceLocationIn(message.getSourceLocation()); -+ List extraLocations = message.getExtraSourceLocations(); -+ List newExtraLocations = new ArrayList(); -+ for (Iterator iter = extraLocations.iterator(); iter.hasNext();) { -+ ISourceLocation loc = (ISourceLocation) iter.next(); -+ newExtraLocations.add(replaceLocationIn(loc)); -+ } -+ Message copyWithUpdatedLocation = new Message(message,newSourceLocation,newExtraLocations); -+ return copyWithUpdatedLocation; -+ } -+ -+ private ISourceLocation replaceLocationIn(ISourceLocation location) { -+ File newSourceFile = location.getSourceFile(); -+ if (userFileNameMap.containsKey(newSourceFile)) { -+ newSourceFile = (File) userFileNameMap.get(newSourceFile); -+ } -+ SourceLocation newSourceLocation = new SourceLocation(location,newSourceFile); -+ return newSourceLocation; -+ } -+} diff --git a/org.aspectj.ajdt.core/scripts/file_replace.py b/org.aspectj.ajdt.core/scripts/file_replace.py deleted file mode 100644 index 60f3986ab..000000000 --- a/org.aspectj.ajdt.core/scripts/file_replace.py +++ /dev/null @@ -1,31 +0,0 @@ -import os, string - -DIR = "c:\\eclipse\\workspace\\weaver" - -old_text = "declare dominates:" - -new_text = "declare precedence:" - - -def doit(arg, dirname, filenames): - for name in filenames: - fullname = os.path.join(dirname, name) - if os.path.isfile(fullname): - do_replace(fullname) - -def do_replace(filename): - if filename.endswith(".py"): return - - s = open(filename, 'r') - text = s.read() - s.close() - - if string.find(text, old_text) == -1: - return - - s = open(filename, 'w') - s.write(text.replace(old_text, new_text)) - s.close() - - print "changed", filename -os.path.walk(DIR, doit, None) diff --git a/org.aspectj.ajdt.core/scripts/makedelegate.py b/org.aspectj.ajdt.core/scripts/makedelegate.py deleted file mode 100644 index 682a338f0..000000000 --- a/org.aspectj.ajdt.core/scripts/makedelegate.py +++ /dev/null @@ -1,28 +0,0 @@ -inputFile = "c:/eclipse/workspace/org.eclipse.jdt.core/aspectj/org/aspectj/workbench/resources/FileAdapter.java" - -text = open(inputFile, 'r').read() - -#print text - -import re, string - -methodPat = re.compile(r"public [^{]*\([^{]*{[^}]*}") #^[{]\)^[{]{", re.DOTALL) #{ .* }", re.DOTALL) - -throwException = """throw new RuntimeException("unimplemented");""" - -for method in methodPat.findall(text): - print method - - newMethod = method[:len(method)-1] - - startBody = newMethod.find("{") - newMethod = newMethod[:startBody+1] - - - newMethod = newMethod + "\n\t" + throwException + "\n\t}" - text = text.replace(method, newMethod) - -print text - -open(inputFile, 'w').write(text) - diff --git a/org.aspectj.ajdt.core/scripts/makeparser.py b/org.aspectj.ajdt.core/scripts/makeparser.py deleted file mode 100644 index 4b878f99b..000000000 --- a/org.aspectj.ajdt.core/scripts/makeparser.py +++ /dev/null @@ -1,125 +0,0 @@ -# set these first four variables appropriately for your system -eclipseWorkspace = "c:/aspectj/2.1/eclipse/workspace" -workingDir = "c:/apps/jikespg/jdt/tmp" - -jikespg = "c:/apps/jikespg/src/jikespg.exe" -makersc = "c:/j2sdk1.4/bin/java -classpath c:/aspectj/2.1/eclipse/workspace/org.eclipse.jdt.core/bin;c:/apps/jikespg/jdt UpdateParserFiles" - -# the rest of this should never change -ajCompilerHomeRel = "org.aspectj.ajdt.core/src/" -javaCompilerHomeRel = "org.eclipse.jdt.core/compiler/" - -compilerHomeRel = ajCompilerHomeRel -parserHomeRel = ajCompilerHomeRel + "org/aspectj/ajdt/internal/compiler/parser" -parserInfoFileRel = javaCompilerHomeRel + "org/eclipse/jdt/internal/compiler/parser/ParserBasicInformation.java" -symbolsHomeRel = javaCompilerHomeRel + "org/eclipse/jdt/internal/compiler/parser/TerminalTokens.java" -# symbolsHomeRel = "org/aspectj/ajdt/compiler/IAjTerminalSymbols.java" -parserClass = "AjParser.java" -grammarFileRel = javaCompilerHomeRel + "../grammar/java_1_4.g" - -import os -from os import path -import re - -def readFile(name, mode=''): - f = open(name, 'r'+mode) - text = f.read() - f.close() - return text - -def writeFile(name, text, mode=''): - f = open(name, 'w'+mode) - f.write(text) - f.close() - -compilerHome = path.join(eclipseWorkspace, compilerHomeRel) -parserHome = path.join(eclipseWorkspace, parserHomeRel) -symbolFile = path.join(eclipseWorkspace, symbolsHomeRel) -parserInfoFile = path.join(eclipseWorkspace, parserInfoFileRel) - -parserFile = path.join(parserHome, parserClass) -parserText = readFile(parserFile) - -if grammarFileRel == None: - r = re.compile(r"public final static void grammar\(\){.*(--main.*\$end\n)-- need", re.DOTALL) - match = r.search(parserText) - grammar = match.group(1) -else: - grammar = readFile(path.join(eclipseWorkspace, grammarFileRel), 'b') -#print grammar - -grammarFile = path.join(workingDir, "java.g") -writeFile(grammarFile, grammar, 'b') -os.chdir(workingDir) -os.system("%s java.g" % jikespg) - -#3.1 Copy the contents of the JavaAction.java file into the consumeRule(int) method of the org.eclipse.jdt.internal.compiler.parser.Parser class. - -newConsumeRule = readFile(path.join(workingDir, "JavaAction.java")) -#print newConsumeRule - -r = re.compile(r"(// This method is part of an automatic generation : do NOT edit-modify\W+protected void consumeRule\(int act\) {.*)protected void consumeSimpleAssertStatement\(\) {", re.DOTALL) - -match = r.search(parserText) -parserText = parserText.replace(match.group(1), newConsumeRule) - - -#3.2 The definition of the Parser needs to be updated with two tables from javadcl.java. Those are rhs[] and name[]. - -newTables = readFile(path.join(workingDir, "javadcl.java")) -r = re.compile(r"(public final static byte rhs\[\] = \{[^}]*\};)", re.DOTALL) -rhsTable = r.search(newTables).group(0) - -parserText = parserText.replace(r.search(parserText).group(0), rhsTable) - - -r = re.compile(r"(public final static String name\[\] = \{[^}]*\}[^}]*\};)", re.DOTALL) -nameTable = r.search(newTables).group(0) -nameTable = nameTable.replace("\"$eof\"", "UNEXPECTED_EOF") -nameTable = nameTable.replace("$error", "Invalid Character") - -parserText = parserText.replace(r.search(parserText).group(0), nameTable) - - -#we're done w/ Parser.java -writeFile(parserFile, parserText) - - - -#3.3 The class org.eclipse.jdt.internal.compiler.parser.ParserBasicInformation needs to be updated with the content of the file javadef.java. - -defs = readFile(path.join(workingDir, "javadef.java")) -r = re.compile(r"(public final static int[^;]*;)", re.DOTALL) -syms = r.search(defs).group(0) -#print syms - -text = readFile(parserInfoFile) -text = text.replace(r.search(text).group(0), syms) - -writeFile(parserInfoFile, text) - -#3.4 This is the contents of the class org.eclipse.jdt.internal.compiler.parser.TerminalSymbols. - -defs = readFile(path.join(workingDir, "javasym.java")) -r = re.compile(r"(int\s+TokenNameIdentifier[^;]*;)", re.DOTALL) -syms = r.search(defs).group(0) -syms = syms.replace("$eof", "EOF") -syms = syms.replace("$error", "ERROR") - -print syms - -text = readFile(symbolFile) -text = text.replace(r.search(text).group(0), syms) - -writeFile(symbolFile, text) - -#3.5 The last step is to update the resource files: - -os.chdir(workingDir) -os.system("%s javadcl.java" % makersc) - -for i in range(1,6): - name = "parser%d.rsc" % i - print "moving", name - t = readFile(path.join(workingDir, name), 'b') - writeFile(path.join(parserHome, name), t, 'b') diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/AjdtCommand.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/AjdtCommand.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/AjdtCommand.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/AjdtCommand.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/BuildArgParser.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/BuildArgParser.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/ConfigParser.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/ConfigParser.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/ConfigParser.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/ConfigParser.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/compiler/IAjTerminalSymbols.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/compiler/IAjTerminalSymbols.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/compiler/IAjTerminalSymbols.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/compiler/IAjTerminalSymbols.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/AspectJCore.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/core/AspectJCore.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/AspectJCore.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/core/AspectJCore.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/dom/AjASTConverterFactory.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/core/dom/AjASTConverterFactory.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/dom/AjASTConverterFactory.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/core/dom/AjASTConverterFactory.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/dom/AjASTFactory.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/core/dom/AjASTFactory.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/dom/AjASTFactory.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/core/dom/AjASTFactory.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/dom/AjTypeDeclFactory.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/core/dom/AjTypeDeclFactory.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/dom/AjTypeDeclFactory.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/core/dom/AjTypeDeclFactory.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AbstractCompilerAdapter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AbstractCompilerAdapter.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AbstractCompilerAdapter.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AbstractCompilerAdapter.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjClassFile.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjClassFile.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjClassFile.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjClassFile.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompiler.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjCompiler.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompiler.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjCompiler.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ClassFileBasedByteCodeProvider.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ClassFileBasedByteCodeProvider.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ClassFileBasedByteCodeProvider.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ClassFileBasedByteCodeProvider.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/CommonPrinter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/CommonPrinter.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/CommonPrinter.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/CommonPrinter.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/CompilationResultDestinationManager.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/CompilationResultDestinationManager.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/CompilationResultDestinationManager.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/CompilationResultDestinationManager.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/DeclareAnnotationsPrinter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/DeclareAnnotationsPrinter.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/DeclareAnnotationsPrinter.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/DeclareAnnotationsPrinter.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/IBinarySourceProvider.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/IBinarySourceProvider.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/IBinarySourceProvider.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/IBinarySourceProvider.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/IIntermediateResultsRequestor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/IIntermediateResultsRequestor.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/IIntermediateResultsRequestor.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/IIntermediateResultsRequestor.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/IOutputClassFileNameProvider.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/IOutputClassFileNameProvider.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/IOutputClassFileNameProvider.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/IOutputClassFileNameProvider.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ITDConstructorPrinter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ITDConstructorPrinter.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ITDConstructorPrinter.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ITDConstructorPrinter.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ITDFieldPrinter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ITDFieldPrinter.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ITDFieldPrinter.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ITDFieldPrinter.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ITDMethodPrinter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ITDMethodPrinter.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ITDMethodPrinter.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ITDMethodPrinter.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/InterimCompilationResult.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/InterimCompilationResult.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/InterimCompilationResult.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/InterimCompilationResult.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverAdapter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/WeaverAdapter.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverAdapter.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/WeaverAdapter.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AccessForInlineVisitor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AccessForInlineVisitor.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AccessForInlineVisitor.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AccessForInlineVisitor.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AddAtAspectJAnnotationsVisitor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AddAtAspectJAnnotationsVisitor.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AddAtAspectJAnnotationsVisitor.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AddAtAspectJAnnotationsVisitor.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjConstructorDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AjConstructorDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjConstructorDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AjConstructorDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjMethodDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AjMethodDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjMethodDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AjMethodDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectClinit.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AspectClinit.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectClinit.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AspectClinit.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AtAspectJAnnotationFactory.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AtAspectJAnnotationFactory.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AtAspectJAnnotationFactory.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AtAspectJAnnotationFactory.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/DeclareAnnotationDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/DeclareAnnotationDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/DeclareAnnotationDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/DeclareAnnotationDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/DeclareDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/DeclareDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/DeclareDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/DeclareDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/EclipseAttributeAdapter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/EclipseAttributeAdapter.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/EclipseAttributeAdapter.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/EclipseAttributeAdapter.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/EclipseConstantPoolWriter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/EclipseConstantPoolWriter.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/EclipseConstantPoolWriter.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/EclipseConstantPoolWriter.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfMethodDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/IfMethodDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfMethodDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/IfMethodDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterSuperFixerVisitor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterSuperFixerVisitor.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterSuperFixerVisitor.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterSuperFixerVisitor.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterSuperReference.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterSuperReference.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterSuperReference.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterSuperReference.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterTypeDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterTypeDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IntertypeMemberClassDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/IntertypeMemberClassDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IntertypeMemberClassDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/IntertypeMemberClassDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownFieldReference.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/KnownFieldReference.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownFieldReference.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/KnownFieldReference.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownMessageSend.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/KnownMessageSend.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownMessageSend.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/KnownMessageSend.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/MakeDeclsPublicVisitor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/MakeDeclsPublicVisitor.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/MakeDeclsPublicVisitor.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/MakeDeclsPublicVisitor.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/Proceed.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/Proceed.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/Proceed.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/Proceed.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PseudoToken.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PseudoToken.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PseudoToken.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PseudoToken.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PseudoTokens.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PseudoTokens.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PseudoTokens.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PseudoTokens.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/SuperFixerVisitor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/SuperFixerVisitor.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/SuperFixerVisitor.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/SuperFixerVisitor.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ValidateAtAspectJAnnotationsVisitor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ValidateAtAspectJAnnotationsVisitor.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ValidateAtAspectJAnnotationsVisitor.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ValidateAtAspectJAnnotationsVisitor.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjTypeConstants.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/AjTypeConstants.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjTypeConstants.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/AjTypeConstants.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseAnnotationConvertor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseAnnotationConvertor.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseAnnotationConvertor.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseAnnotationConvertor.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseResolvedMember.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseResolvedMember.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseResolvedMember.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseResolvedMember.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseShadow.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseShadow.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseShadow.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseShadow.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceLocation.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceLocation.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceLocation.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceLocation.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseTypeMunger.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseTypeMunger.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseTypeMunger.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseTypeMunger.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/HelperInterfaceBinding.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/HelperInterfaceBinding.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/HelperInterfaceBinding.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/HelperInterfaceBinding.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InlineAccessFieldBinding.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InlineAccessFieldBinding.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InlineAccessFieldBinding.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InlineAccessFieldBinding.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeFieldBinding.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InterTypeFieldBinding.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeFieldBinding.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InterTypeFieldBinding.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMethodBinding.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMethodBinding.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMethodBinding.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMethodBinding.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeScope.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InterTypeScope.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeScope.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InterTypeScope.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/IntertypeMemberTypeFinder.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/IntertypeMemberTypeFinder.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/IntertypeMemberTypeFinder.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/IntertypeMemberTypeFinder.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PointcutBinding.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PointcutBinding.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PointcutBinding.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PointcutBinding.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedFieldBinding.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedFieldBinding.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedFieldBinding.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedFieldBinding.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedHandler.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedHandler.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedHandler.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedHandler.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PushinCollector.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PushinCollector.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PushinCollector.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PushinCollector.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/SimpleSyntheticAccessMethodBinding.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/SimpleSyntheticAccessMethodBinding.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/SimpleSyntheticAccessMethodBinding.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/SimpleSyntheticAccessMethodBinding.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/DeclarationFactory.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/parser/DeclarationFactory.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/DeclarationFactory.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/parser/DeclarationFactory.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AbstractStateListener.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AbstractStateListener.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AbstractStateListener.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AbstractStateListener.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBatchImageBuilder.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBatchImageBuilder.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBatchImageBuilder.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBatchImageBuilder.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildNotifier.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildNotifier.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildNotifier.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildNotifier.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjIncrementalImageBuilder.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjIncrementalImageBuilder.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjIncrementalImageBuilder.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjIncrementalImageBuilder.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjState.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjState.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/CompactTypeStructureRepresentation.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/CompactTypeStructureRepresentation.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/CompactTypeStructureRepresentation.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/CompactTypeStructureRepresentation.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/CompilerConfigurationChangeFlags.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/CompilerConfigurationChangeFlags.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/CompilerConfigurationChangeFlags.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/CompilerConfigurationChangeFlags.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseAdapterUtils.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EclipseAdapterUtils.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseAdapterUtils.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EclipseAdapterUtils.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseClassPathManager.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EclipseClassPathManager.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseClassPathManager.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EclipseClassPathManager.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseSourceContext.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EclipseSourceContext.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseSourceContext.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EclipseSourceContext.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/IStateListener.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/IStateListener.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/IStateListener.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/IStateListener.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/IncrementalStateManager.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/IncrementalStateManager.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/IncrementalStateManager.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/IncrementalStateManager.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/StatefulNameEnvironment.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/StatefulNameEnvironment.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/StatefulNameEnvironment.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/StatefulNameEnvironment.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AbstractBooleanTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AbstractBooleanTypePattern.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AbstractBooleanTypePattern.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AbstractBooleanTypePattern.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AdviceDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AdviceDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AdviceDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AdviceDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AfterAdviceDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AfterAdviceDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AfterAdviceDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AfterAdviceDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AfterReturningAdviceDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AfterReturningAdviceDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AfterReturningAdviceDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AfterReturningAdviceDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AfterThrowingAdviceDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AfterThrowingAdviceDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AfterThrowingAdviceDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AfterThrowingAdviceDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjAST.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjAST.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjAST.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjAST.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjASTMatcher.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTMatcher.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjASTMatcher.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTMatcher.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjASTVisitor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTVisitor.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjASTVisitor.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTVisitor.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjNaiveASTFlattener.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjNaiveASTFlattener.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjNaiveASTFlattener.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjNaiveASTFlattener.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjTypeDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjTypeDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjTypeDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjTypeDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AndPointcut.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AndPointcut.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AndPointcut.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AndPointcut.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AndTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AndTypePattern.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AndTypePattern.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AndTypePattern.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AnyTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AnyTypePattern.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AnyTypePattern.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AnyTypePattern.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AnyWithAnnotationTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AnyWithAnnotationTypePattern.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AnyWithAnnotationTypePattern.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AnyWithAnnotationTypePattern.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AroundAdviceDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AroundAdviceDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AroundAdviceDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AroundAdviceDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AspectDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AspectDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AspectDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AspectDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/BeforeAdviceDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/BeforeAdviceDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/BeforeAdviceDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/BeforeAdviceDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/BindingTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/BindingTypePattern.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/BindingTypePattern.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/BindingTypePattern.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/CflowPointcut.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/CflowPointcut.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/CflowPointcut.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/CflowPointcut.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAnnotationDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAnnotationDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAnnotationDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAnnotationDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtConstructorDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtConstructorDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtConstructorDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtConstructorDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtFieldDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtFieldDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtFieldDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtFieldDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtMethodDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtMethodDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtMethodDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtMethodDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtTypeDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtTypeDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtTypeDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtTypeDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareErrorDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareErrorDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareErrorDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareErrorDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareParentsDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareParentsDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareParentsDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareParentsDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclarePrecedenceDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclarePrecedenceDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclarePrecedenceDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclarePrecedenceDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareSoftDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareSoftDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareSoftDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareSoftDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareWarningDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareWarningDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareWarningDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareWarningDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DefaultPointcut.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DefaultPointcut.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DefaultPointcut.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DefaultPointcut.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DefaultTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DefaultTypePattern.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DefaultTypePattern.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DefaultTypePattern.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/EllipsisTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/EllipsisTypePattern.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/EllipsisTypePattern.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/EllipsisTypePattern.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/ExactTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/ExactTypePattern.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/ExactTypePattern.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/ExactTypePattern.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/FormalBinding.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/FormalBinding.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/FormalBinding.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/FormalBinding.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/HasMemberTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/HasMemberTypePattern.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/HasMemberTypePattern.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/HasMemberTypePattern.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/IdentifierTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/IdentifierTypePattern.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/IdentifierTypePattern.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/IdentifierTypePattern.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/InterTypeFieldDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/InterTypeFieldDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/InterTypeFieldDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/InterTypeFieldDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/InterTypeMethodDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/InterTypeMethodDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/InterTypeMethodDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/InterTypeMethodDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/NoTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/NoTypePattern.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/NoTypePattern.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/NoTypePattern.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/NotPointcut.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/NotPointcut.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/NotPointcut.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/NotPointcut.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/NotTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/NotTypePattern.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/NotTypePattern.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/NotTypePattern.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/OrPointcut.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/OrPointcut.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/OrPointcut.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/OrPointcut.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/OrTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/OrTypePattern.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/OrTypePattern.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/OrTypePattern.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PatternNode.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PatternNode.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PatternNode.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PatternNode.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PerCflow.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PerCflow.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PerCflow.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PerCflow.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PerObject.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PerObject.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PerObject.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PerObject.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PerTypeWithin.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PerTypeWithin.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PerTypeWithin.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PerTypeWithin.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PointcutDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PointcutDeclaration.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PointcutDeclaration.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PointcutDeclaration.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PointcutDesignator.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PointcutDesignator.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PointcutDesignator.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PointcutDesignator.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/ReferencePointcut.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/ReferencePointcut.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/ReferencePointcut.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/ReferencePointcut.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/SignaturePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/SignaturePattern.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/SignaturePattern.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/SignaturePattern.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/TypeCategoryTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/TypeCategoryTypePattern.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/TypeCategoryTypePattern.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/TypeCategoryTypePattern.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/TypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/TypePattern.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/TypePattern.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/TypePattern.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/WildTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/WildTypePattern.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/WildTypePattern.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/WildTypePattern.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/tools/ajc/Main.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/tools/ajc/Main.java similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/tools/ajc/Main.java rename to org.aspectj.ajdt.core/src/main/java/org/aspectj/tools/ajc/Main.java diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties rename to org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/readableNames.properties b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/internal/compiler/parser/readableNames.properties similarity index 100% rename from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/readableNames.properties rename to org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/internal/compiler/parser/readableNames.properties diff --git a/org.aspectj.ajdt.core/testsrc/AroundAMain.java b/org.aspectj.ajdt.core/src/test/java/AroundAMain.java similarity index 95% rename from org.aspectj.ajdt.core/testsrc/AroundAMain.java rename to org.aspectj.ajdt.core/src/test/java/AroundAMain.java index 0b304bf6a..94f2be84f 100644 --- a/org.aspectj.ajdt.core/testsrc/AroundAMain.java +++ b/org.aspectj.ajdt.core/src/test/java/AroundAMain.java @@ -15,10 +15,10 @@ import junit.framework.TestCase; import org.aspectj.runtime.internal.AroundClosure; import org.aspectj.util.Reflection; -public class AroundAMain extends TestCase { +public class AroundAMain {//extends TestCase { public AroundAMain(String name) { - super(name); +// super(name); } diff --git a/org.aspectj.ajdt.core/src/test/java/Eajc515ModuleTests.java b/org.aspectj.ajdt.core/src/test/java/Eajc515ModuleTests.java new file mode 100644 index 000000000..094ab29c2 --- /dev/null +++ b/org.aspectj.ajdt.core/src/test/java/Eajc515ModuleTests.java @@ -0,0 +1,24 @@ +///******************************************************************************* +// * Copyright (c) 2006 IBM Corporation and others. +// * All rights reserved. This program and the accompanying materials +// * are made available under the terms of the Eclipse Public License v1.0 +// * which accompanies this distribution, and is available at +// * http://www.eclipse.org/legal/epl-v10.html +// * +// * Contributors: +// * Matthew Webster - initial implementation +// *******************************************************************************/ +//import junit.framework.*; +//import junit.framework.Test; +// +//public class Eajc515ModuleTests extends TestCase { +// +// public static Test suite() { +// TestSuite suite = new TestSuite(Eajc515ModuleTests.class.getName()); +// suite.addTest(org.aspectj.tools.ajc.Ajc5Tests.suite()); +// return suite; +// } +// +// public Eajc515ModuleTests(String name) { super(name); } +// +//} diff --git a/org.aspectj.ajdt.core/testsrc/RunWeaveTests.java b/org.aspectj.ajdt.core/src/test/java/RunWeaveTests.java similarity index 84% rename from org.aspectj.ajdt.core/testsrc/RunWeaveTests.java rename to org.aspectj.ajdt.core/src/test/java/RunWeaveTests.java index 3b483a3b2..e54ab44e2 100644 --- a/org.aspectj.ajdt.core/testsrc/RunWeaveTests.java +++ b/org.aspectj.ajdt.core/src/test/java/RunWeaveTests.java @@ -45,76 +45,76 @@ public class RunWeaveTests { // Purely as a warm-up... System.out.println("Warming up..."); - WeaveTests.main(split(WARMUP_ARGS + "-i " + ITERATIONS)); + WeaveTest.main(split(WARMUP_ARGS + "-i " + ITERATIONS)); if (RUN_SMALL) { - WeaveTests.main( + WeaveTest.main( split(SMALL_PROGRAM_ARGS + "-echo -i " + ITERATIONS)); for (int i = 0; i < ITERATIONS; i++) - times[0][i] = WeaveTests.compileTimes[i]; + times[0][i] = WeaveTest.compileTimes[i]; for (int i = 0; i < ITERATIONS; i++) - times[1][i] = WeaveTests.executionFastTimes[i]; + times[1][i] = WeaveTest.executionFastTimes[i]; for (int i = 0; i < ITERATIONS; i++) - times[2][i] = WeaveTests.executionMedTimes[i]; + times[2][i] = WeaveTest.executionMedTimes[i]; for (int i = 0; i < ITERATIONS; i++) - times[3][i] = WeaveTests.executionSlowTimes[i]; + times[3][i] = WeaveTest.executionSlowTimes[i]; for (int i = 0; i < ITERATIONS; i++) - times[4][i] = WeaveTests.getFastTimes[i]; + times[4][i] = WeaveTest.getFastTimes[i]; for (int i = 0; i < ITERATIONS; i++) - times[5][i] = WeaveTests.getMedTimes[i]; + times[5][i] = WeaveTest.getMedTimes[i]; for (int i = 0; i < ITERATIONS; i++) - times[6][i] = WeaveTests.getSlowTimes[i]; + times[6][i] = WeaveTest.getSlowTimes[i]; } if (RUN_MED) { - WeaveTests.main( + WeaveTest.main( split(MEDIUM_PROGRAM_ARGS + "-echo -i " + ITERATIONS)); for (int i = ITERATIONS; i < (2 * ITERATIONS); i++) - times[0][i] = WeaveTests.compileTimes[i - ITERATIONS]; + times[0][i] = WeaveTest.compileTimes[i - ITERATIONS]; for (int i = ITERATIONS; i < (2 * ITERATIONS); i++) - times[1][i] = WeaveTests.executionFastTimes[i - ITERATIONS]; + times[1][i] = WeaveTest.executionFastTimes[i - ITERATIONS]; for (int i = ITERATIONS; i < (2 * ITERATIONS); i++) - times[2][i] = WeaveTests.executionMedTimes[i - ITERATIONS]; + times[2][i] = WeaveTest.executionMedTimes[i - ITERATIONS]; for (int i = ITERATIONS; i < (2 * ITERATIONS); i++) - times[3][i] = WeaveTests.executionSlowTimes[i - ITERATIONS]; + times[3][i] = WeaveTest.executionSlowTimes[i - ITERATIONS]; for (int i = ITERATIONS; i < (2 * ITERATIONS); i++) - times[4][i] = WeaveTests.getFastTimes[i - ITERATIONS]; + times[4][i] = WeaveTest.getFastTimes[i - ITERATIONS]; for (int i = ITERATIONS; i < (2 * ITERATIONS); i++) - times[5][i] = WeaveTests.getMedTimes[i - ITERATIONS]; + times[5][i] = WeaveTest.getMedTimes[i - ITERATIONS]; for (int i = ITERATIONS; i < (2 * ITERATIONS); i++) - times[6][i] = WeaveTests.getSlowTimes[i - ITERATIONS]; + times[6][i] = WeaveTest.getSlowTimes[i - ITERATIONS]; } if (RUN_LARGE) { - WeaveTests.main( + WeaveTest.main( split(LARGE_PROGRAM_ARGS + "-echo -i " + ITERATIONS)); for (int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++) - times[0][i] = WeaveTests.compileTimes[i - (2 * ITERATIONS)]; + times[0][i] = WeaveTest.compileTimes[i - (2 * ITERATIONS)]; for (int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++) times[1][i] = - WeaveTests.executionFastTimes[i - (2 * ITERATIONS)]; + WeaveTest.executionFastTimes[i - (2 * ITERATIONS)]; for (int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++) times[2][i] = - WeaveTests.executionMedTimes[i - (2 * ITERATIONS)]; + WeaveTest.executionMedTimes[i - (2 * ITERATIONS)]; for (int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++) times[3][i] = - WeaveTests.executionSlowTimes[i - (2 * ITERATIONS)]; + WeaveTest.executionSlowTimes[i - (2 * ITERATIONS)]; for (int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++) - times[4][i] = WeaveTests.getFastTimes[i - (2 * ITERATIONS)]; + times[4][i] = WeaveTest.getFastTimes[i - (2 * ITERATIONS)]; for (int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++) - times[5][i] = WeaveTests.getMedTimes[i - (2 * ITERATIONS)]; + times[5][i] = WeaveTest.getMedTimes[i - (2 * ITERATIONS)]; for (int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++) - times[6][i] = WeaveTests.getSlowTimes[i - (2 * ITERATIONS)]; + times[6][i] = WeaveTest.getSlowTimes[i - (2 * ITERATIONS)]; } @@ -186,37 +186,37 @@ public class RunWeaveTests { csv.append(NL); - csv.append(WeaveTests.EXECUTION_FAST); + csv.append(WeaveTest.EXECUTION_FAST); if(RUN_SMALL) for(int i = 0; i < ITERATIONS; i++) csv.append("," + times[1][i]); if(RUN_MED) for(int i = ITERATIONS; i < (2 * ITERATIONS); i++) csv.append("," + times[1][i]); if(RUN_LARGE) for(int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++) csv.append("," + times[1][i]); csv.append(NL); - csv.append(WeaveTests.EXECUTION_MED); + csv.append(WeaveTest.EXECUTION_MED); if(RUN_SMALL) for(int i = 0; i < ITERATIONS; i++) csv.append("," + times[2][i]); if(RUN_MED) for(int i = ITERATIONS; i < (2 * ITERATIONS); i++) csv.append("," + times[2][i]); if(RUN_LARGE) for(int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++) csv.append("," + times[2][i]); csv.append(NL); - csv.append(WeaveTests.EXECUTION_SLOW); + csv.append(WeaveTest.EXECUTION_SLOW); if(RUN_SMALL) for(int i = 0; i < ITERATIONS; i++) csv.append("," + times[3][i]); if(RUN_MED) for(int i = ITERATIONS; i < (2 * ITERATIONS); i++) csv.append("," + times[3][i]); if(RUN_LARGE) for(int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++) csv.append("," + times[3][i]); csv.append(NL); - csv.append(WeaveTests.GET_FAST); + csv.append(WeaveTest.GET_FAST); if(RUN_SMALL) for(int i = 0; i < ITERATIONS; i++) csv.append("," + times[4][i]); if(RUN_MED) for(int i = ITERATIONS; i < (2 * ITERATIONS); i++) csv.append("," + times[4][i]); if(RUN_LARGE) for(int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++) csv.append("," + times[4][i]); csv.append(NL); - csv.append(WeaveTests.GET_MED); + csv.append(WeaveTest.GET_MED); if(RUN_SMALL) for(int i = 0; i < ITERATIONS; i++) csv.append("," + times[5][i]); if(RUN_MED) for(int i = ITERATIONS; i < (2 * ITERATIONS); i++) csv.append("," + times[5][i]); if(RUN_LARGE) for(int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++) csv.append("," + times[5][i]); csv.append(NL); - csv.append(WeaveTests.GET_SLOW); + csv.append(WeaveTest.GET_SLOW); if(RUN_SMALL) for(int i = 0; i < ITERATIONS; i++) csv.append("," + times[6][i]); if(RUN_MED) for(int i = ITERATIONS; i < (2 * ITERATIONS); i++) csv.append("," + times[6][i]); if(RUN_LARGE) for(int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++) csv.append("," + times[6][i]); diff --git a/org.aspectj.ajdt.core/testsrc/WeaveTests.java b/org.aspectj.ajdt.core/src/test/java/WeaveTest.java similarity index 99% rename from org.aspectj.ajdt.core/testsrc/WeaveTests.java rename to org.aspectj.ajdt.core/src/test/java/WeaveTest.java index be3f328e1..1b858bb05 100644 --- a/org.aspectj.ajdt.core/testsrc/WeaveTests.java +++ b/org.aspectj.ajdt.core/src/test/java/WeaveTest.java @@ -19,7 +19,7 @@ import java.io.IOException; /** * @author Noel Markham */ -public class WeaveTests { +public class WeaveTest { private static final String OUTPUT_PACKAGE = "out"; diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/EajcModuleTests.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/EajcModuleTests.java new file mode 100644 index 000000000..370d1f33f --- /dev/null +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/EajcModuleTests.java @@ -0,0 +1,43 @@ +//package org.aspectj.ajdt; +///* ******************************************************************* +// * Copyright (c) 1999-2001 Xerox Corporation, +// * 2002 Palo Alto Research Center, Incorporated (PARC). +// * All rights reserved. +// * This program and the accompanying materials are made available +// * under the terms of the Eclipse Public License v1.0 +// * which accompanies this distribution and is available at +// * http://www.eclipse.org/legal/epl-v10.html +// * +// * Contributors: +// * PARC initial implementation +// * ******************************************************************/ +// +// +//// default package +// +// +//import org.aspectj.testing.util.TestUtil; +// +//import junit.framework.*; +// +//public class EajcModuleTests extends TestCase { +// +// public static Test suite() { +// TestSuite suite = new TestSuite(EajcModuleTests.class.getName()); +// suite.addTest(org.aspectj.ajdt.ajc.AjdtAjcTests.suite()); +// suite.addTest(org.aspectj.ajdt.internal.compiler.batch.AjdtBatchTests.suite()); +// suite.addTest(org.aspectj.ajdt.internal.core.builder.AjdtBuilderTests.suite()); +// suite.addTest(org.aspectj.tools.ajc.AjcTests.suite()); +// +// /* FIXME maw move these Java 5 dependent tests to a separate project */ +// if (TestUtil.is15VMOrGreater()) { +// TestUtil.loadTestsReflectively(suite, "Eajc515ModuleTests", true); +// } else { +// suite.addTest(TestUtil.testNamed("Eajc515ModuleTests require 1.5")); +// } +// return suite; +// } +// +// public EajcModuleTests(String name) { super(name); } +// +//} diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/StreamPrintWriter.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/StreamPrintWriter.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/StreamPrintWriter.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/StreamPrintWriter.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/AjdtCommandTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/ajc/AjdtCommandTestCase.java similarity index 99% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/AjdtCommandTestCase.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/ajc/AjdtCommandTestCase.java index d42ed6355..9c504a300 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/AjdtCommandTestCase.java +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/ajc/AjdtCommandTestCase.java @@ -125,7 +125,7 @@ public class AjdtCommandTestCase extends TestCase { assertTrue("didn't specify source root", outputWriter.getContents().indexOf("specify a source root") != -1); outputWriter.flushBuffer(); - AjdtCommand.genBuildConfig(new String[] { "-incremental", "-sourceroots", AjdtAjcTests.TESTDATA_PATH + "/src1" }, counter); + AjdtCommand.genBuildConfig(new String[] { "-incremental", "-sourceroots", Constants.TESTDATA_PATH + "/src1" }, counter); assertTrue(outputWriter.getContents(), outputWriter.getContents().equals("")); diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java similarity index 93% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java index dc019010a..5bb86a18c 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java @@ -40,7 +40,7 @@ import junit.framework.TestCase; */ public class BuildArgParserTestCase extends TestCase { - private static final String TEST_DIR = AjdtAjcTests.TESTDATA_PATH + File.separator + "ajc" + File.separator; + private static final String TEST_DIR = Constants.TESTDATA_PATH + File.separator + "ajc" + File.separator; private MessageWriter messageWriter = new MessageWriter(new PrintWriter(System.out), false); public BuildArgParserTestCase(String name) { @@ -151,8 +151,8 @@ public class BuildArgParserTestCase extends TestCase { } public void testAspectpath() throws InvalidInputException { - final String SOURCE_JAR = AjdtAjcTests.TESTDATA_PATH + "/testclasses.jar"; - final String SOURCE_JARS = AjdtAjcTests.TESTDATA_PATH + "/testclasses.jar" + File.pathSeparator + final String SOURCE_JAR = Constants.TESTDATA_PATH + "/testclasses.jar"; + final String SOURCE_JARS = Constants.TESTDATA_PATH + "/testclasses.jar" + File.pathSeparator + "../weaver/testdata/tracing.jar" + File.pathSeparator + "../weaver/testdata/dummyAspect.jar"; AjBuildConfig config = genBuildConfig(new String[] { @@ -168,8 +168,8 @@ public class BuildArgParserTestCase extends TestCase { } public void testInJars() throws InvalidInputException { - final String SOURCE_JAR = AjdtAjcTests.TESTDATA_PATH + "/testclasses.jar"; - final String SOURCE_JARS = AjdtAjcTests.TESTDATA_PATH + "/testclasses.jar" + File.pathSeparator + final String SOURCE_JAR = Constants.TESTDATA_PATH + "/testclasses.jar"; + final String SOURCE_JARS = Constants.TESTDATA_PATH + "/testclasses.jar" + File.pathSeparator + "../weaver/testdata/tracing.jar" + File.pathSeparator + "../weaver/testdata/dummyAspect.jar"; AjBuildConfig config = genBuildConfig(new String[] { @@ -188,7 +188,7 @@ public class BuildArgParserTestCase extends TestCase { } public void testBadInJars() throws InvalidInputException { - final String SOURCE_JARS = AjdtAjcTests.TESTDATA_PATH + "/testclasses.jar" + File.pathSeparator + "b.far" + File.pathSeparator + "c.jar"; + final String SOURCE_JARS = Constants.TESTDATA_PATH + "/testclasses.jar" + File.pathSeparator + "b.far" + File.pathSeparator + "c.jar"; AjBuildConfig config = genBuildConfig(new String[] { "-injars", SOURCE_JARS }, messageWriter); @@ -201,9 +201,10 @@ public class BuildArgParserTestCase extends TestCase { assertTrue("Expected an error for the invalid path.",countingHandler.numMessages(IMessage.ERROR,false)==1); } + public void testMultipleSourceRoots() throws InvalidInputException, IOException { - final String SRCROOT_1 = AjdtAjcTests.TESTDATA_PATH + "/src1/p1"; - final String SRCROOT_2 = AjdtAjcTests.TESTDATA_PATH + "/ajc"; + final String SRCROOT_1 = Constants.TESTDATA_PATH + "/src1/p1"; + final String SRCROOT_2 = Constants.TESTDATA_PATH + "/ajc"; AjBuildConfig config = genBuildConfig(new String[] { "-sourceroots", SRCROOT_1 + File.pathSeparator + SRCROOT_2 }, messageWriter); @@ -240,7 +241,7 @@ public class BuildArgParserTestCase extends TestCase { } public void testSourceRootDir() throws InvalidInputException, IOException { - final String SRCROOT = AjdtAjcTests.TESTDATA_PATH + "/ajc"; + final String SRCROOT = Constants.TESTDATA_PATH + "/ajc"; AjBuildConfig config = genBuildConfig(new String[] { "-sourceroots", SRCROOT }, messageWriter); @@ -263,8 +264,8 @@ public class BuildArgParserTestCase extends TestCase { public void testBadSourceRootDir() throws InvalidInputException { AjBuildConfig config = genBuildConfig(new String[] { "-sourceroots", - AjdtAjcTests.TESTDATA_PATH + "/mumbleDoesNotExist" + File.pathSeparator - + AjdtAjcTests.TESTDATA_PATH + "/ajc" }, + Constants.TESTDATA_PATH + "/mumbleDoesNotExist" + File.pathSeparator + + Constants.TESTDATA_PATH + "/ajc" }, messageWriter); assertTrue(config.getSourceRoots().toString(), config.getSourceRoots().size() == 1); @@ -279,16 +280,16 @@ public class BuildArgParserTestCase extends TestCase { //??? we've decided not to make this an error public void testSourceRootDirWithFiles() throws InvalidInputException, IOException { - final String SRCROOT = AjdtAjcTests.TESTDATA_PATH + "/ajc/pkg"; + final String SRCROOT = Constants.TESTDATA_PATH + "/ajc/pkg"; AjBuildConfig config = genBuildConfig(new String[] { - "-sourceroots", SRCROOT, AjdtAjcTests.TESTDATA_PATH + "/src1/A.java"}, + "-sourceroots", SRCROOT, Constants.TESTDATA_PATH + "/src1/A.java"}, messageWriter); assertEquals(getCanonicalPath(new File(SRCROOT)), config.getSourceRoots().get(0).getAbsolutePath()); Collection expectedFiles = Arrays.asList(new File[] { new File(SRCROOT+File.separator+"Hello.java").getCanonicalFile(), - new File(AjdtAjcTests.TESTDATA_PATH +File.separator+"src1"+File.separator+"A.java").getCanonicalFile(), + new File(Constants.TESTDATA_PATH +File.separator+"src1"+File.separator+"A.java").getCanonicalFile(), }); TestUtil.assertSetEquals(expectedFiles, config.getFiles()); @@ -296,7 +297,7 @@ public class BuildArgParserTestCase extends TestCase { } public void testExtDirs() throws Exception { - final String DIR = AjdtAjcTests.TESTDATA_PATH; + final String DIR = Constants.TESTDATA_PATH; AjBuildConfig config = genBuildConfig(new String[] { "-extdirs", DIR }, messageWriter); @@ -320,7 +321,7 @@ public class BuildArgParserTestCase extends TestCase { } public void testOutputJar() throws InvalidInputException { - final String OUT_JAR = AjdtAjcTests.TESTDATA_PATH + "/testclasses.jar"; + final String OUT_JAR = Constants.TESTDATA_PATH + "/testclasses.jar"; AjBuildConfig config = genBuildConfig(new String[] { "-outjar", OUT_JAR }, @@ -333,7 +334,7 @@ public class BuildArgParserTestCase extends TestCase { assertEquals( getCanonicalPath(new File(OUT_JAR)),config.getOutputJar().getAbsolutePath()); - File nonExistingJar = new File(AjdtAjcTests.TESTDATA_PATH + "/mumbleDoesNotExist.jar"); + File nonExistingJar = new File(Constants.TESTDATA_PATH + "/mumbleDoesNotExist.jar"); config = genBuildConfig(new String[] { "-outjar", nonExistingJar.getAbsolutePath() }, messageWriter); @@ -426,7 +427,7 @@ public class BuildArgParserTestCase extends TestCase { } public void testXlintfile() throws InvalidInputException { - String lintFile = AjdtAjcTests.TESTDATA_PATH + "/lintspec.properties"; + String lintFile = Constants.TESTDATA_PATH + "/lintspec.properties"; // String badLintFile = "lint.props"; AjBuildConfig config = genBuildConfig(new String[] {"-Xlintfile", lintFile}, messageWriter); assertTrue(new File(lintFile).exists()); @@ -564,14 +565,14 @@ public class BuildArgParserTestCase extends TestCase { } public void testNonstandardOutputDirectorySetting() throws InvalidInputException { - String filePath = AjdtAjcTests.TESTDATA_PATH + File.separator + "ajc.jar" + File.separator; + String filePath = Constants.TESTDATA_PATH + File.separator + "ajc.jar" + File.separator; File testDir = new File(filePath); AjBuildConfig config = genBuildConfig(new String[] { "-d", filePath }, messageWriter); assertEquals(testDir.getAbsolutePath(), config.getOutputDir().getAbsolutePath()); } - private static final String NONSTANDARD_JAR_DIR = AjdtAjcTests.TESTDATA_PATH + "/OutjarTest/folder.jar/"; + private static final String NONSTANDARD_JAR_DIR = Constants.TESTDATA_PATH + "/OutjarTest/folder.jar/"; private AjBuildConfig setupNonstandardPath(String pathType) { String NONSTANDARD_PATH_ENTRY = NONSTANDARD_JAR_DIR+"aspectjJar.file" + File.pathSeparator + NONSTANDARD_JAR_DIR+"aspectJar.file" + File.pathSeparator + NONSTANDARD_JAR_DIR+"jarChild" + File.pathSeparator + NONSTANDARD_JAR_DIR+"parent.zip"; diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/ConsoleMessageHandlerTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/ajc/ConsoleMessageHandlerTestCase.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/ConsoleMessageHandlerTestCase.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/ajc/ConsoleMessageHandlerTestCase.java diff --git a/org.aspectj.ajdt.core/java5-testsrc/org/aspectj/tools/ajc/Ajc5Tests.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/ajc/Constants.java similarity index 50% rename from org.aspectj.ajdt.core/java5-testsrc/org/aspectj/tools/ajc/Ajc5Tests.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/ajc/Constants.java index 44bdc76eb..3093b84e1 100644 --- a/org.aspectj.ajdt.core/java5-testsrc/org/aspectj/tools/ajc/Ajc5Tests.java +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/ajc/Constants.java @@ -1,30 +1,28 @@ /* ******************************************************************* - * Copyright (c) 2005 Contributors. + * Copyright (c) 2019 Contributors * All rights reserved. * This program and the accompanying materials are made available * under the terms of the Eclipse Public License v1.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: - * Matthew Webster initial implementation + * http://www.eclipse.org/legal/epl-v10.html * ******************************************************************/ -package org.aspectj.tools.ajc; +package org.aspectj.ajdt.ajc; +import java.io.File; import org.aspectj.testing.util.TestUtil; +import junit.framework.*; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +/** + * @author Andy Clement + */ +public class Constants { -public class Ajc5Tests extends TestCase { + public static final String TESTDATA_PATH = "../org.aspectj.ajdt.core/testdata"; + + public static final File TESTDATA_DIR = new File(TESTDATA_PATH); + public static String aspectjrtClasspath() { return TestUtil.aspectjrtPath().getPath(); } - public static Test suite() { - TestSuite suite = new TestSuite(Ajc5Tests.class.getName()); - suite.addTestSuite(AjAST5Test.class); - return suite; - } - -} + +} diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/AjdtBatchTests.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/AjdtBatchTests.java new file mode 100644 index 000000000..7b1ee7163 --- /dev/null +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/AjdtBatchTests.java @@ -0,0 +1,45 @@ +///* ******************************************************************* +// * Copyright (c) 1999-2001 Xerox Corporation, +// * 2002 Palo Alto Research Center, Incorporated (PARC). +// * All rights reserved. +// * This program and the accompanying materials are made available +// * under the terms of the Eclipse Public License v1.0 +// * which accompanies this distribution and is available at +// * http://www.eclipse.org/legal/epl-v10.html +// * +// * Contributors: +// * PARC initial implementation +// * ******************************************************************/ +// +// +//package org.aspectj.ajdt.internal.compiler.batch; +// +//import junit.framework.*; +// +//public class AjdtBatchTests extends TestCase { +// +// public static Test suite() { +// TestSuite suite = new TestSuite(AjdtBatchTests.class.getName()); +// // Abstract superclass +// //suite.addTestSuite(CommandTestCase.class); +// //$JUnit-BEGIN$ +// suite.addTestSuite(BasicCommandTestCase.class); +// suite.addTestSuite(BinaryFormsTestCase.class); +// suite.addTestSuite(CompileAndRunTestCase.class); +// suite.addTestSuite(PerformanceTestCase.class); +// suite.addTestSuite(ImageTestCase.class); +// suite.addTestSuite(MultipleCompileTestCase.class); +// suite.addTestSuite(JavadocTest.class); +// suite.addTestSuite(PartiallyExposedHierarchyTestCase.class); +// suite.addTestSuite(CompilerDumpTestCase.class); +// suite.addTestSuite(ProceedOnErrorTestCase.class); +// suite.addTestSuite(DeclareParentsTest.class); +// // XXX suite.addTestSuite(VerifyWeaveTestCase.class); +// //suite.addTestSuite(WorkingCommandTestCase.class); +// //$JUnit-END$ +// return suite; +// } +// +// public AjdtBatchTests(String name) { super(name); } +// +//} diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BasicCommandTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/BasicCommandTestCase.java similarity index 88% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BasicCommandTestCase.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/BasicCommandTestCase.java index 62b1ef67e..99ea9b1d9 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BasicCommandTestCase.java +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/BasicCommandTestCase.java @@ -105,7 +105,7 @@ public class BasicCommandTestCase extends CommandTestCase { classpath.append(File.pathSeparator).append("../lib/junit/junit.jar;../testing-client/bin"); args.add(classpath.toString()); args.add("-Xlint:error"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/Xlint.java"); + args.add(Constants.TESTDATA_PATH + "/src1/Xlint.java"); runCompiler(args, new int[] {2}); } @@ -117,7 +117,7 @@ public class BasicCommandTestCase extends CommandTestCase { args.add("-classpath"); args.add(getRuntimeClasspath() + File.pathSeparator + "../lib/junit/junit.jar;../testing-client/bin;not_found_anywhere.jar"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/ThisAndModifiers.java"); + args.add(Constants.TESTDATA_PATH + "/src1/ThisAndModifiers.java"); ICommand command = new AjdtCommand(); MessageHandler myHandler = new MessageHandler(); @@ -137,7 +137,7 @@ public class BasicCommandTestCase extends CommandTestCase { args.add("-classpath"); args.add("../lib/junit/junit.jar;../testing-client/bin"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/ThisAndModifiers.java"); + args.add(Constants.TESTDATA_PATH + "/src1/ThisAndModifiers.java"); ICommand command = new AjdtCommand(); MessageHandler myHandler = new MessageHandler(); @@ -154,16 +154,16 @@ public class BasicCommandTestCase extends CommandTestCase { args.add(getRuntimeClasspath() + File.pathSeparator + "../lib/junit/junit.jar;../testing-client/bin"); - File f1 = new File(AjdtAjcTests.TESTDATA_PATH + "/src1/p1/Foo.class"); - File f2 = new File(AjdtAjcTests.TESTDATA_PATH + "/src1/WrongPackage.class"); - File f3 = new File(AjdtAjcTests.TESTDATA_PATH + "/src1/WrongPackage$1.class"); + File f1 = new File(Constants.TESTDATA_PATH + "/src1/p1/Foo.class"); + File f2 = new File(Constants.TESTDATA_PATH + "/src1/WrongPackage.class"); + File f3 = new File(Constants.TESTDATA_PATH + "/src1/WrongPackage$1.class"); if (f1.exists()) f1.delete(); if (f2.exists()) f2.delete(); if (f3.exists()) f3.delete(); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/p1/Foo.java"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/WrongPackage.java"); + args.add(Constants.TESTDATA_PATH + "/src1/p1/Foo.java"); + args.add(Constants.TESTDATA_PATH + "/src1/WrongPackage.java"); runCompiler(args, NO_ERRORS); @@ -190,8 +190,8 @@ public class BasicCommandTestCase extends CommandTestCase { args.add(getRuntimeClasspath() + File.pathSeparator + "../lib/junit/junit.jar;../testing-client/bin"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/SizeIssuesAspect.java"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/SizeIssues.java"); + args.add(Constants.TESTDATA_PATH + "/src1/SizeIssuesAspect.java"); + args.add(Constants.TESTDATA_PATH + "/src1/SizeIssues.java"); runCompiler(args, NO_ERRORS); long size = f1.length(); diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java similarity index 85% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java index 361e74904..983ff62d5 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java @@ -17,8 +17,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.aspectj.ajdt.ajc.AjdtAjcTests; -import org.aspectj.tools.ajc.AjcTests; +import org.aspectj.ajdt.ajc.Constants; +import org.aspectj.testing.util.TestUtil; public class BcweaverJarMaker { @@ -55,24 +55,25 @@ public class BcweaverJarMaker { args.add("../weaver/testdata/tracing.jar"); args.add("-classpath"); - args.add(AjcTests.aspectjrtClasspath()); + args.add(Constants.aspectjrtClasspath()); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/Trace.java"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/MyTrace.java"); + args.add(Constants.TESTDATA_PATH + "/src1/Trace.java"); + args.add(Constants.TESTDATA_PATH + "/src1/MyTrace.java"); CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); } + public static void makeJar1() throws IOException { List args = new ArrayList<>(); args.add("-outjar"); args.add("../weaver/testdata/megatrace.jar"); args.add("-classpath"); - args.add(AjcTests.aspectjrtClasspath()); + args.add(Constants.aspectjrtClasspath()); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/MegaTrace.java"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/ExecTrace.java"); + args.add(Constants.TESTDATA_PATH + "/src1/trace/MegaTrace.java"); + args.add(Constants.TESTDATA_PATH + "/src1/trace/ExecTrace.java"); CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); } @@ -84,10 +85,10 @@ public class BcweaverJarMaker { args.add("../weaver/testdata/megatrace0easy.jar"); args.add("-classpath"); - args.add(AjcTests.aspectjrtClasspath()); + args.add(Constants.aspectjrtClasspath()); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/MegaTrace.java"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/ObviousTraceNothing.java"); + args.add(Constants.TESTDATA_PATH + "/src1/trace/MegaTrace.java"); + args.add(Constants.TESTDATA_PATH + "/src1/trace/ObviousTraceNothing.java"); CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); } @@ -98,10 +99,10 @@ public class BcweaverJarMaker { args.add("../weaver/testdata/megatrace0hard.jar"); args.add("-classpath"); - args.add(AjcTests.aspectjrtClasspath()); + args.add(Constants.aspectjrtClasspath()); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/MegaTrace.java"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/HardTraceNothing.java"); + args.add(Constants.TESTDATA_PATH + "/src1/trace/MegaTrace.java"); + args.add(Constants.TESTDATA_PATH + "/src1/trace/HardTraceNothing.java"); CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); } @@ -115,10 +116,10 @@ public class BcweaverJarMaker { args.add("-XterminateAfterCompilation"); args.add("-classpath"); - args.add(AjcTests.aspectjrtClasspath()); + args.add(Constants.aspectjrtClasspath()); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/MegaTrace.java"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/ExecTrace.java"); + args.add(Constants.TESTDATA_PATH + "/src1/trace/MegaTrace.java"); + args.add(Constants.TESTDATA_PATH + "/src1/trace/ExecTrace.java"); CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); } @@ -130,9 +131,9 @@ public class BcweaverJarMaker { args.add("../weaver/testdata/dummyAspect.jar"); args.add("-classpath"); - args.add(AjcTests.aspectjrtClasspath()); + args.add(Constants.aspectjrtClasspath()); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/DummyAspect.java"); + args.add(Constants.TESTDATA_PATH + "/src1/DummyAspect.java"); CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); } @@ -207,8 +208,8 @@ public class BcweaverJarMaker { File.pathSeparator + System.getProperty("aspectjrt.path")); args.add("-outjar"); args.add("../weaver/testdata/ltw-classes.jar"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/LTWHelloWorld.java"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/ltw/LTWPackageTest.java"); + args.add(Constants.TESTDATA_PATH + "/src1/LTWHelloWorld.java"); + args.add(Constants.TESTDATA_PATH + "/src1/ltw/LTWPackageTest.java"); CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); /* @@ -221,8 +222,8 @@ public class BcweaverJarMaker { args.add("-XnotReweavable"); args.add("-outjar"); args.add("../weaver/testdata/ltw-woven.jar"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/LTWHelloWorld.java"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/LTWAspect.aj"); + args.add(Constants.TESTDATA_PATH + "/src1/LTWHelloWorld.java"); + args.add(Constants.TESTDATA_PATH + "/src1/LTWAspect.aj"); CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); /* @@ -234,7 +235,7 @@ public class BcweaverJarMaker { File.pathSeparator + System.getProperty("aspectjrt.path")); args.add("-outjar"); args.add("../weaver/testdata/ltw-aspects.jar"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/LTWAspect.aj"); + args.add(Constants.TESTDATA_PATH + "/src1/LTWAspect.aj"); CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); /* @@ -246,7 +247,7 @@ public class BcweaverJarMaker { File.pathSeparator + System.getProperty("aspectjrt.path")); args.add("-outjar"); args.add("../weaver/testdata/ltw-dwaspects.jar"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/LTWDeclareWarning.aj"); + args.add(Constants.TESTDATA_PATH + "/src1/LTWDeclareWarning.aj"); CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); /* @@ -258,7 +259,7 @@ public class BcweaverJarMaker { File.pathSeparator + System.getProperty("aspectjrt.path")); args.add("-outjar"); args.add("../weaver/testdata/ltw-deaspects.jar"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/LTWDeclareError.aj"); + args.add(Constants.TESTDATA_PATH + "/src1/LTWDeclareError.aj"); CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); /* @@ -270,7 +271,7 @@ public class BcweaverJarMaker { File.pathSeparator + System.getProperty("aspectjrt.path")); args.add("-outjar"); args.add("../weaver/testdata/ltw-acaspects.jar"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/LTWAroundClosure.aj"); + args.add(Constants.TESTDATA_PATH + "/src1/LTWAroundClosure.aj"); CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); /* @@ -283,9 +284,9 @@ public class BcweaverJarMaker { File.pathSeparator + System.getProperty("aspectjrt.path")); args.add("-outjar"); args.add("../weaver/testdata/ltw-itdaspects.jar"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/LTWInterfaceITD.aj"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/LTWFieldITD.aj"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/LTWMethodITD.aj"); + args.add(Constants.TESTDATA_PATH + "/src1/LTWInterfaceITD.aj"); + args.add(Constants.TESTDATA_PATH + "/src1/LTWFieldITD.aj"); + args.add(Constants.TESTDATA_PATH + "/src1/LTWMethodITD.aj"); CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); /* @@ -297,7 +298,7 @@ public class BcweaverJarMaker { File.pathSeparator + System.getProperty("aspectjrt.path")); args.add("-outjar"); args.add("../weaver/testdata/ltw-peraspects.jar"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/LTWPerthis.aj"); + args.add(Constants.TESTDATA_PATH + "/src1/LTWPerthis.aj"); CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); } @@ -343,7 +344,7 @@ public class BcweaverJarMaker { File.pathSeparator + System.getProperty("aspectjrt.path")); args.add("-outjar"); args.add("../ajde/testdata/DuplicateManifestTest/injar.jar"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/Hello.java"); + args.add(Constants.TESTDATA_PATH + "/src1/Hello.java"); CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); /* @@ -355,8 +356,8 @@ public class BcweaverJarMaker { File.pathSeparator + System.getProperty("aspectjrt.path")); args.add("-outjar"); args.add("../ajde/testdata/DuplicateManifestTest/aspectjar.jar"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/Trace.java"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/TraceHello.java"); + args.add(Constants.TESTDATA_PATH + "/src1/Trace.java"); + args.add(Constants.TESTDATA_PATH + "/src1/TraceHello.java"); CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); } @@ -393,7 +394,7 @@ public class BcweaverJarMaker { File.pathSeparator + System.getProperty("aspectjrt.path")); args.add("-outjar"); args.add("./testdata/OutjarTest/parent.jar"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/OutjarTest/src/jar1/Parent.java"); + args.add(Constants.TESTDATA_PATH + "/OutjarTest/src/jar1/Parent.java"); CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); /* @@ -406,7 +407,7 @@ public class BcweaverJarMaker { + File.pathSeparator + "./testdata/OutjarTest/parent.jar"); args.add("-outjar"); args.add("./testdata/OutjarTest/child.jar"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/OutjarTest/src/jar2/Child.java"); + args.add(Constants.TESTDATA_PATH + "/OutjarTest/src/jar2/Child.java"); CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); /* @@ -418,7 +419,7 @@ public class BcweaverJarMaker { + File.pathSeparator + System.getProperty("aspectjrt.path")); args.add("-outjar"); args.add("./testdata/OutjarTest/aspects.jar"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/OutjarTest/src/jar3/Aspect.aj"); + args.add(Constants.TESTDATA_PATH + "/OutjarTest/src/jar3/Aspect.aj"); CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); /* diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BinaryFormsTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/BinaryFormsTestCase.java similarity index 67% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BinaryFormsTestCase.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/BinaryFormsTestCase.java index c0cf6c515..cd514fe43 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BinaryFormsTestCase.java +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/BinaryFormsTestCase.java @@ -17,9 +17,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.aspectj.ajdt.ajc.AjdtAjcTests; +import org.aspectj.ajdt.ajc.Constants; import org.aspectj.testing.util.TestUtil; -import org.aspectj.tools.ajc.AjcTests; public class BinaryFormsTestCase extends CommandTestCase { @@ -37,14 +36,14 @@ public class BinaryFormsTestCase extends CommandTestCase { args.add(library); args.add("-classpath"); - args.add(AjcTests.aspectjrtClasspath()); + args.add(Constants.aspectjrtClasspath()); args.add("-d"); args.add(getSandboxName()); args.add("-XnotReweavable"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/binary/lib/ConcreteA.aj"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/binary/lib/AbstractA.aj"); + args.add(Constants.TESTDATA_PATH + "/src1/binary/lib/ConcreteA.aj"); + args.add(Constants.TESTDATA_PATH + "/src1/binary/lib/AbstractA.aj"); CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); @@ -53,14 +52,14 @@ public class BinaryFormsTestCase extends CommandTestCase { args.add(library); args.add("-classpath"); - args.add(AjcTests.aspectjrtClasspath()); + args.add(Constants.aspectjrtClasspath()); args.add("-d"); args.add(getSandboxName()); args.add("-XnotReweavable"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/binary/client/Client.java"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/binary/client/Client1.java"); + args.add(Constants.TESTDATA_PATH + "/src1/binary/client/Client.java"); + args.add(Constants.TESTDATA_PATH + "/src1/binary/client/Client1.java"); CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); @@ -72,14 +71,14 @@ public class BinaryFormsTestCase extends CommandTestCase { args.add(library); args.add("-classpath"); - args.add(AjcTests.aspectjrtClasspath()); + args.add(Constants.aspectjrtClasspath()); args.add("-XnotReweavable"); args.add("-d"); args.add(getSandboxName()); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/binary/client/MyAspect.aj"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/binary/client/Client1.java"); + args.add(Constants.TESTDATA_PATH + "/src1/binary/client/MyAspect.aj"); + args.add(Constants.TESTDATA_PATH + "/src1/binary/client/Client1.java"); CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); @@ -90,39 +89,39 @@ public class BinaryFormsTestCase extends CommandTestCase { args.add(library); args.add("-classpath"); - args.add(AjcTests.aspectjrtClasspath()); + args.add(Constants.aspectjrtClasspath()); args.add("-d"); args.add(getSandboxName()); args.add("-XnotReweavable"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/binary/client/MyAspect1.aj"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/binary/client/Client1.java"); + args.add(Constants.TESTDATA_PATH + "/src1/binary/client/MyAspect1.aj"); + args.add(Constants.TESTDATA_PATH + "/src1/binary/client/Client1.java"); CommandTestCase.runCompiler(args, new int[] {24, 30}); args = new ArrayList(); args.add("-classpath"); - args.add(library + File.pathSeparator + AjcTests.aspectjrtClasspath()); + args.add(library + File.pathSeparator + Constants.aspectjrtClasspath()); args.add("-d"); args.add(getSandboxName()); args.add("-XnotReweavable"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/binary/client/Client1.java"); + args.add(Constants.TESTDATA_PATH + "/src1/binary/client/Client1.java"); CommandTestCase.runCompiler(args, new int[] {15, 17, 22}); args = new ArrayList(); args.add("-classpath"); - args.add(AjcTests.aspectjrtClasspath() + File.pathSeparator + library); + args.add(Constants.aspectjrtClasspath() + File.pathSeparator + library); args.add("-Xlint:error"); args.add("-d"); args.add(getSandboxName()); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/binary/client/MyAspect.aj"); - args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/binary/client/Client1.java"); + args.add(Constants.TESTDATA_PATH + "/src1/binary/client/MyAspect.aj"); + args.add(Constants.TESTDATA_PATH + "/src1/binary/client/Client1.java"); CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); } diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/CommandTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/CommandTestCase.java similarity index 95% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/CommandTestCase.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/CommandTestCase.java index 23e589080..8331eb3f4 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/CommandTestCase.java +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/CommandTestCase.java @@ -21,8 +21,8 @@ import java.util.List; import junit.framework.TestCase; -import org.aspectj.ajdt.ajc.AjdtAjcTests; import org.aspectj.ajdt.ajc.AjdtCommand; +import org.aspectj.ajdt.ajc.Constants; import org.aspectj.bridge.ICommand; import org.aspectj.bridge.IMessage; import org.aspectj.bridge.IMessageHandler; @@ -30,7 +30,6 @@ import org.aspectj.bridge.IMessageHolder; import org.aspectj.bridge.MessageHandler; import org.aspectj.testing.util.TestUtil; import org.aspectj.tools.ajc.Ajc; -import org.aspectj.tools.ajc.AjcTests; import org.aspectj.util.LangUtil; import org.aspectj.weaver.bcel.LazyClassGen; @@ -79,7 +78,7 @@ public abstract class CommandTestCase extends TestCase { args.add(extraArgs[i]); } - args.add(AjdtAjcTests.TESTDATA_PATH + "/" + source); + args.add(Constants.TESTDATA_PATH + "/" + source); runCompiler(args, expectedErrors); } @@ -97,7 +96,7 @@ public abstract class CommandTestCase extends TestCase { args.add("-classpath"); args.add(getRuntimeClasspath()); - args.add(AjdtAjcTests.TESTDATA_PATH + "/" + source); + args.add(Constants.TESTDATA_PATH + "/" + source); ICommand compiler = runCompiler(args, NO_ERRORS); Thread.sleep(100); @@ -153,7 +152,7 @@ public abstract class CommandTestCase extends TestCase { } public static void printGenerated(String path, String name) throws IOException { - String fullpath = AjdtAjcTests.TESTDATA_PATH + "/" + path; + String fullpath = Constants.TESTDATA_PATH + "/" + path; LazyClassGen.disassemble(fullpath, name, System.out); } @@ -180,7 +179,7 @@ public abstract class CommandTestCase extends TestCase { if (LangUtil.is19VMOrGreater()) { classpath.append(LangUtil.getJrtFsFilePath()).append(File.pathSeparator); } - classpath.append(AjcTests.aspectjrtClasspath()); + classpath.append(Constants.aspectjrtClasspath()); return classpath.toString(); } diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/CompileAndRunTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/CompileAndRunTestCase.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/CompileAndRunTestCase.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/CompileAndRunTestCase.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/CompilerDumpTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/CompilerDumpTestCase.java similarity index 91% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/CompilerDumpTestCase.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/CompilerDumpTestCase.java index 9851cda08..7aa3749c2 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/CompilerDumpTestCase.java +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/CompilerDumpTestCase.java @@ -56,7 +56,7 @@ public class CompilerDumpTestCase extends AjcTestCase { assertNoMessages(result); String fileName = Dump.dump("DumpTestCase.testDump()"); dumpFile = new File(fileName); - org.aspectj.weaver.DumpTestCase.assertContents(dumpFile, "Command Line", "HelloWorld.java"); + DumpTestCase.assertContents(dumpFile, "Command Line", "HelloWorld.java"); } /** @@ -73,7 +73,7 @@ public class CompilerDumpTestCase extends AjcTestCase { ajc(baseDir, args); String fileName = Dump.dump("DumpTestCase.testDumpWithWarnings()"); dumpFile = new File(fileName); - org.aspectj.weaver.DumpTestCase.assertContents(dumpFile, "Compiler Messages", "warning"); + DumpTestCase.assertContents(dumpFile, "Compiler Messages", "warning"); } /** @@ -92,7 +92,7 @@ public class CompilerDumpTestCase extends AjcTestCase { String fileName = Dump.getLastDumpFileName(); assertTrue("Dump file should be created", !fileName.equals(previousFileName)); dumpFile = new File(fileName); - org.aspectj.weaver.DumpTestCase.assertContents(dumpFile, "Compiler Messages", "error"); + DumpTestCase.assertContents(dumpFile, "Compiler Messages", "error"); } } diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/DeclareParents.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/DeclareParentsTest.java similarity index 99% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/DeclareParents.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/DeclareParentsTest.java index c0d796753..7ca59d741 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/DeclareParents.java +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/DeclareParentsTest.java @@ -38,7 +38,7 @@ import org.aspectj.tools.ajc.CompilationResult; * * Covariance on method overrides is supported but untested because we need a Java5 compiler (so we can write easy tests) */ -public class DeclareParents extends AjcTestCase { +public class DeclareParentsTest extends AjcTestCase { private static final boolean verbose = false; diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/DumpTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/DumpTestCase.java new file mode 100644 index 000000000..dad021a7c --- /dev/null +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/DumpTestCase.java @@ -0,0 +1,148 @@ +/******************************************************************************* + * Copyright (c) 2004 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Matthew Webster + *******************************************************************************/ +package org.aspectj.ajdt.internal.compiler.batch; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; + +import junit.framework.TestCase; + +import org.aspectj.bridge.IMessage; +import org.aspectj.bridge.IMessageHolder; +import org.aspectj.bridge.Message; +import org.aspectj.bridge.MessageHandler; +import org.aspectj.weaver.Dump; + +/** + * @author websterm + * + * Test Dump facility. Ensure it can be configured and files contain expected contents. Testcase + * returns Dump configuration to orginal state. + */ +public class DumpTestCase extends TestCase { + + private File dumpFile; + private IMessage.Kind savedDumpCondition; + + public DumpTestCase(String name) { + super(name); + } + + protected void setUp() throws Exception { + super.setUp(); + + dumpFile = null; + savedDumpCondition = Dump.getDumpOnExit(); + } + + protected void tearDown() throws Exception { + super.tearDown(); + + if (dumpFile != null && dumpFile.exists()) { + boolean deleted = dumpFile.delete(); + assertTrue("Dump file '" + dumpFile.getPath() + "' could not be deleted",deleted); + } + Dump.setDumpOnExit(savedDumpCondition); + } + + public void testSetDumpOnException () { + Dump.setDumpOnException(true); + assertTrue("DumpOnException should be true",Dump.getDumpOnException()); + } + + public void testSetDumpOnExit () { + assertTrue("Should be able to set condition 'error'",Dump.setDumpOnExit("error")); + assertTrue("Should be able to set condition 'warning'",Dump.setDumpOnExit("warning")); + assertFalse("Should not be able to set condition 'junk'",Dump.setDumpOnExit("junk")); + } + + public void testDump () { + String fileName = Dump.dump("testDump()"); + dumpFile = new File(fileName); + assertTrue("Dump file '" + fileName + "' should exist",dumpFile.exists()); + } + + public void testDumpWithException () { + String message = "testDumpWithException()"; + String fileName = recursiveCall(message,100); + dumpFile = new File(fileName); + assertContents(dumpFile,"Exception Information",message); + } + + public void testDumpOnExit () { + Dump.setDumpOnExit("abort"); + Dump.saveMessageHolder(null); + String fileName = Dump.dumpOnExit(); + dumpFile = new File(fileName); + assertTrue("Dump file '" + fileName + "' should exist",dumpFile.exists()); + } + + public void testDumpOnExitExcluded () { + Dump.setDumpOnExit("abort"); + IMessageHolder holder = new MessageHandler(); + Dump.saveMessageHolder(holder); + holder.handleMessage(new Message("testDumpOnExitExcluded()",IMessage.ERROR,null,null)); + String fileName = Dump.dumpOnExit(); + dumpFile = new File(fileName); + assertEquals("Dump '" + fileName + "' should be excluded",Dump.DUMP_EXCLUDED,fileName); + } + + public void testDumpOnExitIncluded () { + Dump.setDumpOnExit("error"); + IMessageHolder holder = new MessageHandler(); + Dump.saveMessageHolder(holder); + IMessage error = new Message("testDumpOnExitIncluded()",IMessage.ERROR,null,null); + holder.handleMessage(error); + String fileName = Dump.dumpOnExit(); + dumpFile = new File(fileName); + assertContents(dumpFile,"Compiler Messages",error.getMessage()); + } + + /* Ensure dump file exists and contains certain contents under a given heading */ + public static void assertContents (File dumpFile, String heading, String contents) { + assertTrue("Dump file '" + dumpFile.getPath() + "' should exist",dumpFile.exists()); + assertTrue("Dump file '" + dumpFile.getPath()+ "' should contain '" + contents + "'",fileContains(dumpFile,heading,contents)); + } + + private static boolean fileContains (File dumpFile, String heading, String contents) { + boolean result = false; + + try { + BufferedReader reader = new BufferedReader(new FileReader(dumpFile)); + String currentHeading = ""; + String record; + while ((null != (record = reader.readLine())) && (result == false)) { + if (record.startsWith("----")) currentHeading = record; + else if ((record.indexOf(contents) != -1) && currentHeading.indexOf(heading) != -1) result = true; + } + reader.close(); + } + catch (IOException ex) { + fail(ex.toString()); + } + + return result; + } + + /* Generate a big stack trace */ + private String recursiveCall (String message, int depth) { + if (depth == 0) { + Throwable th = new RuntimeException(message); + return Dump.dumpWithException(th); + } + else { + return recursiveCall(message,--depth); + } + } + +} diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/ImageTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/ImageTestCase.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/ImageTestCase.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/ImageTestCase.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/IncrementalCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/IncrementalCase.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/IncrementalCase.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/IncrementalCase.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/JavadocTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/JavadocTest.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/JavadocTest.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/JavadocTest.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/MultipleCompileTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/MultipleCompileTestCase.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/MultipleCompileTestCase.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/MultipleCompileTestCase.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PartiallyExposedHierarchyTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/PartiallyExposedHierarchyTestCase.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PartiallyExposedHierarchyTestCase.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/PartiallyExposedHierarchyTestCase.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PerformanceTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/PerformanceTestCase.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PerformanceTestCase.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/PerformanceTestCase.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/ProceedOnErrorTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/ProceedOnErrorTestCase.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/ProceedOnErrorTestCase.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/ProceedOnErrorTestCase.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/VerifyWeaveTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/VerifyWeaveTestCase.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/VerifyWeaveTestCase.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/VerifyWeaveTestCase.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java similarity index 96% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java index 3e834a083..307232643 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java @@ -16,8 +16,8 @@ import java.io.File; import java.io.IOException; import java.util.*; +import org.aspectj.ajdt.ajc.Constants; import org.aspectj.testing.util.TestUtil; -import org.aspectj.tools.ajc.AjcTests; public class WorkingTestMain { @@ -41,7 +41,7 @@ public class WorkingTestMain { args.add("out"); args.add("-classpath"); - args.add(AjcTests.aspectjrtClasspath() + File.pathSeparator + args.add(Constants.aspectjrtClasspath() + File.pathSeparator + "../testing-client/bin"); //args.add("../runtime/bin;../lib/junit/junit.jar"); @@ -78,7 +78,7 @@ public class WorkingTestMain { args.add("out"); args.add("-classpath"); - args.add(AjcTests.aspectjrtClasspath()); + args.add(Constants.aspectjrtClasspath()); for (int i=0; i < argfiles.length; i++) { args.add("@" + examplesDir + argfiles[i]); diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildConfigTests.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfigTest.java similarity index 99% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildConfigTests.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfigTest.java index 5283d79cc..880d58f86 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildConfigTests.java +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfigTest.java @@ -30,7 +30,7 @@ import junit.framework.TestCase; /** * @author Andy Clement */ -public class AjBuildConfigTests extends TestCase { +public class AjBuildConfigTest extends TestCase { @Override public void setUp() throws Exception { diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java similarity index 97% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java index fc841c5a8..d8d1621de 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java @@ -17,8 +17,8 @@ import java.io.IOException; import java.io.PrintWriter; import org.aspectj.ajdt.StreamPrintWriter; -import org.aspectj.ajdt.ajc.AjdtAjcTests; import org.aspectj.ajdt.ajc.BuildArgParser; +import org.aspectj.ajdt.ajc.Constants; import org.aspectj.bridge.IMessage; import org.aspectj.bridge.MessageHandler; import org.aspectj.bridge.MessageWriter; @@ -31,9 +31,9 @@ public class AjBuildManagerTest extends TestCase { private final StreamPrintWriter outputWriter = new StreamPrintWriter(new PrintWriter(System.out)); private final MessageWriter messageWriter = new MessageWriter(outputWriter, false); - public static File source1 = new File(AjdtAjcTests.TESTDATA_DIR, "src1/A.java"); - public static File source2 = new File(AjdtAjcTests.TESTDATA_DIR, "src1/Hello.java"); - public static File source3 = new File(AjdtAjcTests.TESTDATA_DIR, "src1/X.java"); + public static File source1 = new File(Constants.TESTDATA_DIR, "src1/A.java"); + public static File source2 = new File(Constants.TESTDATA_DIR, "src1/Hello.java"); + public static File source3 = new File(Constants.TESTDATA_DIR, "src1/X.java"); /** * @throws AssertionFailedError unless handler has 0 messages worse than warning, or the one message is a warning about @@ -63,7 +63,7 @@ public class AjBuildManagerTest extends TestCase { System.out.println(javaClassPath); String sandboxName = Ajc.createEmptySandbox().getAbsolutePath(); AjBuildConfig buildConfig = parser.genBuildConfig(new String[] { "-d", sandboxName, "-1.4", "-classpath", javaClassPath, - AjdtAjcTests.TESTDATA_PATH + "/src1/A.java", + Constants.TESTDATA_PATH + "/src1/A.java", // EajcModuleTests.TESTDATA_PATH + "/src1/Hello.java", }); String err = parser.getOtherMessages(true); diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjCompilerOptionsTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjCompilerOptionsTest.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjCompilerOptionsTest.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjCompilerOptionsTest.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjStateTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjStateTest.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjStateTest.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjStateTest.java diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjdtBuilderTests.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjdtBuilderTests.java new file mode 100644 index 000000000..14eb7a0db --- /dev/null +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjdtBuilderTests.java @@ -0,0 +1,38 @@ +///* ******************************************************************* +// * Copyright (c) 1999-2001 Xerox Corporation, +// * 2002 Palo Alto Research Center, Incorporated (PARC). +// * All rights reserved. +// * This program and the accompanying materials are made available +// * under the terms of the Eclipse Public License v1.0 +// * which accompanies this distribution and is available at +// * http://www.eclipse.org/legal/epl-v10.html +// * +// * Contributors: +// * PARC initial implementation +// * ******************************************************************/ +// +// +//package org.aspectj.ajdt.internal.core.builder; +// +//import junit.framework.Test; +//import junit.framework.TestCase; +//import junit.framework.TestSuite; +// +//public class AjdtBuilderTests extends TestCase { +// +// public static Test suite() { +// TestSuite suite = new TestSuite(AjdtBuilderTests.class.getName()); +// //$JUnit-BEGIN$ +// suite.addTestSuite(AjBuildManagerTest.class); +// suite.addTestSuite(AjBuildConfigTest.class); +// suite.addTestSuite(AsmBuilderTest.class); +// suite.addTestSuite(AjCompilerOptionsTest.class); +// suite.addTestSuite(AjStateTest.class); +// suite.addTestSuite(OutjarTest.class); +// //$JUnit-END$ +// return suite; +// } +// +// public AjdtBuilderTests(String name) { super(name); } +// +//} diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AsmBuilderTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AsmBuilderTest.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AsmBuilderTest.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AsmBuilderTest.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/OutjarTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/OutjarTest.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/OutjarTest.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/OutjarTest.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/ASTVisitorTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/ASTVisitorTest.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/ASTVisitorTest.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/ASTVisitorTest.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/ASTitdTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/ASTitdTest.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/ASTitdTest.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/ASTitdTest.java diff --git a/org.aspectj.ajdt.core/java5-testsrc/org/aspectj/tools/ajc/AjAST5Test.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjAST5Test.java similarity index 100% rename from org.aspectj.ajdt.core/java5-testsrc/org/aspectj/tools/ajc/AjAST5Test.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjAST5Test.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjASTTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjASTTest.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjASTTest.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjASTTest.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjASTTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjASTTestCase.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjASTTestCase.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjASTTestCase.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjNaiveASTFlattenerTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjNaiveASTFlattenerTest.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjNaiveASTFlattenerTest.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjNaiveASTFlattenerTest.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/Ajc.java similarity index 88% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/Ajc.java index eeb6136a5..f43875541 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/Ajc.java @@ -51,47 +51,59 @@ public class Ajc { private static final String SANDBOX_NAME = "ajcSandbox"; + private static final String BUILD_OUTPUT_FOLDER = "target"; + + public static final String outputFolder(String module) { + return File.pathSeparator + ".." +File.separator + module + File.separator + "target" + File.separator + "classes"; + } + // ALSO SEE ANTSPEC AND AJCTESTCASE - private static final String TESTER_PATH = ".." + File.separator + "testing-client" + File.separator + "bin" - + File.pathSeparator + ".." + File.separator + "runtime" + File.separator + "bin" + File.pathSeparator + ".." - + File.separator + "aspectj5rt" + File.separator + "bin" + File.pathSeparator + ".." + File.separator + "lib" - + File.separator + "junit" + File.separator + "junit.jar" + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "bcel" - + File.separator + "bcel.jar" + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "bcel" + File.separator - + "bcel-verifier.jar" + - - File.pathSeparator + ".." + File.separator + "bridge" + File.separator + "bin" + File.pathSeparator + ".." - + File.separator + "loadtime" + File.separator + "bin" + File.pathSeparator - + ".." - + File.separator - + "weaver" - + File.separator - + "bin" - + File.pathSeparator - + ".." - + File.separator - + "weaver5" - + File.separator - + "bin" - + File.pathSeparator - + ".." - + File.separator - + "org.aspectj.matcher" - + File.separator - + "bin" + private static final String TESTER_PATH = outputFolder("testing-client") + outputFolder("runtime") + outputFolder("bcel-builder") +// + File.pathSeparator + ".." + File.separator + "runtime" + File.separator + BUILD_OUTPUT_FOLDER // +// + File.pathSeparator + ".." + File.separator + "aspectj5rt" + File.separator + BUILD_OUTPUT_FOLDER // + + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "junit" + File.separator + "junit.jar" // +// + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "bcel" + File.separator + "bcel.jar" // +// + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "bcel" + File.separator +// + "bcel-verifier.jar" + + + + outputFolder("bridge") + + outputFolder("loadtime") + + outputFolder("weaver") + + outputFolder("org.aspectj.matcher") + + outputFolder("bridge"); +// File.pathSeparator + ".." + File.separator + "bridge" + File.separator + "bin" + File.pathSeparator + ".." +// + File.separator + "loadtime" + File.separator + "bin" + File.pathSeparator +// + ".." +// + File.separator +// + "weaver" +// + File.separator +// + "bin" +// + File.pathSeparator +// + ".." +// + File.separator +// + "weaver5" +// + File.separator +// + "bin" +// + File.pathSeparator +// + ".." +// + File.separator +// + "org.aspectj.matcher" +// + File.separator +// + "bin" // When the build machine executes the tests, it is using code built into jars rather than code build into // bin directories. This means for the necessary types to be found we have to put these jars on the classpath: - + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" + File.separator + "bridge.jar" - + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" + File.separator - + "org.aspectj.matcher.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" - + File.separator + "util.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" - + File.separator + "loadtime.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" - + File.separator + "weaver.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" - + File.separator + "weaver5.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" - + File.separator + "asm.jar" + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "test" - + File.separator + "testing-client.jar" - // hmmm, this next one should perhaps point to an aj-build jar... - + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "test" + File.separator + "aspectjrt.jar"; +// + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" + File.separator + "bridge.jar" +// + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" + File.separator +// + "org.aspectj.matcher.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" +// + File.separator + "util.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" +// + File.separator + "loadtime.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" +// + File.separator + "weaver.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" +// + File.separator + "weaver5.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" +// + File.separator + "asm.jar" + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "test" +// + File.separator + "testing-client.jar" +// // hmmm, this next one should perhaps point to an aj-build jar... +// + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "test" + File.separator + "aspectjrt.jar"; private CompilationResult result; private File sandbox; diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/Ajc5Tests.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/Ajc5Tests.java new file mode 100644 index 000000000..f4426d3ff --- /dev/null +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/Ajc5Tests.java @@ -0,0 +1,30 @@ +///* ******************************************************************* +// * Copyright (c) 2005 Contributors. +// * All rights reserved. +// * This program and the accompanying materials are made available +// * under the terms of the Eclipse Public License v1.0 +// * which accompanies this distribution and is available at +// * http://eclipse.org/legal/epl-v10.html +// * +// * Contributors: +// * Matthew Webster initial implementation +// * ******************************************************************/ +//package org.aspectj.tools.ajc; +// +//import org.aspectj.testing.util.TestUtil; +// +//import junit.framework.Test; +//import junit.framework.TestCase; +//import junit.framework.TestSuite; +// +//public class Ajc5Tests extends TestCase { +// public static String aspectjrtClasspath() { +// return TestUtil.aspectjrtPath().getPath(); +// } +// public static Test suite() { +// TestSuite suite = new TestSuite(Ajc5Tests.class.getName()); +// suite.addTestSuite(AjAST5Test.class); +// return suite; +// } +// +//} diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCaseTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCaseTest.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCaseTest.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCaseTest.java diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTests.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTests.java new file mode 100644 index 000000000..decf3ad99 --- /dev/null +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTests.java @@ -0,0 +1,36 @@ +///* ******************************************************************* +// * Copyright (c) 2005 Contributors. +// * All rights reserved. +// * This program and the accompanying materials are made available +// * under the terms of the Eclipse Public License v1.0 +// * which accompanies this distribution and is available at +// * http://eclipse.org/legal/epl-v10.html +// * +// * Contributors: +// * Wes Isberg initial implementation +// * ******************************************************************/ +// +// +//package org.aspectj.tools.ajc; +// +//import org.aspectj.testing.util.TestUtil; +// +//import junit.framework.Test; +//import junit.framework.TestCase; +//import junit.framework.TestSuite; +// +//public class AjcTests extends TestCase { +// public static String aspectjrtClasspath() { +// return TestUtil.aspectjrtPath().getPath(); +// } +// public static Test suite() { +// TestSuite suite = new TestSuite(AjcTests.class.getName()); +// suite.addTestSuite(org.aspectj.tools.ajc.MainTest.class); +// suite.addTestSuite(ASTVisitorTest.class); +// suite.addTestSuite(ASTitdTest.class); +// suite.addTestSuite(AjASTTest.class); +// suite.addTestSuite(AjNaiveASTFlattenerTest.class); +// return suite; +// } +// +//} diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/CompilationResult.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/CompilationResult.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/CompilationResult.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/CompilationResult.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/DelegatingOutputStream.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/DelegatingOutputStream.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/DelegatingOutputStream.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/DelegatingOutputStream.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/MainTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/MainTest.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/MainTest.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/MainTest.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/TestMessageHolder.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/TestMessageHolder.java similarity index 100% rename from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/TestMessageHolder.java rename to org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/TestMessageHolder.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/EajcModuleTests.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/EajcModuleTests.java deleted file mode 100644 index 8889ddc06..000000000 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/EajcModuleTests.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.aspectj.ajdt; -/* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, - * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * PARC initial implementation - * ******************************************************************/ - - -// default package - - -import org.aspectj.testing.util.TestUtil; - -import junit.framework.*; - -public class EajcModuleTests extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(EajcModuleTests.class.getName()); - suite.addTest(org.aspectj.ajdt.ajc.AjdtAjcTests.suite()); - suite.addTest(org.aspectj.ajdt.internal.compiler.batch.AjdtBatchTests.suite()); - suite.addTest(org.aspectj.ajdt.internal.core.builder.AjdtBuilderTests.suite()); - suite.addTest(org.aspectj.tools.ajc.AjcTests.suite()); - - /* FIXME maw move these Java 5 dependent tests to a separate project */ - if (TestUtil.is15VMOrGreater()) { - TestUtil.loadTestsReflectively(suite, "Eajc515ModuleTests", true); - } else { - suite.addTest(TestUtil.testNamed("Eajc515ModuleTests require 1.5")); - } - return suite; - } - - public EajcModuleTests(String name) { super(name); } - -} diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/AjdtAjcTests.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/AjdtAjcTests.java deleted file mode 100644 index 51dc1c8ef..000000000 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/AjdtAjcTests.java +++ /dev/null @@ -1,39 +0,0 @@ -/* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, - * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * PARC initial implementation - * ******************************************************************/ - - -package org.aspectj.ajdt.ajc; - -import java.io.File; - -import junit.framework.*; - -public class AjdtAjcTests extends TestCase { - - public static final String TESTDATA_PATH - = "../org.aspectj.ajdt.core/testdata"; - public static final File TESTDATA_DIR = new File(TESTDATA_PATH); - - public static Test suite() { - TestSuite suite = new TestSuite(AjdtAjcTests.class.getName()); - //$JUnit-BEGIN$ - suite.addTestSuite(AjdtCommandTestCase.class); - suite.addTestSuite(BuildArgParserTestCase.class); - suite.addTestSuite(ConsoleMessageHandlerTestCase.class); - //$JUnit-END$ - return suite; - } - - public AjdtAjcTests(String name) { super(name); } - -} diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/AjdtBatchTests.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/AjdtBatchTests.java deleted file mode 100644 index 93466906a..000000000 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/AjdtBatchTests.java +++ /dev/null @@ -1,45 +0,0 @@ -/* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, - * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * PARC initial implementation - * ******************************************************************/ - - -package org.aspectj.ajdt.internal.compiler.batch; - -import junit.framework.*; - -public class AjdtBatchTests extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(AjdtBatchTests.class.getName()); - // Abstract superclass - //suite.addTestSuite(CommandTestCase.class); - //$JUnit-BEGIN$ - suite.addTestSuite(BasicCommandTestCase.class); - suite.addTestSuite(BinaryFormsTestCase.class); - suite.addTestSuite(CompileAndRunTestCase.class); - suite.addTestSuite(PerformanceTestCase.class); - suite.addTestSuite(ImageTestCase.class); - suite.addTestSuite(MultipleCompileTestCase.class); - suite.addTestSuite(JavadocTest.class); - suite.addTestSuite(PartiallyExposedHierarchyTestCase.class); - suite.addTestSuite(CompilerDumpTestCase.class); - suite.addTestSuite(ProceedOnErrorTestCase.class); - suite.addTestSuite(DeclareParents.class); - // XXX suite.addTestSuite(VerifyWeaveTestCase.class); - //suite.addTestSuite(WorkingCommandTestCase.class); - //$JUnit-END$ - return suite; - } - - public AjdtBatchTests(String name) { super(name); } - -} diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjdtBuilderTests.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjdtBuilderTests.java deleted file mode 100644 index 61f92803e..000000000 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjdtBuilderTests.java +++ /dev/null @@ -1,38 +0,0 @@ -/* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, - * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * PARC initial implementation - * ******************************************************************/ - - -package org.aspectj.ajdt.internal.core.builder; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -public class AjdtBuilderTests extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(AjdtBuilderTests.class.getName()); - //$JUnit-BEGIN$ - suite.addTestSuite(AjBuildManagerTest.class); - suite.addTestSuite(AjBuildConfigTests.class); - suite.addTestSuite(AsmBuilderTest.class); - suite.addTestSuite(AjCompilerOptionsTest.class); - suite.addTestSuite(AjStateTest.class); - suite.addTestSuite(OutjarTest.class); - //$JUnit-END$ - return suite; - } - - public AjdtBuilderTests(String name) { super(name); } - -} diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTests.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTests.java deleted file mode 100644 index eb8445352..000000000 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTests.java +++ /dev/null @@ -1,36 +0,0 @@ -/* ******************************************************************* - * Copyright (c) 2005 Contributors. - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: - * Wes Isberg initial implementation - * ******************************************************************/ - - -package org.aspectj.tools.ajc; - -import org.aspectj.testing.util.TestUtil; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -public class AjcTests extends TestCase { - public static String aspectjrtClasspath() { - return TestUtil.aspectjrtPath().getPath(); - } - public static Test suite() { - TestSuite suite = new TestSuite(AjcTests.class.getName()); - suite.addTestSuite(org.aspectj.tools.ajc.MainTest.class); - suite.addTestSuite(ASTVisitorTest.class); - suite.addTestSuite(ASTitdTest.class); - suite.addTestSuite(AjASTTest.class); - suite.addTestSuite(AjNaiveASTFlattenerTest.class); - return suite; - } - -} -- 2.39.5