mirrors
/
org.aspectj
mirror of https://github.com/eclipse/org.aspectj.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 138 Wiki Activity
Browse Source

Fix getSpecFile() to work with URLs and adjust installer unpacker

tags/V1_9_3RC1
Andy Clement 5 years ago
parent
635f0ed47f
commit
ce1533d849
100 changed files with 156 additions and 2816 deletions
Split View Show Diff Stats
  1. 32
    8
      build/src/main/java/$installer$/org/aspectj/Main.java
  2. 0
    49
      distribution/aspectjinstaller-assembly.xml
  3. 0
    57
      distribution/aspectjrt-assembly.xml
  4. 0
    91
      distribution/aspectjtools-assembly.xml
  5. 0
    226
      distribution/pom.xml
  6. 2
    1
      testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java
  7. 5
    4
      testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java
  8. 3
    1
      testing/src/test/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java
  9. 0
    156
      tests/bugs188/485055/ajcore.20160105.151522.218.txt
  10. 0
    2125
      tests/bugs193/543657/ajcore.20190121.161103.629.txt
  11. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc10x/Ajc10xTests.java
  12. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc11/Ajc11Tests.java
  13. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc120/Ajc120Tests.java
  14. 2
    2
      tests/src/test/java/org/aspectj/systemtest/ajc121/Ajc121Tests.java
  15. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/AccBridgeMethods.java
  16. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/Ajc150Tests.java
  17. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationBinding.java
  18. 2
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationPointcutsTests.java
  19. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationRuntimeTests.java
  20. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/Annotations.java
  21. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationsBinaryWeaving.java
  22. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/Autoboxing.java
  23. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/CovarianceTests.java
  24. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/DeclareAnnotationTests.java
  25. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/Enums.java
  26. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/GenericITDsDesign.java
  27. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/GenericsTests.java
  28. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/HasMember.java
  29. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/MigrationTests.java
  30. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java
  31. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/RuntimeAnnotations.java
  32. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/StaticImports.java
  33. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/SuppressedWarnings.java
  34. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/VarargsTests.java
  35. 2
    2
      tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjAnnotationGenTests.java
  36. 2
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java
  37. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjMisuseTests.java
  38. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java
  39. 5
    3
      tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/coverage/CoverageTests.java
  40. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWServerTests.java
  41. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWTests.java
  42. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc151/Ajc151Tests.java
  43. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc151/AtAroundTests.java
  44. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc151/NewarrayJoinpointTests.java
  45. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc151/SerialVersionUIDTests.java
  46. 2
    1
      tests/src/test/java/org/aspectj/systemtest/ajc152/Ajc152Tests.java
  47. 2
    1
      tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTests.java
  48. 2
    1
      tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTransformTests.java
  49. 2
    1
      tests/src/test/java/org/aspectj/systemtest/ajc153/Ajc153Tests.java
  50. 2
    1
      tests/src/test/java/org/aspectj/systemtest/ajc153/JDTLikeHandleProviderTests.java
  51. 2
    1
      tests/src/test/java/org/aspectj/systemtest/ajc153/LTWServer153Tests.java
  52. 2
    1
      tests/src/test/java/org/aspectj/systemtest/ajc153/PipeliningTests.java
  53. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc154/Ajc154Tests.java
  54. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc160/Ajc160Tests.java
  55. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc160/AnnotationValueMatchingTests.java
  56. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc160/NewFeatures.java
  57. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc160/ParameterAnnotationMatchingTests.java
  58. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc160/SanityTests.java
  59. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc161/Ajc161Tests.java
  60. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc161/OptimizedAnnotationFieldBinding.java
  61. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc1610/Ajc1610Tests.java
  62. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc1610/NewFeatures.java
  63. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
  64. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc1611/NewFeatures.java
  65. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java
  66. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc162/Ajc162Tests.java
  67. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc163/Ajc163Tests.java
  68. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc164/Ajc164Tests.java
  69. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc164/DeclareMixinTests.java
  70. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc164/JointpointIdTests.java
  71. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc165/Ajc165Tests.java
  72. 3
    2
      tests/src/test/java/org/aspectj/systemtest/ajc165/WorldTests.java
  73. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc166/Ajc166Tests.java
  74. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc167/Ajc167Tests.java
  75. 3
    2
      tests/src/test/java/org/aspectj/systemtest/ajc167/IntertypeTests.java
  76. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc167/OverweavingTests.java
  77. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc169/Ajc169Tests.java
  78. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc169/IntertypeTests.java
  79. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc169/TransparentWeavingTests.java
  80. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc170/Ajc170Tests.java
  81. 3
    2
      tests/src/test/java/org/aspectj/systemtest/ajc170/IndyTests.java
  82. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests.java
  83. 3
    2
      tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests_need17jre.java
  84. 3
    2
      tests/src/test/java/org/aspectj/systemtest/ajc171/NewFeatures.java
  85. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc172/Ajc172Tests.java
  86. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc173/Ajc173Tests.java
  87. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc174/Ajc174Tests.java
  88. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc175/Ajc175Tests.java
  89. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc180/Ajc180Tests.java
  90. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc181/Ajc181Tests.java
  91. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc1810/Ajc1810Tests.java
  92. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java
  93. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc182/Ajc182Tests.java
  94. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc183/Ajc183Tests.java
  95. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc184/Ajc184Tests.java
  96. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc185/Ajc185Tests.java
  97. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc186/Ajc186Tests.java
  98. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc187/Ajc187Tests.java
  99. 1
    1
      tests/src/test/java/org/aspectj/systemtest/ajc188/Ajc188Tests.java
  100. 0
    0
      tests/src/test/java/org/aspectj/systemtest/ajc189/Ajc189Tests.java

+ 32
- 8
build/src/main/java/$installer$/org/aspectj/Main.java View File

@@ -39,9 +39,13 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.PrintStream;
import java.lang.reflect.InvocationTargetException;
import java.net.JarURLConnection;
import java.net.URL;
import java.util.Enumeration;
import java.util.Map;
import java.util.Properties;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;

@@ -1478,17 +1482,37 @@ class CurrentJarUnpacker {
writeStream(getClass().getResourceAsStream("/" + name), outputFile);
}

public void writeResource(JarFile jarFile, JarEntry entry, File outputDir) throws IOException {
String name = entry.getName().substring(6);
File outputFile = makeOutputFile(name, outputDir);
//System.out.println("finding name: " + name);
// writeStream(getClass().getResourceAsStream("/" + name), outputFile);
writeStream(jarFile.getInputStream(entry), outputFile);
}

public void unpack(String contentsName, File outputDir) throws IOException {
URL url = getClass().getResource(contentsName);
InputStream stream = url.openStream();
BufferedReader reader = new BufferedReader(new InputStreamReader(stream, "US-ASCII"));

String line = reader.readLine();
installPane.nBytes = Integer.parseInt(line);

while ((line = reader.readLine()) != null) {
writeResource(line, outputDir);
// Process everything under 'files/**' copying to the target
// install directory with 'files/' removed
JarURLConnection juc = (JarURLConnection) url.openConnection();
JarFile jf = juc.getJarFile();
Enumeration<JarEntry> entries = jf.entries();
while (entries.hasMoreElements()) {
JarEntry je = entries.nextElement();
if (je.getName().startsWith("files/") && !je.getName().endsWith("/")) {
writeResource(jf, je, outputDir);
}
}
// InputStream stream = url.openStream();
// BufferedReader reader = new BufferedReader(new InputStreamReader(stream, "US-ASCII"));
// String line = reader.readLine();
// installPane.nBytes = Integer.parseInt(line);
//
// while ((line = reader.readLine()) != null) {
// writeResource(line, outputDir);
// }

installPane.progressMessage("done writing");
}

+ 0
- 49
distribution/aspectjinstaller-assembly.xml View File

@@ -1,49 +0,0 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">

<id>aspectjinstaller</id>
<formats>
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>

<fileSets>
<fileSet>
<directory>../build/target/classes</directory>
<outputDirectory>.</outputDirectory>
<excludes>
<exclude>org/**</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>../aj-build/dist/docs</directory>
<outputDirectory>files</outputDirectory>
</fileSet>
<fileSet>
<directory>../runtime/target/site/apidocs</directory>
<outputDirectory>files/doc/runtime-apidocs</outputDirectory>
</fileSet>
</fileSets>

<files>
<file>
<source>target/aspectjrt-${project.version}.jar</source>
<outputDirectory>files/lib</outputDirectory>
<destName>aspectjrt.jar</destName>
</file>
<file>
<source>target/aspectjweaver-${project.version}.jar</source>
<outputDirectory>files/lib</outputDirectory>
<destName>aspectjweaver.jar</destName>
</file>
<file>
<source>target/aspectjtools-${project.version}.jar</source>
<outputDirectory>files/lib</outputDirectory>
<destName>aspectjtools.jar</destName>
</file>
</files>

</assembly>


+ 0
- 57
distribution/aspectjrt-assembly.xml View File

@@ -1,57 +0,0 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">

<id>aspectjrt</id>

<formats><format>jar</format></formats>

<includeBaseDirectory>false</includeBaseDirectory>

<fileSets>
<fileSet>
<!--
<directory>${basedir}/../runtime/target/classes</directory>
-->
<directory>../runtime/target/classes</directory>
<outputDirectory>.</outputDirectory>
<!--
<excludes>
<exclude>MANIFEST.MF</exclude>
</excludes>
<includes>
<include>*</include>
</includes>
-->
</fileSet>
</fileSets>

<!--
<files>
<file>
<source>runtime.manifest.mf</source>
<outputDirectory>META-INF</outputDirectory>
<destName>MANIFEST.MF</destName>
<filtered>true</filtered>
</file>
</files>
-->


<!--
<moduleSets>
<moduleSet>
<useAllReactorProjects>true</useAllReactorProjects>
<includes>
<include>org.aspectj:runtime:jar:</include>
</includes>
<binaries>
<outputDirectory>modules/maven-assembly-plugin</outputDirectory>
<unpack>true</unpack>
</binaries>
</moduleSet>
</moduleSets>
-->


</assembly>


+ 0
- 91
distribution/aspectjtools-assembly.xml View File

@@ -1,91 +0,0 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">

<id>aspectjtools</id>
<formats>
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>

<fileSets>
<!-- runtime -->
<fileSet>
<directory>../runtime/target/classes</directory>
<outputDirectory>.</outputDirectory>
</fileSet>

<!-- weaver -->
<fileSet>
<directory>../weaver/target/classes</directory>
<outputDirectory>.</outputDirectory>
</fileSet>
<fileSet>
<directory>../util/target/classes</directory>
<outputDirectory>.</outputDirectory>
</fileSet>
<fileSet>
<directory>../bridge/target/classes</directory>
<outputDirectory>.</outputDirectory>
</fileSet>
<fileSet>
<directory>../asm/target/classes</directory>
<outputDirectory>.</outputDirectory>
</fileSet>
<fileSet>
<directory>../org.aspectj.matcher/target/classes</directory>
<outputDirectory>.</outputDirectory>
</fileSet>
<fileSet>
<directory>../bcel-builder/target/classes</directory>
<outputDirectory>.</outputDirectory>
</fileSet>
<fileSet>
<directory>../loadtime/target/classes</directory>
<outputDirectory>.</outputDirectory>
</fileSet>
<fileSet>
<directory>target/asm-unzipped</directory>
<outputDirectory>.</outputDirectory>
<excludes>
<exclude>org/**</exclude>
<exclude>META-INF/MANIFEST.MF</exclude>
</excludes>
</fileSet>
<!-- tools -->
<fileSet>
<directory>../ajbrowser/target/classes</directory>
<outputDirectory>.</outputDirectory>
</fileSet>
<fileSet>
<directory>../ajde/target/classes</directory>
<outputDirectory>.</outputDirectory>
</fileSet>
<fileSet>
<directory>../ajde.core/target/classes</directory>
<outputDirectory>.</outputDirectory>
</fileSet>
<fileSet>
<directory>../ajdoc/target/classes</directory>
<outputDirectory>.</outputDirectory>
</fileSet>
<fileSet>
<directory>../org.aspectj.ajdt.core/target/classes</directory>
<outputDirectory>.</outputDirectory>
</fileSet>
<fileSet>
<directory>../taskdefs/target/classes</directory>
<outputDirectory>.</outputDirectory>
</fileSet>
<fileSet>
<directory>target/jdtcore-unzipped</directory>
<outputDirectory>.</outputDirectory>
<excludes>
<exclude>META-INF/MANIFEST.MF</exclude>
</excludes>
</fileSet>
</fileSets>

</assembly>


+ 0
- 226
distribution/pom.xml View File

@@ -1,226 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
<version>1.9.3.BUILD-SNAPSHOT</version>
</parent>

<artifactId>distribution</artifactId>
<packaging>pom</packaging>
<name>Distribution</name>

<dependencies>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>run-all-junit-tests</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
<plugins>


<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>unzipasm</id>
<phase>validate</phase>
<configuration>
<tasks>
<echo message="unzip jarjar'd asm" />
<unzip
src="${project.basedir}/../lib/asm/asm-7.0-beta.renamed.jar"
dest="target/asm-unzipped" />
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>unzipjdt</id>
<phase>validate</phase>
<configuration>
<tasks>
<echo message="unzip patched jdtcore" />
<unzip
src="${project.basedir}/../org.eclipse.jdt.core/jdtcore-for-aspectj.jar"
dest="target/jdtcore-unzipped" />
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>aspectjrt-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>aspectjrt-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<archive>
<manifestEntries>
<Automatic-Module-Name>org.aspectj.runtime</Automatic-Module-Name>
</manifestEntries>

<manifestSections>
<manifestSection>
<name>org/aspectj/lang/</name>
<manifestEntries>

<Specification-Title>AspectJ Runtime Classes</Specification-Title>
<Specification-Version>${project.version}</Specification-Version>
<Specification-Vendor>https://www.eclipse.org/aspectj/</Specification-Vendor>

<Implementation-Title>org.aspectj.runtime</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
<Implementation-Vendor>https://www.eclipse.org/aspectj/</Implementation-Vendor>

<Bundle-Name>AspectJ Runtime</Bundle-Name>
<Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Copyright>(C) Copyright 1999-2001 Xerox Corporation,
2002 Palo Alto Research Center, Incorporated (PARC),
2003-2019 Contributors. All Rights Reserved</Bundle-Copyright>
</manifestEntries>
</manifestSection>
</manifestSections>
</archive>

<descriptors>
<descriptor>aspectjrt-assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>

<execution>
<id>aspectjweaver-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>aspectjweaver-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<archive>
<manifestEntries>
<Automatic-Module-Name>org.aspectj.weaver</Automatic-Module-Name>
<PremainClass>org.aspectj.weaver.loadtime.Agent</PremainClass>
<AgentClass>org.aspectj.weaver.loadtime.Agent</AgentClass>
<CanRedefineClasses>true</CanRedefineClasses>
</manifestEntries>


<manifestSections>
<manifestSection>
<name>org/aspectj/weaver/</name>
<manifestEntries>

<Specification-Title>AspectJ Weaver Classes</Specification-Title>
<Specification-Version>${project.version}</Specification-Version>
<Specification-Vendor>https://www.eclipse.org/aspectj/</Specification-Vendor>

<Implementation-Title>org.aspectj.weaver</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
<Implementation-Vendor>https://www.eclipse.org/aspectj/</Implementation-Vendor>

<Bundle-Name>AspectJ Weaver</Bundle-Name>
<Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Copyright>(C) Copyright 1999-2001 Xerox Corporation,
2002 Palo Alto Research Center, Incorporated (PARC),
2003-2019 Contributors. All Rights Reserved</Bundle-Copyright>
</manifestEntries>
</manifestSection>
</manifestSections>
</archive>

<descriptors>
<descriptor>aspectjweaver-assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>

<execution>
<id>aspectjtools-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>aspectjtools-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<archive>
<manifestEntries>
<Automatic-Module-Name>org.aspectj.tools</Automatic-Module-Name>
</manifestEntries>

<manifestSections>
<manifestSection>
<name>org/aspectj/tools/</name>
<manifestEntries>

<Specification-Title>AspectJ Tools Classes</Specification-Title>
<Specification-Version>${project.version}</Specification-Version>
<Specification-Vendor>https://www.eclipse.org/aspectj/</Specification-Vendor>

<Implementation-Title>org.aspectj.tools</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
<Implementation-Vendor>https://www.eclipse.org/aspectj/</Implementation-Vendor>

<Bundle-Name>AspectJ Tools</Bundle-Name>
<Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Copyright>(C) Copyright 1999-2001 Xerox Corporation,
2002 Palo Alto Research Center, Incorporated (PARC),
2003-2019 Contributors. All Rights Reserved</Bundle-Copyright>
</manifestEntries>
</manifestSection>
</manifestSections>
</archive>

<descriptors>
<descriptor>aspectjtools-assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>aspectjinstaller-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>aspectj-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<archive>
<manifestEntries>
<Main-Class>$installer$.org.aspectj.Main</Main-Class>
</manifestEntries>
</archive>
<descriptors>
<descriptor>aspectjinstaller-assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

+ 2
- 1
testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java View File

@@ -59,7 +59,8 @@ public abstract class AutowiredXMLBasedAjcTestCase extends XMLBasedAjcTestCase {
System.out.println("LOADING SUITE: " + wired.getSpecFile().getPath());
Digester d = wired.getDigester();
try {
InputStreamReader isr = new InputStreamReader(new FileInputStream(wired.getSpecFile()));
InputStreamReader isr = new InputStreamReader(wired.getSpecFile().openStream());
// InputStreamReader isr = new InputStreamReader(new FileInputStream(wired.getSpecFile()));
d.parse(isr);
} catch (Exception ex) {
fail("Unable to load suite " + wired.getSpecFile().getPath() + " : " + ex);

+ 5
- 4
testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java View File

@@ -18,6 +18,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FilenameFilter;
import java.io.InputStreamReader;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -100,7 +101,7 @@ public abstract class XMLBasedAjcTestCase extends AjcTestCase {
/**
* The file containing the XML specification for the tests.
*/
protected abstract File getSpecFile();
protected abstract URL getSpecFile();

/*
* Return a map from (String) test title -> AjcTest
@@ -272,7 +273,7 @@ public abstract class XMLBasedAjcTestCase extends AjcTestCase {
System.out.println("LOADING SUITE: " + getSpecFile().getPath());
Digester d = getDigester();
try {
InputStreamReader isr = new InputStreamReader(new FileInputStream(getSpecFile()));
InputStreamReader isr = new InputStreamReader(getSpecFile().openConnection().getInputStream());
d.parse(isr);
} catch (Exception ex) {
fail("Unable to load suite " + getSpecFile().getPath() + " : " + ex);
@@ -486,8 +487,8 @@ public abstract class XMLBasedAjcTestCase extends AjcTestCase {
return null;
}

protected File getClassResource(String resourceName) {
return new File(getClass().getResource(resourceName).getFile());
protected URL getClassResource(String resourceName) {
return getClass().getResource(resourceName);
}

protected Method findMethod(JavaClass jc, String string) {

+ 3
- 1
testing/src/test/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java View File

@@ -14,6 +14,7 @@ package org.aspectj.testing.taskdefs;

import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;

import org.aspectj.bridge.*;
import org.aspectj.bridge.MessageHandler;
@@ -138,7 +139,8 @@ public class AjcTaskCompileCommandTest extends TestCase {
final boolean pass = (result == expectPass);
if (!pass) {
String m = expectPass ? "pass" : "fail";
assertTrue("expected " + m + ": " + args, false);
assertTrue("expected " + m + ": " + args+"\n Messages:"+handler.getUnmodifiableListView(), false);
}
}


+ 0
- 156
tests/bugs188/485055/ajcore.20160105.151522.218.txt View File

@@ -1,156 +0,0 @@
---- AspectJ Properties ---
AspectJ Compiler 1.8.7 built on Wednesday Sep 9, 2015 at 21:19:30 GMT
---- Dump Properties ---
Dump file: ajcore.20160105.151522.218.txt
Dump reason: java.lang.ClassCastException
Dump on exception: true
Dump at exit condition: abort
---- Exception Information ---
java.lang.ClassCastException: org.aspectj.apache.bcel.classfile.ConstantString cannot be cast to org.aspectj.apache.bcel.classfile.ConstantObject
at org.aspectj.apache.bcel.generic.FieldGen.setValue(FieldGen.java:142)
at org.aspectj.apache.bcel.generic.FieldGen.<init>(FieldGen.java:115)
at org.aspectj.weaver.bcel.BcelField.getField(BcelField.java:233)
at org.aspectj.weaver.bcel.LazyClassGen.writeBack(LazyClassGen.java:522)
at org.aspectj.weaver.bcel.LazyClassGen.getJavaClassBytesIncludingReweavable(LazyClassGen.java:697)
at org.aspectj.weaver.bcel.BcelWeaver.getClassFilesFor(BcelWeaver.java:1440)
at org.aspectj.weaver.bcel.BcelWeaver.weaveAndNotify(BcelWeaver.java:1402)
at org.aspectj.weaver.bcel.BcelWeaver.weave(BcelWeaver.java:1155)
at org.aspectj.ajdt.internal.compiler.AjPipeliningCompilerAdapter.weaveQueuedEntries(AjPipeliningCompilerAdapter.java:514)
at org.aspectj.ajdt.internal.compiler.AjPipeliningCompilerAdapter.queueForWeaving(AjPipeliningCompilerAdapter.java:447)
at org.aspectj.ajdt.internal.compiler.AjPipeliningCompilerAdapter.afterProcessing(AjPipeliningCompilerAdapter.java:432)
at org.aspectj.ajdt.internal.compiler.CompilerAdapter.ajc$after$org_aspectj_ajdt_internal_compiler_CompilerAdapter$5$6b855184(CompilerAdapter.aj:103)
at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.process(Compiler.java:902)
at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.processCompiledUnits(Compiler.java:545)
at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.compile(Compiler.java:458)
at org.aspectj.ajdt.internal.core.builder.AjBuildManager.performCompilation(AjBuildManager.java:1036)
at org.aspectj.ajdt.internal.core.builder.AjBuildManager.performBuild(AjBuildManager.java:272)
at org.aspectj.ajdt.internal.core.builder.AjBuildManager.batchBuild(AjBuildManager.java:185)
at org.aspectj.ajdt.ajc.AjdtCommand.doCommand(AjdtCommand.java:114)
at org.aspectj.ajdt.ajc.AjdtCommand.runCommand(AjdtCommand.java:60)
at org.aspectj.tools.ajc.Main.run(Main.java:371)
at org.aspectj.tools.ajc.Main.runMain(Main.java:248)
at org.aspectj.tools.ajc.Main.main(Main.java:84)
---- System Properties ---
java.runtime.name=Java(TM) SE Runtime Environment
sun.boot.library.path=/Users/aclement/jvms/jdk180u60/Home/jre/lib
java.vm.version=25.60-b23
gopherProxySet=false
java.vm.vendor=Oracle Corporation
java.vendor.url=http://java.oracle.com/
path.separator=:
java.vm.name=Java HotSpot(TM) 64-Bit Server VM
file.encoding.pkg=sun.io
user.country=US
sun.java.launcher=SUN_STANDARD
sun.os.patch.level=unknown
java.vm.specification.name=Java Virtual Machine Specification
user.dir=/Users/aclement/gits/org.aspectj/tests/bugs188/485055
java.runtime.version=1.8.0_60-b27
java.awt.graphicsenv=sun.awt.CGraphicsEnvironment
java.endorsed.dirs=/Users/aclement/jvms/jdk180u60/Home/jre/lib/endorsed
os.arch=x86_64
java.io.tmpdir=/var/folders/cn/p3n4rh_n6z7gm6zwk53mtfc80000gp/T/
line.separator=

java.vm.specification.vendor=Oracle Corporation
os.name=Mac OS X
sun.jnu.encoding=UTF-8
java.library.path=/Users/aclement/Library/Java/Extensions:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java:.
java.specification.name=Java Platform API Specification
java.class.version=52.0
sun.management.compiler=HotSpot 64-Bit Tiered Compilers
os.version=10.11.1
http.nonProxyHosts=local|*.local|169.254/16|*.169.254/16
user.home=/Users/aclement
user.timezone=America/Vancouver
java.awt.printerjob=sun.lwawt.macosx.CPrinterJob
file.encoding=UTF-8
java.specification.version=1.8
java.class.path=/Users/aclement/installs/aspectj187/lib/aspectjtools.jar:/Users/aclement/jvms/jdk180u60/Home/lib/tools.jar:.:/Users/aclement/.m2/repository/org/springframework/spring-test/4.2.3.RELEASE/spring-test-4.2.3.RELEASE.jar:/Users/aclement/.m2/repository/org/springframework/spring-context/4.2.3.RELEASE/spring-context-4.2.3.RELEASE.jar:/Users/aclement/installs/aspectj187/lib/aspectjrt.jar
user.name=aclement
java.vm.specification.version=1.8
sun.java.command=org.aspectj.tools.ajc.Main -1.5 AspectWithConstant.aj
java.home=/Users/aclement/jvms/jdk180u60/Home/jre
sun.arch.data.model=64
user.language=en
java.specification.vendor=Oracle Corporation
awt.toolkit=sun.lwawt.macosx.LWCToolkit
java.vm.info=mixed mode
java.version=1.8.0_60
java.ext.dirs=/Users/aclement/Library/Java/Extensions:/Users/aclement/jvms/jdk180u60/Home/jre/lib/ext:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java
sun.boot.class.path=/Users/aclement/jvms/jdk180u60/Home/jre/lib/resources.jar:/Users/aclement/jvms/jdk180u60/Home/jre/lib/rt.jar:/Users/aclement/jvms/jdk180u60/Home/jre/lib/sunrsasign.jar:/Users/aclement/jvms/jdk180u60/Home/jre/lib/jsse.jar:/Users/aclement/jvms/jdk180u60/Home/jre/lib/jce.jar:/Users/aclement/jvms/jdk180u60/Home/jre/lib/charsets.jar:/Users/aclement/jvms/jdk180u60/Home/jre/lib/jfr.jar:/Users/aclement/jvms/jdk180u60/Home/jre/classes
java.vendor=Oracle Corporation
file.separator=/
java.vendor.url.bug=http://bugreport.sun.com/bugreport/
sun.io.unicode.encoding=UnicodeBig
sun.cpu.endian=little
socksNonProxyHosts=local|*.local|169.254/16|*.169.254/16
ftp.nonProxyHosts=local|*.local|169.254/16|*.169.254/16
sun.cpu.isalist=
---- Command Line ---
-1.5
AspectWithConstant.aj
---- Full Classpath ---
/Users/aclement/jvms/jdk180u60/Home/jre/lib/resources.jar(3501583 bytes)
/Users/aclement/jvms/jdk180u60/Home/jre/lib/rt.jar(66555254 bytes)
/Users/aclement/jvms/jdk180u60/Home/jre/lib/sunrsasign.jar(missing)
/Users/aclement/jvms/jdk180u60/Home/jre/lib/jsse.jar(625764 bytes)
/Users/aclement/jvms/jdk180u60/Home/jre/lib/jce.jar(114730 bytes)
/Users/aclement/jvms/jdk180u60/Home/jre/lib/charsets.jar(3133473 bytes)
/Users/aclement/jvms/jdk180u60/Home/jre/lib/jfr.jar(555268 bytes)
/Users/aclement/jvms/jdk180u60/Home/jre/classes(missing)
/Users/aclement/jvms/jdk180u60/Home/jre/lib/ext/cldrdata.jar(3860522 bytes)
/Users/aclement/jvms/jdk180u60/Home/jre/lib/ext/dnsns.jar(8286 bytes)
/Users/aclement/jvms/jdk180u60/Home/jre/lib/ext/jaccess.jar(44516 bytes)
/Users/aclement/jvms/jdk180u60/Home/jre/lib/ext/jfxrt.jar(18570861 bytes)
/Users/aclement/jvms/jdk180u60/Home/jre/lib/ext/localedata.jar(1178935 bytes)
/Users/aclement/jvms/jdk180u60/Home/jre/lib/ext/nashorn.jar(2014239 bytes)
/Users/aclement/jvms/jdk180u60/Home/jre/lib/ext/sunec.jar(39771 bytes)
/Users/aclement/jvms/jdk180u60/Home/jre/lib/ext/sunjce_provider.jar(278680 bytes)
/Users/aclement/jvms/jdk180u60/Home/jre/lib/ext/sunpkcs11.jar(250826 bytes)
/Users/aclement/jvms/jdk180u60/Home/jre/lib/ext/zipfs.jar(68848 bytes)
/System/Library/Java/Extensions/AppleScriptEngine.jar(6476 bytes)
/System/Library/Java/Extensions/dns_sd.jar(17780 bytes)
/System/Library/Java/Extensions/j3daudio.jar(1223496 bytes)
/System/Library/Java/Extensions/j3dcore.jar(1157355 bytes)
/System/Library/Java/Extensions/j3dutils.jar(685308 bytes)
/System/Library/Java/Extensions/jai_codec.jar(275499 bytes)
/System/Library/Java/Extensions/jai_core.jar(1544542 bytes)
/System/Library/Java/Extensions/mlibwrapper_jai.jar(41239 bytes)
/System/Library/Java/Extensions/MRJToolkit.jar(12847 bytes)
/System/Library/Java/Extensions/vecmath.jar(127640 bytes)
/Users/aclement/jvms/jdk180u60/Home/lib/tools.jar(18194868 bytes)
/Users/aclement/gits/org.aspectj/tests/bugs188/485055/.(2 entries)
/Users/aclement/.m2/repository/org/springframework/spring-test/4.2.3.RELEASE/spring-test-4.2.3.RELEASE.jar(562284 bytes)
/Users/aclement/.m2/repository/org/springframework/spring-context/4.2.3.RELEASE/spring-context-4.2.3.RELEASE.jar(1088916 bytes)
/Users/aclement/installs/aspectj187/lib/aspectjrt.jar(116927 bytes)
---- Compiler Messages ---
error at (no source information available)
/Users/aclement/gits/org.aspectj/tests/bugs188/485055/AspectWithConstant.aj:0::0 Internal compiler error: java.lang.ClassCastException: org.aspectj.apache.bcel.classfile.ConstantString cannot be cast to org.aspectj.apache.bcel.classfile.ConstantObject at org.aspectj.apache.bcel.generic.FieldGen.setValue(FieldGen.java:142)
abort ABORT -- (ClassCastException) org.aspectj.apache.bcel.classfile.ConstantString cannot be cast to org.aspectj.apache.bcel.classfile.ConstantObject
org.aspectj.apache.bcel.classfile.ConstantString cannot be cast to org.aspectj.apache.bcel.classfile.ConstantObject
java.lang.ClassCastException: org.aspectj.apache.bcel.classfile.ConstantString cannot be cast to org.aspectj.apache.bcel.classfile.ConstantObject
at org.aspectj.apache.bcel.generic.FieldGen.setValue(FieldGen.java:142)
at org.aspectj.apache.bcel.generic.FieldGen.<init>(FieldGen.java:115)
at org.aspectj.weaver.bcel.BcelField.getField(BcelField.java:233)
at org.aspectj.weaver.bcel.LazyClassGen.writeBack(LazyClassGen.java:522)
at org.aspectj.weaver.bcel.LazyClassGen.getJavaClassBytesIncludingReweavable(LazyClassGen.java:697)
at org.aspectj.weaver.bcel.BcelWeaver.getClassFilesFor(BcelWeaver.java:1440)
at org.aspectj.weaver.bcel.BcelWeaver.weaveAndNotify(BcelWeaver.java:1402)
at org.aspectj.weaver.bcel.BcelWeaver.weave(BcelWeaver.java:1155)
at org.aspectj.ajdt.internal.compiler.AjPipeliningCompilerAdapter.weaveQueuedEntries(AjPipeliningCompilerAdapter.java:514)
at org.aspectj.ajdt.internal.compiler.AjPipeliningCompilerAdapter.queueForWeaving(AjPipeliningCompilerAdapter.java:447)
at org.aspectj.ajdt.internal.compiler.AjPipeliningCompilerAdapter.afterProcessing(AjPipeliningCompilerAdapter.java:432)
at org.aspectj.ajdt.internal.compiler.CompilerAdapter.ajc$after$org_aspectj_ajdt_internal_compiler_CompilerAdapter$5$6b855184(CompilerAdapter.aj:103)
at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.process(Compiler.java:902)
at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.processCompiledUnits(Compiler.java:545)
at org.aspectj.org.eclipse.jdt.internal.compiler.Compiler.compile(Compiler.java:458)
at org.aspectj.ajdt.internal.core.builder.AjBuildManager.performCompilation(AjBuildManager.java:1036)
at org.aspectj.ajdt.internal.core.builder.AjBuildManager.performBuild(AjBuildManager.java:272)
at org.aspectj.ajdt.internal.core.builder.AjBuildManager.batchBuild(AjBuildManager.java:185)
at org.aspectj.ajdt.ajc.AjdtCommand.doCommand(AjdtCommand.java:114)
at org.aspectj.ajdt.ajc.AjdtCommand.runCommand(AjdtCommand.java:60)
at org.aspectj.tools.ajc.Main.run(Main.java:371)
at org.aspectj.tools.ajc.Main.runMain(Main.java:248)
at org.aspectj.tools.ajc.Main.main(Main.java:84)


+ 0
- 2125
tests/bugs193/543657/ajcore.20190121.161103.629.txt
File diff suppressed because it is too large
View File


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc10x/Ajc10xTests.java View File

@@ -22,7 +22,7 @@ public class Ajc10xTests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc10x.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc11/Ajc11Tests.java View File

@@ -22,7 +22,7 @@ public class Ajc11Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(Ajc11Tests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc11.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc120/Ajc120Tests.java View File

@@ -19,7 +19,7 @@ public class Ajc120Tests extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(Ajc120Tests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc120.xml");
}


+ 2
- 2
tests/src/test/java/org/aspectj/systemtest/ajc121/Ajc121Tests.java View File

@@ -9,7 +9,7 @@
* ******************************************************************/
package org.aspectj.systemtest.ajc121;

import java.io.File;
import java.net.URL;

import junit.framework.Test;

@@ -21,7 +21,7 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(Ajc121Tests.class);
}

protected File getSpecFile() {
protected URL getSpecFile() {
return getClassResource("ajc121.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/AccBridgeMethods.java View File

@@ -48,7 +48,7 @@ public class AccBridgeMethods extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(AccBridgeMethods.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc150.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/Ajc150Tests.java View File

@@ -30,7 +30,7 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(Ajc150Tests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc150.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationBinding.java View File

@@ -28,7 +28,7 @@ public class AnnotationBinding extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(AnnotationBinding.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc150.xml");
}


+ 2
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationPointcutsTests.java View File

@@ -11,6 +11,7 @@
package org.aspectj.systemtest.ajc150;

import java.io.File;
import java.net.URL;

import junit.framework.Test;

@@ -26,7 +27,7 @@ public class AnnotationPointcutsTests extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(AnnotationPointcutsTests.class);
}

protected File getSpecFile() {
protected URL getSpecFile() {
return getClassResource("ajc150.xml");
}

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationRuntimeTests.java View File

@@ -25,7 +25,7 @@ public class AnnotationRuntimeTests extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(AnnotationRuntimeTests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc150.xml");
}

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/Annotations.java View File

@@ -24,7 +24,7 @@ public class Annotations extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(Annotations.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc150.xml");
}

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationsBinaryWeaving.java View File

@@ -34,7 +34,7 @@ public class AnnotationsBinaryWeaving extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(AnnotationsBinaryWeaving.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc150.xml");
}

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/Autoboxing.java View File

@@ -26,7 +26,7 @@ public class Autoboxing extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(Autoboxing.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc150.xml");
}

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/CovarianceTests.java View File

@@ -62,7 +62,7 @@ public class CovarianceTests extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(CovarianceTests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc150.xml");
}
private boolean verbose = false;

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/DeclareAnnotationTests.java View File

@@ -27,7 +27,7 @@ public class DeclareAnnotationTests extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(DeclareAnnotationTests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc150.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/Enums.java View File

@@ -36,7 +36,7 @@ public class Enums extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(Enums.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc150.xml");
}

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/GenericITDsDesign.java View File

@@ -36,7 +36,7 @@ public class GenericITDsDesign extends XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc150.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/GenericsTests.java View File

@@ -183,7 +183,7 @@ public class GenericsTests extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(GenericsTests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc150.xml");
}

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/HasMember.java View File

@@ -22,7 +22,7 @@ public class HasMember extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(HasMember.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc150.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/MigrationTests.java View File

@@ -26,7 +26,7 @@ public class MigrationTests extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(MigrationTests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc150.xml");
}
/**

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java View File

@@ -25,7 +25,7 @@ public class PerTypeWithinTests extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(PerTypeWithinTests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc150.xml");
}

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/RuntimeAnnotations.java View File

@@ -15,7 +15,7 @@ public class RuntimeAnnotations extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(RuntimeAnnotations.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc150.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/StaticImports.java View File

@@ -22,7 +22,7 @@ public class StaticImports extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(StaticImports.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc150.xml");
}

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/SuppressedWarnings.java View File

@@ -22,7 +22,7 @@ public class SuppressedWarnings extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(SuppressedWarnings.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc150.xml");
}

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/VarargsTests.java View File

@@ -29,7 +29,7 @@ public class VarargsTests extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(VarargsTests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc150.xml");
}

+ 2
- 2
tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjAnnotationGenTests.java View File

@@ -10,7 +10,7 @@
*******************************************************************************/
package org.aspectj.systemtest.ajc150.ataspectj;

import java.io.File;
import java.net.URL;

import junit.framework.Test;

@@ -27,7 +27,7 @@ public class AtAjAnnotationGenTests extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(AtAjAnnotationGenTests.class);
}

protected File getSpecFile() {
protected URL getSpecFile() {
return getClassResource("annotationgen.xml");
}

+ 2
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java View File

@@ -12,6 +12,7 @@
package org.aspectj.systemtest.ajc150.ataspectj;

import java.io.File;
import java.net.URL;

import junit.framework.Test;

@@ -27,7 +28,7 @@ public class AtAjLTWTests extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(org.aspectj.systemtest.ajc150.ataspectj.AtAjLTWTests.class);
}

protected File getSpecFile() {
protected URL getSpecFile() {
return getClassResource("ltw.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjMisuseTests.java View File

@@ -21,7 +21,7 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
*/
public class AtAjMisuseTests extends XMLBasedAjcTestCase {

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("misuse.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java View File

@@ -28,7 +28,7 @@ public class AtAjSyntaxTests extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(AtAjSyntaxTests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("syntax.xml");
}


+ 5
- 3
tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/coverage/CoverageTests.java View File

@@ -1,6 +1,7 @@
package org.aspectj.systemtest.ajc150.ataspectj.coverage;

import java.io.File;
import java.net.URL;

import junit.framework.Test;
import junit.framework.TestResult;
@@ -35,9 +36,10 @@ public class CoverageTests extends
.loadSuite(CoverageTests.class);
}

protected File getSpecFile() {
return new File(
"../tests/src/org/aspectj/systemtest/ajc150/ataspectj/coverage/coverage.xml");
protected URL getSpecFile() {
return getClassResource("coverage.xml");
// return new File(
// "../tests/src/org/aspectj/systemtest/ajc150/ataspectj/coverage/coverage.xml");
}

}

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWServerTests.java View File

@@ -12,7 +12,7 @@ public class LTWServerTests extends XMLBasedAjcTestCase {
return loadSuite(LTWServerTests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ltw.xml");
}

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWTests.java View File

@@ -26,7 +26,7 @@ public class LTWTests extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(LTWTests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ltw.xml");
}

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc151/Ajc151Tests.java View File

@@ -275,7 +275,7 @@ public class Ajc151Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(Ajc151Tests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc151.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc151/AtAroundTests.java View File

@@ -82,7 +82,7 @@ public class AtAroundTests extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(AtAroundTests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ataround.xml");
}

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc151/NewarrayJoinpointTests.java View File

@@ -129,7 +129,7 @@ public class NewarrayJoinpointTests extends XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("newarray_joinpoint.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc151/SerialVersionUIDTests.java View File

@@ -30,7 +30,7 @@ public class SerialVersionUIDTests extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(SerialVersionUIDTests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("serialversionuid.xml");
}

+ 2
- 1
tests/src/test/java/org/aspectj/systemtest/ajc152/Ajc152Tests.java View File

@@ -11,6 +11,7 @@
package org.aspectj.systemtest.ajc152;

import java.io.File;
import java.net.URL;
import java.util.List;

import junit.framework.Test;
@@ -377,7 +378,7 @@ public class Ajc152Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(Ajc152Tests.class);
}

protected File getSpecFile() {
protected URL getSpecFile() {
return getClassResource("ajc152.xml");
}


+ 2
- 1
tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTests.java View File

@@ -11,6 +11,7 @@
package org.aspectj.systemtest.ajc152;

import java.io.File;
import java.net.URL;

import junit.framework.Test;

@@ -254,7 +255,7 @@ public class SynchronizationTests extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(SynchronizationTests.class);
}

protected File getSpecFile() {
protected URL getSpecFile() {
return getClassResource("synchronization.xml");
}


+ 2
- 1
tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTransformTests.java View File

@@ -16,6 +16,7 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.PrintStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -299,7 +300,7 @@ public class SynchronizationTransformTests extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(SynchronizationTransformTests.class);
}

protected File getSpecFile() {
protected URL getSpecFile() {
return getClassResource("synchronization.xml");
}


+ 2
- 1
tests/src/test/java/org/aspectj/systemtest/ajc153/Ajc153Tests.java View File

@@ -11,6 +11,7 @@
package org.aspectj.systemtest.ajc153;

import java.io.File;
import java.net.URL;

import junit.framework.Test;

@@ -501,7 +502,7 @@ public class Ajc153Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(Ajc153Tests.class);
}

protected File getSpecFile() {
protected URL getSpecFile() {
return getClassResource("ajc153.xml");
}


+ 2
- 1
tests/src/test/java/org/aspectj/systemtest/ajc153/JDTLikeHandleProviderTests.java View File

@@ -12,6 +12,7 @@ package org.aspectj.systemtest.ajc153;

import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.Iterator;
import java.util.List;

@@ -546,7 +547,7 @@ public class JDTLikeHandleProviderTests extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(JDTLikeHandleProviderTests.class);
}

protected File getSpecFile() {
protected URL getSpecFile() {
return getClassResource("jdtlikehandleprovider.xml");
}


+ 2
- 1
tests/src/test/java/org/aspectj/systemtest/ajc153/LTWServer153Tests.java View File

@@ -1,6 +1,7 @@
package org.aspectj.systemtest.ajc153;

import java.io.File;
import java.net.URL;

import junit.framework.Test;

@@ -12,7 +13,7 @@ public class LTWServer153Tests extends XMLBasedAjcTestCase {
return loadSuite(LTWServer153Tests.class);
}

protected File getSpecFile() {
protected URL getSpecFile() {
return getClassResource("ajc153.xml");
}

+ 2
- 1
tests/src/test/java/org/aspectj/systemtest/ajc153/PipeliningTests.java View File

@@ -11,6 +11,7 @@
package org.aspectj.systemtest.ajc153;

import java.io.File;
import java.net.URL;

import junit.framework.Test;

@@ -83,7 +84,7 @@ public class PipeliningTests extends org.aspectj.testing.XMLBasedAjcTestCase {
public static Test suite() {
return XMLBasedAjcTestCase.loadSuite(PipeliningTests.class);
}
protected File getSpecFile() {
protected URL getSpecFile() {
return getClassResource("pipelining.xml");
}
}

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc154/Ajc154Tests.java View File

@@ -353,7 +353,7 @@ public class Ajc154Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(Ajc154Tests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc154.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc160/Ajc160Tests.java View File

@@ -147,7 +147,7 @@ public class Ajc160Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(Ajc160Tests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc160.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc160/AnnotationValueMatchingTests.java View File

@@ -49,7 +49,7 @@ public class AnnotationValueMatchingTests extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(AnnotationValueMatchingTests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("annotationValueMatching.xml");
}
}

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc160/NewFeatures.java View File

@@ -27,7 +27,7 @@ public class NewFeatures extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(NewFeatures.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("newfeatures-tests.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc160/ParameterAnnotationMatchingTests.java View File

@@ -92,7 +92,7 @@ public class ParameterAnnotationMatchingTests extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(ParameterAnnotationMatchingTests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("parameterAnnotations.xml");
}
}

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc160/SanityTests.java View File

@@ -156,7 +156,7 @@ public class SanityTests extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(SanityTests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("sanity-tests.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc161/Ajc161Tests.java View File

@@ -197,7 +197,7 @@ public class Ajc161Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(Ajc161Tests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc161.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc161/OptimizedAnnotationFieldBinding.java View File

@@ -66,7 +66,7 @@ public class OptimizedAnnotationFieldBinding extends XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(OptimizedAnnotationFieldBinding.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("annotationFieldBinding.xml");
}
}

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc1610/Ajc1610Tests.java View File

@@ -60,7 +60,7 @@ public class Ajc1610Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc1610.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc1610/NewFeatures.java View File

@@ -145,7 +145,7 @@ public class NewFeatures extends org.aspectj.testing.XMLBasedAjcTestCase {
return getClassFrom(ajc.getSandboxDirectory(), className);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("newfeatures-tests.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java View File

@@ -122,7 +122,7 @@ public class Ajc1611Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc1611.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc1611/NewFeatures.java View File

@@ -70,7 +70,7 @@ public class NewFeatures extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(NewFeatures.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("newfeatures-tests.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java View File

@@ -413,7 +413,7 @@ public class Ajc1612Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc1612.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc162/Ajc162Tests.java View File

@@ -216,7 +216,7 @@ public class Ajc162Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(Ajc162Tests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc162.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc163/Ajc163Tests.java View File

@@ -303,7 +303,7 @@ public class Ajc163Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(Ajc163Tests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc163.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc164/Ajc164Tests.java View File

@@ -416,7 +416,7 @@ public class Ajc164Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc164.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc164/DeclareMixinTests.java View File

@@ -150,7 +150,7 @@ public class DeclareMixinTests extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(DeclareMixinTests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("declareMixin.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc164/JointpointIdTests.java View File

@@ -32,7 +32,7 @@ public class JointpointIdTests extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(JointpointIdTests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("joinpointid.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc165/Ajc165Tests.java View File

@@ -117,7 +117,7 @@ public class Ajc165Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc165.xml");
}


+ 3
- 2
tests/src/test/java/org/aspectj/systemtest/ajc165/WorldTests.java View File

@@ -37,8 +37,9 @@ public class WorldTests extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(WorldTests.class);
}

protected File getSpecFile() {
return new File("../tests/src/org/aspectj/systemtest/ajc165/world.xml");
protected java.net.URL getSpecFile() {
return getClassResource("world.xml");
// return new File("../tests/src/org/aspectj/systemtest/ajc165/world.xml");
}

}

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc166/Ajc166Tests.java View File

@@ -98,7 +98,7 @@ public class Ajc166Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(Ajc166Tests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc166.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc167/Ajc167Tests.java View File

@@ -82,7 +82,7 @@ public class Ajc167Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc167.xml");
}


+ 3
- 2
tests/src/test/java/org/aspectj/systemtest/ajc167/IntertypeTests.java View File

@@ -70,8 +70,9 @@ public class IntertypeTests extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(IntertypeTests.class);
}

protected File getSpecFile() {
return new File("../tests/src/org/aspectj/systemtest/ajc167/intertype.xml");
protected java.net.URL getSpecFile() {
return getClassResource("intertype.xml");
// return new File("../tests/src/org/aspectj/systemtest/ajc167/intertype.xml");
}

}

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc167/OverweavingTests.java View File

@@ -77,7 +77,7 @@ public class OverweavingTests extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(OverweavingTests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("overweaving.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc169/Ajc169Tests.java View File

@@ -246,7 +246,7 @@ public class Ajc169Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc169.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc169/IntertypeTests.java View File

@@ -207,7 +207,7 @@ public class IntertypeTests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("intertype.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc169/TransparentWeavingTests.java View File

@@ -237,7 +237,7 @@ public class TransparentWeavingTests extends org.aspectj.testing.XMLBasedAjcTest
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("transparentweaving.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc170/Ajc170Tests.java View File

@@ -302,7 +302,7 @@ public class Ajc170Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc170.xml");
}


+ 3
- 2
tests/src/test/java/org/aspectj/systemtest/ajc170/IndyTests.java View File

@@ -49,8 +49,9 @@ public class IndyTests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
return new File("../tests/src/org/aspectj/systemtest/ajc170/indy.xml");
protected java.net.URL getSpecFile() {
return getClassResource("indy.xml");
// return new File("../tests/src/org/aspectj/systemtest/ajc170/indy.xml");
}

}

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests.java View File

@@ -68,7 +68,7 @@ public class Ajc171Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc171.xml");
}


+ 3
- 2
tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests_need17jre.java View File

@@ -36,8 +36,9 @@ public class Ajc171Tests_need17jre extends org.aspectj.testing.XMLBasedAjcTestCa
}

@Override
protected File getSpecFile() {
return new File("../tests/src/org/aspectj/systemtest/ajc171/ajc171.xml");
protected java.net.URL getSpecFile() {
return getClassResource("ajc171.xml");
// return new File("../tests/src/org/aspectj/systemtest/ajc171/ajc171.xml");
}

}

+ 3
- 2
tests/src/test/java/org/aspectj/systemtest/ajc171/NewFeatures.java View File

@@ -66,8 +66,9 @@ public class NewFeatures extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
return new File("../tests/src/org/aspectj/systemtest/ajc171/newfeatures-tests.xml");
protected java.net.URL getSpecFile() {
return getClassResource("newfeatures-tests.xml");
// return new File("../tests/src/org/aspectj/systemtest/ajc171/newfeatures-tests.xml");
}

}

+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc172/Ajc172Tests.java View File

@@ -203,7 +203,7 @@ public class Ajc172Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc172.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc173/Ajc173Tests.java View File

@@ -77,7 +77,7 @@ public class Ajc173Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc173.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc174/Ajc174Tests.java View File

@@ -89,7 +89,7 @@ public class Ajc174Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc174.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc175/Ajc175Tests.java View File

@@ -35,7 +35,7 @@ public class Ajc175Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(Ajc175Tests.class);
}

protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc175.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc180/Ajc180Tests.java View File

@@ -52,7 +52,7 @@ public class Ajc180Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc180.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc181/Ajc181Tests.java View File

@@ -55,7 +55,7 @@ public class Ajc181Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc181.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc1810/Ajc1810Tests.java View File

@@ -170,7 +170,7 @@ public class Ajc1810Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc1810.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java View File

@@ -83,7 +83,7 @@ public class Ajc1811Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc1811.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc182/Ajc182Tests.java View File

@@ -43,7 +43,7 @@ public class Ajc182Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("tests.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc183/Ajc183Tests.java View File

@@ -92,7 +92,7 @@ public class Ajc183Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc183.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc184/Ajc184Tests.java View File

@@ -113,7 +113,7 @@ public class Ajc184Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc184.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc185/Ajc185Tests.java View File

@@ -61,7 +61,7 @@ public class Ajc185Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc185.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc186/Ajc186Tests.java View File

@@ -155,7 +155,7 @@ public class Ajc186Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc186.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc187/Ajc187Tests.java View File

@@ -56,7 +56,7 @@ public class Ajc187Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc187.xml");
}


+ 1
- 1
tests/src/test/java/org/aspectj/systemtest/ajc188/Ajc188Tests.java View File

@@ -48,7 +48,7 @@ public class Ajc188Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}

@Override
protected File getSpecFile() {
protected java.net.URL getSpecFile() {
return getClassResource("ajc188.xml");
}


+ 0
- 0
tests/src/test/java/org/aspectj/systemtest/ajc189/Ajc189Tests.java View File


Some files were not shown because too many files changed in this diff

Write Preview
Loading…
Cancel
Save