From de2f7c753232c9bb4c8e602ac841206a0b72260a Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Mon, 11 Feb 2019 10:46:03 -0800 Subject: [PATCH] Fix version tagging for info strings --- .../aspectj/ajde/ui/swing/OptionsFrame.java | 2 +- .../java/org/aspectj/tools/ajdoc/Main.java | 2 +- .../tools/ajdoc/ExecutionTestCase.java | 2 +- bridge/pom.xml | 69 +++++--- .../main/java/org/aspectj/bridge/Version.java | 39 ++++- .../org/aspectj/bridge/version.properties | 2 + .../java/org/aspectj/bridge/VersionTest.java | 6 +- build.xml | 48 ------ build/pom.xml | 3 + eclipse.plugin/.project | 11 -- eclipse.plugin/README | 6 - eclipse.plugin/build.xml | 161 ------------------ eclipse.plugin/diff-build-results.sh | 61 ------- .../org.aspectj.ajde.doc/about.html | 28 --- .../org.aspectj.ajde.doc/plugin.properties | 13 -- .../org.aspectj.ajde.doc/plugin.xml | 22 --- eclipse.plugin/org.aspectj.ajde.doc/toc.xml | 21 --- .../org.aspectj.ajde.doc/toc_ajprogguide.xml | 100 ----------- .../org.aspectj.ajde.doc/toc_ajquickref.xml | 12 -- .../org.aspectj.ajde.doc/toc_ajsemantics.xml | 42 ----- .../org.aspectj.ajde.source/about.html | 86 ---------- .../org.aspectj.ajde.source/plugin.properties | 13 -- .../org.aspectj.ajde.source/plugin.xml | 7 - eclipse.plugin/org.aspectj.ajde/about.html | 86 ---------- .../org.aspectj.ajde/plugin.properties | 13 -- eclipse.plugin/org.aspectj.ajde/plugin.xml | 25 --- .../org.aspectj.aspectjrt/about.html | 28 --- .../org.aspectj.aspectjrt/plugin.properties | 13 -- .../org.aspectj.aspectjrt/plugin.xml | 16 -- .../org/aspectj/ajdt/ajc/BuildArgParser.java | 2 +- .../internal/core/builder/AjBuildManager.java | 10 +- .../main/java/org/aspectj/tools/ajc/Main.java | 4 +- .../org/aspectj/ajdt/ajc/messages.properties | 4 +- .../main/java/org/aspectj/weaver/Dump.java | 2 +- .../aspectj/weaver/tools/WeavingAdaptor.java | 2 +- 35 files changed, 109 insertions(+), 852 deletions(-) create mode 100644 bridge/src/main/resources/org/aspectj/bridge/version.properties delete mode 100644 build.xml delete mode 100644 eclipse.plugin/.project delete mode 100644 eclipse.plugin/README delete mode 100644 eclipse.plugin/build.xml delete mode 100644 eclipse.plugin/diff-build-results.sh delete mode 100644 eclipse.plugin/org.aspectj.ajde.doc/about.html delete mode 100644 eclipse.plugin/org.aspectj.ajde.doc/plugin.properties delete mode 100644 eclipse.plugin/org.aspectj.ajde.doc/plugin.xml delete mode 100644 eclipse.plugin/org.aspectj.ajde.doc/toc.xml delete mode 100644 eclipse.plugin/org.aspectj.ajde.doc/toc_ajprogguide.xml delete mode 100644 eclipse.plugin/org.aspectj.ajde.doc/toc_ajquickref.xml delete mode 100644 eclipse.plugin/org.aspectj.ajde.doc/toc_ajsemantics.xml delete mode 100644 eclipse.plugin/org.aspectj.ajde.source/about.html delete mode 100644 eclipse.plugin/org.aspectj.ajde.source/plugin.properties delete mode 100644 eclipse.plugin/org.aspectj.ajde.source/plugin.xml delete mode 100644 eclipse.plugin/org.aspectj.ajde/about.html delete mode 100644 eclipse.plugin/org.aspectj.ajde/plugin.properties delete mode 100644 eclipse.plugin/org.aspectj.ajde/plugin.xml delete mode 100644 eclipse.plugin/org.aspectj.aspectjrt/about.html delete mode 100644 eclipse.plugin/org.aspectj.aspectjrt/plugin.properties delete mode 100644 eclipse.plugin/org.aspectj.aspectjrt/plugin.xml diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/OptionsFrame.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/OptionsFrame.java index 130183676..3eb852346 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/OptionsFrame.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/OptionsFrame.java @@ -112,7 +112,7 @@ public class OptionsFrame extends JFrame { this.setSize(500, 500); this.setLocation(200, 100); - version_label.setText("Version: " + Version.text); + version_label.setText("Version: " + Version.getText()); built_label.setText("Built: " + new Date(Version.getTime()).toString()); } catch(Exception e) { diff --git a/ajdoc/src/main/java/org/aspectj/tools/ajdoc/Main.java b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/Main.java index 2e622ba9c..e4cf8be44 100644 --- a/ajdoc/src/main/java/org/aspectj/tools/ajdoc/Main.java +++ b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/Main.java @@ -799,7 +799,7 @@ public class Main implements Config { } static String getVersion() { - return "ajdoc version " + Version.text; + return "ajdoc version " + Version.getText(); } public static boolean hasAborted() { diff --git a/ajdoc/src/test/java/org/aspectj/tools/ajdoc/ExecutionTestCase.java b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/ExecutionTestCase.java index 837d7ef8c..721977f2c 100644 --- a/ajdoc/src/test/java/org/aspectj/tools/ajdoc/ExecutionTestCase.java +++ b/ajdoc/src/test/java/org/aspectj/tools/ajdoc/ExecutionTestCase.java @@ -23,7 +23,7 @@ public class ExecutionTestCase extends AjdocTestCase { public void testVersionMatch() { String ajdocVersion = Main.getVersion(); - String compilerVersion = Version.text; + String compilerVersion = Version.getText(); assertTrue("version check", ajdocVersion.endsWith(compilerVersion)); } diff --git a/bridge/pom.xml b/bridge/pom.xml index 03ddca049..5d851137e 100644 --- a/bridge/pom.xml +++ b/bridge/pom.xml @@ -1,25 +1,56 @@ - 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/maven-v4_0_0.xsd"> + 4.0.0 - - org.aspectj - aspectj-parent - 1.9.3.BUILD-SNAPSHOT - .. - + + org.aspectj + aspectj-parent + 1.9.3.BUILD-SNAPSHOT + .. + - bridge - jar - bridge + bridge + jar + bridge + + + + org.aspectj + util + ${project.version} + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + build.time + + timestamp-property + + + version.time_text + EEEE MMM d, yyyy 'at' HH:mm:ss z + America/Los_Angeles + + + + + + + + + src/main/resources + true + + + - - - org.aspectj - util - ${project.version} - - diff --git a/bridge/src/main/java/org/aspectj/bridge/Version.java b/bridge/src/main/java/org/aspectj/bridge/Version.java index 367efaf73..321741120 100644 --- a/bridge/src/main/java/org/aspectj/bridge/Version.java +++ b/bridge/src/main/java/org/aspectj/bridge/Version.java @@ -13,9 +13,12 @@ package org.aspectj.bridge; +import java.io.IOException; +import java.net.URL; import java.text.ParsePosition; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.Properties; /** release-specific version information */ public class Version { @@ -29,16 +32,19 @@ public class Version { /** default time value for development version */ public static final long NOTIME = 0L; + public static final String UNREPLACED_TEXT = "${project.version}"; + public static final String UNREPLACED_TIME_TEXT = "${version.time_text}"; + /** set by build script */ - public static final String text = "DEVELOPMENT"; + private static String text;// = "DEVELOPMENT"; // VersionUptodate.java scans for "static final String text = " /** * Time text set by build script using SIMPLE_DATE_FORMAT. * (if DEVELOPMENT version, invalid) */ - public static final String time_text = "Tuesday Jan 15, 2019 at 00:53:54 GMT"; - + private static String time_text;// = "Tuesday Jan 15, 2019 at 00:53:54 GMT"; + /** * time in seconds-since-... format, used by programmatic clients. * (if DEVELOPMENT version, NOTIME) @@ -48,6 +54,25 @@ public class Version { /** format used by build script to set time_text */ public static final String SIMPLE_DATE_FORMAT = "EEEE MMM d, yyyy 'at' HH:mm:ss z"; + static { + try { + URL resource = Version.class.getResource("version.properties"); + Properties p = new Properties(); + p.load(resource.openStream()); + text = p.getProperty("version.text",""); + if (text.equals(UNREPLACED_TEXT)) { + text="DEVELOPMENT"; + } + time_text = p.getProperty("version.time_text",""); + if (time_text.equals(UNREPLACED_TIME_TEXT)) { + time_text=""; + } + } catch (IOException e) { + text="DEVELOPMENT"; + time_text = ""; + } + } + public static long getTime() { if (time==-1) { long foundTime = NOTIME; @@ -81,6 +106,14 @@ public class Version { } } } + + public static String getTimeText() { + return time_text; + } + + public static String getText() { + return text; + } } diff --git a/bridge/src/main/resources/org/aspectj/bridge/version.properties b/bridge/src/main/resources/org/aspectj/bridge/version.properties new file mode 100644 index 000000000..361c573ff --- /dev/null +++ b/bridge/src/main/resources/org/aspectj/bridge/version.properties @@ -0,0 +1,2 @@ +version.text=${project.version} +version.time_text=${version.time_text} diff --git a/bridge/src/test/java/org/aspectj/bridge/VersionTest.java b/bridge/src/test/java/org/aspectj/bridge/VersionTest.java index cee4c8450..70eb9d380 100644 --- a/bridge/src/test/java/org/aspectj/bridge/VersionTest.java +++ b/bridge/src/test/java/org/aspectj/bridge/VersionTest.java @@ -48,13 +48,13 @@ public class VersionTest extends TestCase { if (LangUtil.is11VMOrGreater()) { return; } - if (Version.time_text.equals("")) { + if (Version.getTimeText().equals("")) { return; // dev build, we can only test this on the build server. } Date date = new Date(Version.getTime()); SimpleDateFormat format = new SimpleDateFormat(Version.SIMPLE_DATE_FORMAT, Locale.getDefault()); - format.setTimeZone(TimeZone.getTimeZone("GMT")); + format.setTimeZone(TimeZone.getTimeZone("PST")); String timeString = format.format(date); - assertEquals(Version.time_text, timeString); + assertEquals(Version.getTimeText(), timeString); } } diff --git a/build.xml b/build.xml deleted file mode 100644 index 8258e80dd..000000000 --- a/build.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/pom.xml b/build/pom.xml index 0099d02a0..a9aa9f406 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -57,7 +57,10 @@ build.time + + EEEE MMM d, yyyy 'at' HH:mm:ss z America/Los_Angeles diff --git a/eclipse.plugin/.project b/eclipse.plugin/.project deleted file mode 100644 index 9afa19541..000000000 --- a/eclipse.plugin/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - eclipse.plugin - - - - - - - - diff --git a/eclipse.plugin/README b/eclipse.plugin/README deleted file mode 100644 index 515f3144a..000000000 --- a/eclipse.plugin/README +++ /dev/null @@ -1,6 +0,0 @@ -This project contains the files needed to build the Eclipse library and doc plugins for AspectJ. -The plugins themselves can only be built as the result of a master AspectJ build (../build/build.xml). - -During a build the docs are copied into the doc subdir of the doc plugin, -the built libraries are copied into the ajde plugin, and the source jars -are created and placed in the scr dir of the source plugin. diff --git a/eclipse.plugin/build.xml b/eclipse.plugin/build.xml deleted file mode 100644 index cbb60c8c0..000000000 --- a/eclipse.plugin/build.xml +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - - Assembles the Eclipse plugins. - - Relies on ../build/build-properties.xml for some definitions, and - the build must have produced the AspectJ distribution already. - - Define $${build.version.eclipse.plugins} to avoid "9.9.9" for - "DEVELOPMENT" (the default). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eclipse.plugin/diff-build-results.sh b/eclipse.plugin/diff-build-results.sh deleted file mode 100644 index e5ae6d0fb..000000000 --- a/eclipse.plugin/diff-build-results.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash -# Regression test when changing the build script. -# Compare new.zip and old.zip, assuming they contain build results -# aj-build/dist/ide/eclipse for two different versions of the build script -# (and comparing only the contents of the .jar files). -# [There must be a better way: diff support that recurses into .jar/.zip files] - -[ -n "$DEBUG" ] && set -vx - -jar="${JAVA_HOME}/bin/jar" - -errExit() { - echo "ERROR $1: $2" - exit "$1" -} - -# make this empty to avoid unzipping new.zip and old.zip -dozip="yes" -if [ -z "${dozip}" ] ; then - cd temp -else - rm -rf temp - mkdir temp - cd temp - for d in new old; do - [ -f ../$d.zip ] || errExit 2 "make $d.zip"; - mkdir $d - cd $d - $jar -xf ../../$d.zip - cd eclipse - ls *.jar | sort > ../../$d-names.txt - cd ../.. - done -fi - - diff *-names.txt > /dev/null || errExit 3 "expected same products" - for j in `cat new-names.txt`; do - mkdir $j-dir; - cd $j-dir - for d in new old; do - mkdir $d - cd $d - $jar xf ../../$d/eclipse/$j - dirpath=`pwd | sed 's|/cygdrive/c|c:|'` - for z in `find . -type f -name \*.jar -o -name \*.zip`; do - mkdir ${z}-dir - pushd ${z}-dir - $jar -xf $dirpath/${z} - popd - done - cd .. - done - diff -qr new old > diffs.txt - cd .. - done - cat */diffs.txt - wc -l */diffs.txt - - - - diff --git a/eclipse.plugin/org.aspectj.ajde.doc/about.html b/eclipse.plugin/org.aspectj.ajde.doc/about.html deleted file mode 100644 index 8b033adcc..000000000 --- a/eclipse.plugin/org.aspectj.ajde.doc/about.html +++ /dev/null @@ -1,28 +0,0 @@ - - - -About - - - - -

About This Content

- -

May 2, 2006

-

License

- -

The Eclipse Foundation makes available all content in this plug-in ("Content"). - Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the - Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available - at http://www.eclipse.org/legal/epl-v10.html. - For purposes of the EPL, "Program" will mean the Content.

- -

If you did not receive this Content directly from the Eclipse Foundation, the Content is - being redistributed by another party ("Redistributor") and different terms and conditions may - apply to your use of any object code in the Content. Check the RedistributorÕs license - that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise - indicated below, the terms and conditions of the EPL still apply to any source code in the Content - and such source code may be obtained at http://www.eclipse.org.

- - - \ No newline at end of file diff --git a/eclipse.plugin/org.aspectj.ajde.doc/plugin.properties b/eclipse.plugin/org.aspectj.ajde.doc/plugin.properties deleted file mode 100644 index dbe02b9a9..000000000 --- a/eclipse.plugin/org.aspectj.ajde.doc/plugin.properties +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################### -# Copyright (c) 2003 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: -# Adrian Colyer, George Harley - initial implementation -############################################################################### - -pluginName=AspectJ Documentation -providerName=Eclipse.org \ No newline at end of file diff --git a/eclipse.plugin/org.aspectj.ajde.doc/plugin.xml b/eclipse.plugin/org.aspectj.ajde.doc/plugin.xml deleted file mode 100644 index d75896184..000000000 --- a/eclipse.plugin/org.aspectj.ajde.doc/plugin.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/eclipse.plugin/org.aspectj.ajde.doc/toc.xml b/eclipse.plugin/org.aspectj.ajde.doc/toc.xml deleted file mode 100644 index bd032fac9..000000000 --- a/eclipse.plugin/org.aspectj.ajde.doc/toc.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/eclipse.plugin/org.aspectj.ajde.doc/toc_ajprogguide.xml b/eclipse.plugin/org.aspectj.ajde.doc/toc_ajprogguide.xml deleted file mode 100644 index e65cb498c..000000000 --- a/eclipse.plugin/org.aspectj.ajde.doc/toc_ajprogguide.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/eclipse.plugin/org.aspectj.ajde.doc/toc_ajquickref.xml b/eclipse.plugin/org.aspectj.ajde.doc/toc_ajquickref.xml deleted file mode 100644 index d46c894c2..000000000 --- a/eclipse.plugin/org.aspectj.ajde.doc/toc_ajquickref.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/eclipse.plugin/org.aspectj.ajde.doc/toc_ajsemantics.xml b/eclipse.plugin/org.aspectj.ajde.doc/toc_ajsemantics.xml deleted file mode 100644 index c5edb8d15..000000000 --- a/eclipse.plugin/org.aspectj.ajde.doc/toc_ajsemantics.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eclipse.plugin/org.aspectj.ajde.source/about.html b/eclipse.plugin/org.aspectj.ajde.source/about.html deleted file mode 100644 index 0ad401362..000000000 --- a/eclipse.plugin/org.aspectj.ajde.source/about.html +++ /dev/null @@ -1,86 +0,0 @@ - - - -About - - - - -

About This Content

- -

May 2, 2006

-

License

- -

The Eclipse Foundation makes available all content in this plug-in ("Content"). - Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the - Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available - at http://www.eclipse.org/legal/epl-v10.html. - For purposes of the EPL, "Program" will mean the Content.

- -

If you did not receive this Content directly from the Eclipse Foundation, the Content is - being redistributed by another party ("Redistributor") and different terms and conditions may - apply to your use of any object code in the Content. Check the RedistributorÕs license - that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise - indicated below, the terms and conditions of the EPL still apply to any source code in the Content - and such source code may be obtained at http://www.eclipse.org.

- -

Third Party Content

-

The Content includes items that have been sourced from third parties as set out below. If you - did not receive this Content directly from the Eclipse Foundation, the following is provided - for informational purposes only, and you should look to the RedistributorÕs license for - terms and conditions of use.

- - -

BCEL v5.1

-

This product contains software developed by the - Apache Software Foundation (http://www.apache.org).

- -

AspectJ includes a modified version of the Apache Jakarta Byte Code Engineering Library (BCEL) v5.1. - BCEL is available at http://jakarta.apache.org/bcel/. Source - code for the modified version of BCEL is available at Eclipse.org in the AspectJ source tree. This code - is made available under the Apache Software License v1.1

- -

ASM v2.2.1

-

AspectJ includes a binary version of ASM v2.2.1 (http://asm.objectweb.org/) - The source code for ASM is available from the ObjectWeb download site at - http://asm.objectweb.org/download/. -

The ASM license is available at http://asm.objectweb.org/license.html. - The license is also reproduced here: -

- -
Copyright (c) 2000-2005 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-
- - - - - - \ No newline at end of file diff --git a/eclipse.plugin/org.aspectj.ajde.source/plugin.properties b/eclipse.plugin/org.aspectj.ajde.source/plugin.properties deleted file mode 100644 index cefd4da60..000000000 --- a/eclipse.plugin/org.aspectj.ajde.source/plugin.properties +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################### -# Copyright (c) 2003 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: -# Adrian Colyer, George Harley - initial implementation -############################################################################### - -pluginName=AspectJ Source -providerName=Eclipse.org \ No newline at end of file diff --git a/eclipse.plugin/org.aspectj.ajde.source/plugin.xml b/eclipse.plugin/org.aspectj.ajde.source/plugin.xml deleted file mode 100644 index 45f44f5e3..000000000 --- a/eclipse.plugin/org.aspectj.ajde.source/plugin.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/eclipse.plugin/org.aspectj.ajde/about.html b/eclipse.plugin/org.aspectj.ajde/about.html deleted file mode 100644 index 0ad401362..000000000 --- a/eclipse.plugin/org.aspectj.ajde/about.html +++ /dev/null @@ -1,86 +0,0 @@ - - - -About - - - - -

About This Content

- -

May 2, 2006

-

License

- -

The Eclipse Foundation makes available all content in this plug-in ("Content"). - Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the - Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available - at http://www.eclipse.org/legal/epl-v10.html. - For purposes of the EPL, "Program" will mean the Content.

- -

If you did not receive this Content directly from the Eclipse Foundation, the Content is - being redistributed by another party ("Redistributor") and different terms and conditions may - apply to your use of any object code in the Content. Check the RedistributorÕs license - that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise - indicated below, the terms and conditions of the EPL still apply to any source code in the Content - and such source code may be obtained at http://www.eclipse.org.

- -

Third Party Content

-

The Content includes items that have been sourced from third parties as set out below. If you - did not receive this Content directly from the Eclipse Foundation, the following is provided - for informational purposes only, and you should look to the RedistributorÕs license for - terms and conditions of use.

- - -

BCEL v5.1

-

This product contains software developed by the - Apache Software Foundation (http://www.apache.org).

- -

AspectJ includes a modified version of the Apache Jakarta Byte Code Engineering Library (BCEL) v5.1. - BCEL is available at http://jakarta.apache.org/bcel/. Source - code for the modified version of BCEL is available at Eclipse.org in the AspectJ source tree. This code - is made available under the Apache Software License v1.1

- -

ASM v2.2.1

-

AspectJ includes a binary version of ASM v2.2.1 (http://asm.objectweb.org/) - The source code for ASM is available from the ObjectWeb download site at - http://asm.objectweb.org/download/. -

The ASM license is available at http://asm.objectweb.org/license.html. - The license is also reproduced here: -

- -
Copyright (c) 2000-2005 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-
- - - - - - \ No newline at end of file diff --git a/eclipse.plugin/org.aspectj.ajde/plugin.properties b/eclipse.plugin/org.aspectj.ajde/plugin.properties deleted file mode 100644 index 2e5cfd2d3..000000000 --- a/eclipse.plugin/org.aspectj.ajde/plugin.properties +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################### -# Copyright (c) 2003 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: -# Adrian Colyer, George Harley - initial implementation -############################################################################### - -pluginName=AspectJ -providerName=Eclipse.org \ No newline at end of file diff --git a/eclipse.plugin/org.aspectj.ajde/plugin.xml b/eclipse.plugin/org.aspectj.ajde/plugin.xml deleted file mode 100644 index 15def5bae..000000000 --- a/eclipse.plugin/org.aspectj.ajde/plugin.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/eclipse.plugin/org.aspectj.aspectjrt/about.html b/eclipse.plugin/org.aspectj.aspectjrt/about.html deleted file mode 100644 index 8b033adcc..000000000 --- a/eclipse.plugin/org.aspectj.aspectjrt/about.html +++ /dev/null @@ -1,28 +0,0 @@ - - - -About - - - - -

About This Content

- -

May 2, 2006

-

License

- -

The Eclipse Foundation makes available all content in this plug-in ("Content"). - Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the - Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available - at http://www.eclipse.org/legal/epl-v10.html. - For purposes of the EPL, "Program" will mean the Content.

- -

If you did not receive this Content directly from the Eclipse Foundation, the Content is - being redistributed by another party ("Redistributor") and different terms and conditions may - apply to your use of any object code in the Content. Check the RedistributorÕs license - that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise - indicated below, the terms and conditions of the EPL still apply to any source code in the Content - and such source code may be obtained at http://www.eclipse.org.

- - - \ No newline at end of file diff --git a/eclipse.plugin/org.aspectj.aspectjrt/plugin.properties b/eclipse.plugin/org.aspectj.aspectjrt/plugin.properties deleted file mode 100644 index 914f7b311..000000000 --- a/eclipse.plugin/org.aspectj.aspectjrt/plugin.properties +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################### -# Copyright (c) 2003 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: -# Adrian Colyer, George Harley - initial implementation -############################################################################### - -pluginName=AspectJ Runtime Library -providerName=Eclipse.org \ No newline at end of file diff --git a/eclipse.plugin/org.aspectj.aspectjrt/plugin.xml b/eclipse.plugin/org.aspectj.aspectjrt/plugin.xml deleted file mode 100644 index f83504372..000000000 --- a/eclipse.plugin/org.aspectj.aspectjrt/plugin.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/BuildArgParser.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/BuildArgParser.java index 66488fa8c..1b18b980d 100644 --- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/BuildArgParser.java +++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/BuildArgParser.java @@ -291,7 +291,7 @@ public class BuildArgParser extends Main { public void printVersion() { final String version = bind("misc.version", //$NON-NLS-1$ new String[] { bind("compiler.name"), //$NON-NLS-1$ - Version.text + " - Built: " + Version.time_text, bind("compiler.version"), //$NON-NLS-1$ + Version.getText() + " - Built: " + Version.getTimeText(), bind("compiler.version"), //$NON-NLS-1$ bind("compiler.copyright") //$NON-NLS-1$ }); System.out.println(version); diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java index 9c58c24a0..25557035a 100644 --- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java +++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java @@ -1331,7 +1331,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider, IBinarySour */ private String checkRtJar(AjBuildConfig buildConfig) { // omitting dev info - if (Version.text.equals(Version.DEVELOPMENT)) { + if (Version.getText().equals(Version.DEVELOPMENT) || Version.getText().endsWith("BUILD-SNAPSHOT")) { // in the development version we can't do this test usefully // MessageUtil.info(holder, "running development version of aspectj compiler"); return null; @@ -1342,7 +1342,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider, IBinarySour } String ret = null; - for (Iterator it = buildConfig.getFullClasspath().iterator(); it.hasNext();) { + for (Iterator it = buildConfig.getFullClasspath().iterator(); it.hasNext();) { File p = new File((String) it.next()); // pr112830, allow variations on aspectjrt.jar of the form aspectjrtXXXXXX.jar if (p.isFile() && p.getName().startsWith("aspectjrt") && p.getName().endsWith(".jar")) { @@ -1351,7 +1351,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider, IBinarySour String version = null; Manifest manifest = new JarFile(p).getManifest(); if (manifest == null) { - ret = "no manifest found in " + p.getAbsolutePath() + ", expected " + Version.text; + ret = "no manifest found in " + p.getAbsolutePath() + ", expected " + Version.getText(); continue; } Attributes attr = manifest.getAttributes("org/aspectj/lang/"); @@ -1367,8 +1367,8 @@ public class AjBuildManager implements IOutputClassFileNameProvider, IBinarySour // "running with development version of aspectjrt.jar in " + // p.getAbsolutePath()); return null; - } else if (!Version.text.equals(version)) { - ret = "bad version number found in " + p.getAbsolutePath() + " expected " + Version.text + " found " + } else if (!Version.getText().equals(version)) { + ret = "bad version number found in " + p.getAbsolutePath() + " expected " + Version.getText() + " found " + version; continue; } diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/tools/ajc/Main.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/tools/ajc/Main.java index c8b111ec3..4e8235cf2 100644 --- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/tools/ajc/Main.java +++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/tools/ajc/Main.java @@ -60,7 +60,7 @@ import org.aspectj.weaver.Dump; */ public class Main { /** Header used when rendering exceptions for users */ - public static final String THROWN_PREFIX = "Exception thrown from AspectJ " + Version.text + LangUtil.EOL + "" + LangUtil.EOL + public static final String THROWN_PREFIX = "Exception thrown from AspectJ " + Version.getText() + LangUtil.EOL + "" + LangUtil.EOL + "This might be logged as a bug already -- find current bugs at" + LangUtil.EOL + " http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=Compiler" + LangUtil.EOL + "" + LangUtil.EOL + "Bugs for exceptions thrown have titles File:line from the top stack, " + LangUtil.EOL @@ -70,7 +70,7 @@ public class Main { + "To make the bug a priority, please include a test program" + LangUtil.EOL + "that can reproduce this exception." + LangUtil.EOL; - private static final String OUT_OF_MEMORY_MSG = "AspectJ " + Version.text + " ran out of memory during compilation:" + private static final String OUT_OF_MEMORY_MSG = "AspectJ " + Version.getText() + " ran out of memory during compilation:" + LangUtil.EOL + LangUtil.EOL + "Please increase the memory available to ajc by editing the ajc script " + LangUtil.EOL + "found in your AspectJ installation directory. The -Xmx parameter value" + LangUtil.EOL + "should be increased from 64M (default) to 128M or even 256M." + LangUtil.EOL + LangUtil.EOL diff --git a/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties index d40571fb5..e9f6b6d65 100644 --- a/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties +++ b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties @@ -4,7 +4,7 @@ The -Xlintfile:lint.properties allows fine-grained control. In tools.jar, see org/aspectj/weaver/XlintDefault.properties for the default behavior and a template to copy. ### AspectJ-specific messages -compiler.name = AspectJ Compiler 1.9.2 +compiler.name = AspectJ Compiler compiler.version = Eclipse Compiler #6373b82afa49b(1-Oct-2018), 3.16 compiler.copyright = @@ -475,4 +475,4 @@ unit.missing = File {0} is missing output.noClassFileCreated = No .class file created for file named {0} because of an IOException. ### miscellaneous -misc.version = {0} ({1}) - {2} {3} +misc.version = {0} {1} - {2} {3} diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Dump.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Dump.java index 103e9fec2..0efd56782 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Dump.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Dump.java @@ -335,7 +335,7 @@ public class Dump { private void dumpAspectJProperties() { println("---- AspectJ Properties ---"); - println("AspectJ Compiler " + Version.text + " built on " + Version.time_text); + println("AspectJ Compiler " + Version.getText() + " built on " + Version.getTimeText()); } private void dumpDumpConfiguration() { diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/WeavingAdaptor.java b/weaver/src/main/java/org/aspectj/weaver/tools/WeavingAdaptor.java index a02400fb0..8b5beaac0 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/WeavingAdaptor.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/WeavingAdaptor.java @@ -239,7 +239,7 @@ public class WeavingAdaptor implements IMessageContext { if (Boolean.getBoolean(SHOW_WEAVE_INFO_PROPERTY)) { messageHandler.dontIgnore(IMessage.WEAVEINFO); } - info("AspectJ Weaver Version " + Version.text + " built on " + Version.time_text); //$NON-NLS-1$ + info("AspectJ Weaver Version " + Version.getText() + " built on " + Version.getTimeText()); //$NON-NLS-1$ } protected IMessageHandler getMessageHandler() { -- 2.39.5