diff options
| author | Alexander Kriegisch <Alexander@Kriegisch.name> | 2022-04-02 08:22:42 +0700 |
|---|---|---|
| committer | Alexander Kriegisch <Alexander@Kriegisch.name> | 2022-04-02 08:24:04 +0700 |
| commit | 651e92a3285606537cfa47913adc17ce90bc22c8 (patch) | |
| tree | e0fb94bf0758d5f2f09437aee383713220b57232 /build | |
| parent | cefa5d6bfcb92ea66e6fccd68fa922dba914a420 (diff) | |
| download | aspectj-651e92a3285606537cfa47913adc17ce90bc22c8.tar.gz aspectj-651e92a3285606537cfa47913adc17ce90bc22c8.zip | |
Remove AspectJ Browser (ajbrowser) code and documentation
Closes #148.
TODO: Should more AJDE stuff be removed?
Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
Diffstat (limited to 'build')
8 files changed, 13 insertions, 28 deletions
diff --git a/build/build-properties.xml b/build/build-properties.xml index c735b855b..febfddfec 100644 --- a/build/build-properties.xml +++ b/build/build-properties.xml @@ -109,7 +109,7 @@ <property file="${aspectj.modules.build.dir}/junit-patterns.properties"/> <property name="aspectj.tools.modules.13" - value="ajbrowser,ajde,ajde.core,ajdoc,asm,bridge,loadtime,org.aspectj.ajdt.core,runtime,taskdefs,util,weaver"/> + value="ajde,ajde.core,ajdoc,asm,bridge,loadtime,org.aspectj.ajdt.core,runtime,taskdefs,util,weaver"/> <property name="aspectj.tools.modules.15" value="loadtime5,aspectj5rt,weaver5"/> <condition property="aspectj.tools.modules" diff --git a/build/build.xml b/build/build.xml index f5a6eef8f..a5f33476a 100644 --- a/build/build.xml +++ b/build/build.xml @@ -474,10 +474,6 @@ To use testing client jar in tests, </antcall> </target> - <target name="ajbrowser-all" > - <build-module-all module="ajbrowser"/> - </target> - <target name="ajdoc-all"> <build-module-all module="ajdoc"/> </target> diff --git a/build/products/aspectj/install/finish.html b/build/products/aspectj/install/finish.html index 204deb550..229f3a21a 100644 --- a/build/products/aspectj/install/finish.html +++ b/build/products/aspectj/install/finish.html @@ -6,17 +6,17 @@ <body> -<p>The automatic installation process is complete. +<p>The automatic installation process is complete. We recommend you complete the installation as follows:</p> <ol> - <li>Add <b><code>${installer.output.aspectjrt}</code></b> + <li>Add <b><code>${installer.output.aspectjrt}</code></b> to your CLASSPATH. - This small .jar file contains classes required by any + This small .jar file contains classes required by any program compiled with the ajc compiler. </li> - <li>Modify your PATH to include + <li>Modify your PATH to include <code> <b>${installer.output.dir.bin}</b></code>. - This will make it easier to run ajc and ajbrowser. + This will make it easier to run ajc. </li> </ol> diff --git a/build/src/main/java/$installer$/org/aspectj/Main.java b/build/src/main/java/$installer$/org/aspectj/Main.java index e4c649094..fa98b8ed0 100644 --- a/build/src/main/java/$installer$/org/aspectj/Main.java +++ b/build/src/main/java/$installer$/org/aspectj/Main.java @@ -1331,8 +1331,6 @@ class InstallPane extends WizardPane { LaunchScriptMaker lsm = new LaunchScriptMaker(context); lsm.writeScript("ajc"); lsm.writeScript("ajdoc"); - //lsm.writeScript("ajdb"); - lsm.writeScript("ajbrowser"); // Moved to the bin dir in 1.2.1 // we should now come back and make the generation of this diff --git a/build/src/main/resources/$installer$/org/aspectj/resources/finish.html b/build/src/main/resources/$installer$/org/aspectj/resources/finish.html index 204deb550..229f3a21a 100644 --- a/build/src/main/resources/$installer$/org/aspectj/resources/finish.html +++ b/build/src/main/resources/$installer$/org/aspectj/resources/finish.html @@ -6,17 +6,17 @@ <body> -<p>The automatic installation process is complete. +<p>The automatic installation process is complete. We recommend you complete the installation as follows:</p> <ol> - <li>Add <b><code>${installer.output.aspectjrt}</code></b> + <li>Add <b><code>${installer.output.aspectjrt}</code></b> to your CLASSPATH. - This small .jar file contains classes required by any + This small .jar file contains classes required by any program compiled with the ajc compiler. </li> - <li>Modify your PATH to include + <li>Modify your PATH to include <code> <b>${installer.output.dir.bin}</b></code>. - This will make it easier to run ajc and ajbrowser. + This will make it easier to run ajc. </li> </ol> diff --git a/build/src/test/java/org/aspectj/build/BuildModuleTests.java b/build/src/test/java/org/aspectj/build/BuildModuleTests.java index 181d84fcc..b95ed8fa9 100644 --- a/build/src/test/java/org/aspectj/build/BuildModuleTests.java +++ b/build/src/test/java/org/aspectj/build/BuildModuleTests.java @@ -86,9 +86,6 @@ public class BuildModuleTests extends TestCase { fail("" + UnknownFileCheck.STATIC_ERRORS); } } - public void testLicense_ajbrowser() { - checkLicense("ajbrowser"); - } public void testLicense_ajde() { checkLicense("ajde"); } @@ -308,4 +305,3 @@ public class BuildModuleTests extends TestCase { } } - diff --git a/build/src/test/java/org/aspectj/internal/build/BuildModuleTest.java b/build/src/test/java/org/aspectj/internal/build/BuildModuleTest.java index b8a6c6d15..21994404a 100644 --- a/build/src/test/java/org/aspectj/internal/build/BuildModuleTest.java +++ b/build/src/test/java/org/aspectj/internal/build/BuildModuleTest.java @@ -58,7 +58,7 @@ public class BuildModuleTest extends TestCase { private static final String[] SKIPS //= {}; = {"aspectjtools", "ajdoc", "aspectj5rt", "run-all-junit-tests", - "ajbrowser", "testing", "testing-drivers", "org.aspectj.ajdt.core", "weaver"}; + "testing", "testing-drivers", "org.aspectj.ajdt.core", "weaver"}; private static final String SKIP_MESSAGE = "BuildModuleTest: Define \"run.build.tests\" as a system " @@ -184,11 +184,6 @@ public class BuildModuleTest extends TestCase { fail(dupError); } } - public void testAjbrowser() { - checkBuild("ajbrowser", - "org.aspectj.tools.ajbrowser.Main", - new String[] {"-noExit", "-version"}); // compiler version - } public void testTestingUtils() { checkBuild("testing-util"); } diff --git a/build/src/test/java/org/aspectj/internal/build/ModulesTest.java b/build/src/test/java/org/aspectj/internal/build/ModulesTest.java index 5b1692570..49de9fe1c 100644 --- a/build/src/test/java/org/aspectj/internal/build/ModulesTest.java +++ b/build/src/test/java/org/aspectj/internal/build/ModulesTest.java @@ -44,7 +44,7 @@ public class ModulesTest extends TestCase { static { String[] names = { - "ajbrowser", "ajde", "ajdoc", "asm", + "ajde", "ajdoc", "asm", "bridge", "loadtime", "org.aspectj.ajdt.core", "runtime", "taskdefs", "testing-client", "testing-util", "tests", "util", "weaver"}; |