Andy Clement
5 years ago
35 changed files with 109 additions and 852 deletions
+ 1
- 1
ajde/src/main/java/org/aspectj/ajde/ui/swing/OptionsFrame.java
View File
| @@ -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) { | |||
+ 1
- 1
ajdoc/src/main/java/org/aspectj/tools/ajdoc/Main.java
View File
| @@ -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() { | |||
+ 1
- 1
ajdoc/src/test/java/org/aspectj/tools/ajdoc/ExecutionTestCase.java
View File
| @@ -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)); | |||
| } | |||
+ 50
- 19
bridge/pom.xml
View File
| @@ -1,25 +1,56 @@ | |||
| <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/maven-v4_0_0.xsd"> | |||
| <modelVersion>4.0.0</modelVersion> | |||
| 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"> | |||
| <modelVersion>4.0.0</modelVersion> | |||
| <parent> | |||
| <groupId>org.aspectj</groupId> | |||
| <artifactId>aspectj-parent</artifactId> | |||
| <version>1.9.3.BUILD-SNAPSHOT</version> | |||
| <relativePath>..</relativePath> | |||
| </parent> | |||
| <parent> | |||
| <groupId>org.aspectj</groupId> | |||
| <artifactId>aspectj-parent</artifactId> | |||
| <version>1.9.3.BUILD-SNAPSHOT</version> | |||
| <relativePath>..</relativePath> | |||
| </parent> | |||
| <artifactId>bridge</artifactId> | |||
| <packaging>jar</packaging> | |||
| <name>bridge</name> | |||
| <artifactId>bridge</artifactId> | |||
| <packaging>jar</packaging> | |||
| <name>bridge</name> | |||
| <dependencies> | |||
| <dependency> | |||
| <groupId>org.aspectj</groupId> | |||
| <artifactId>util</artifactId> | |||
| <version>${project.version}</version> | |||
| </dependency> | |||
| </dependencies> | |||
| <build> | |||
| <plugins> | |||
| <plugin> | |||
| <groupId>org.codehaus.mojo</groupId> | |||
| <artifactId>build-helper-maven-plugin</artifactId> | |||
| <version>1.9.1</version> | |||
| <executions> | |||
| <execution> | |||
| <id>build.time</id> | |||
| <goals> | |||
| <goal>timestamp-property</goal> | |||
| </goals> | |||
| <configuration> | |||
| <name>version.time_text</name> | |||
| <pattern>EEEE MMM d, yyyy 'at' HH:mm:ss z</pattern> | |||
| <timeZone>America/Los_Angeles</timeZone> | |||
| <!-- build.time: Monday Feb 4, 2019 at 23:50:25 GMT --> | |||
| </configuration> | |||
| </execution> | |||
| </executions> | |||
| </plugin> | |||
| </plugins> | |||
| <resources> | |||
| <resource> | |||
| <directory>src/main/resources</directory> | |||
| <filtering>true</filtering> | |||
| </resource> | |||
| </resources> | |||
| </build> | |||
| <dependencies> | |||
| <dependency> | |||
| <groupId>org.aspectj</groupId> | |||
| <artifactId>util</artifactId> | |||
| <version>${project.version}</version> | |||
| </dependency> | |||
| </dependencies> | |||
| </project> | |||
+ 36
- 3
bridge/src/main/java/org/aspectj/bridge/Version.java
View File
| @@ -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; | |||
| } | |||
| } | |||
+ 2
- 0
bridge/src/main/resources/org/aspectj/bridge/version.properties
View File
| @@ -0,0 +1,2 @@ | |||
| version.text=${project.version} | |||
| version.time_text=${version.time_text} | |||
+ 3
- 3
bridge/src/test/java/org/aspectj/bridge/VersionTest.java
View File
| @@ -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); | |||
| } | |||
| } | |||
+ 0
- 48
build.xml
View File
| @@ -1,48 +0,0 @@ | |||
| <?xml version="1.0"?> | |||
| <project name="run-all-junit-tests" basedir="build" default="all"> | |||
| <!-- redirect to build/build.xml to build from modules root --> | |||
| <!-- user should still set up build/local.properties --> | |||
| <property name="aspectj.modules.dir" location="${basedir}/.."/> | |||
| <macrodef name="aj-ant"> | |||
| <attribute name="target"/> | |||
| <sequential> | |||
| <ant inheritAll="false" target="@{target}" dir="${basedir}"/> | |||
| </sequential> | |||
| </macrodef> | |||
| <target name="patch"> | |||
| <cvs output="patch"> | |||
| <commandline> | |||
| <argument line="-q diff -u -N"/> | |||
| </commandline> | |||
| </cvs> | |||
| </target> | |||
| <target name="clean"> | |||
| <aj-ant target="clean"/> | |||
| </target> | |||
| <target name="cleanall"> | |||
| <aj-ant target="clean"/> | |||
| </target> | |||
| <target name="all"> | |||
| <aj-ant target="all"/> | |||
| </target> | |||
| <target name="compile"> | |||
| <aj-ant target="all"/> | |||
| </target> | |||
| <target name="test"> | |||
| <aj-ant target="test"/> | |||
| </target> | |||
| <target name="jar"> | |||
| <aj-ant target="all"/> | |||
| </target> | |||
| </project> | |||
+ 3
- 0
build/pom.xml
View File
| @@ -57,7 +57,10 @@ | |||
| </goals> | |||
| <configuration> | |||
| <name>build.time</name> | |||
| <!-- | |||
| <pattern>E MMM d, YYYY 'at' HH:MM:SS z</pattern> | |||
| --> | |||
| <pattern>EEEE MMM d, yyyy 'at' HH:mm:ss z</pattern> | |||
| <timeZone>America/Los_Angeles</timeZone> | |||
| <!-- build.time: Monday Feb 4, 2019 at 23:50:25 GMT --> | |||
| </configuration> | |||
+ 0
- 11
eclipse.plugin/.project
View File
| @@ -1,11 +0,0 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
| <projectDescription> | |||
| <name>eclipse.plugin</name> | |||
| <comment></comment> | |||
| <projects> | |||
| </projects> | |||
| <buildSpec> | |||
| </buildSpec> | |||
| <natures> | |||
| </natures> | |||
| </projectDescription> | |||
+ 0
- 6
eclipse.plugin/README
View File
| @@ -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. | |||
+ 0
- 161
eclipse.plugin/build.xml
View File
| @@ -1,161 +0,0 @@ | |||
| <!-- ====================================================================== --> | |||
| <!-- Copyright (c) 2005 Contributors --> | |||
| <!-- All rights reserved. --> | |||
| <!-- This program and the accompanying materials are made available --> | |||
| <!-- under the terms of the Eclipse Public License v1.0 --> | |||
| <!-- which accompanies this distribution and is available at --> | |||
| <!-- http://www.eclipse.org/legal/epl-v10.html --> | |||
| <!-- --> | |||
| <!-- Contributors: (See CVS checkin's) --> | |||
| <!-- ====================================================================== --> | |||
| <project name="eclipse.plugins" default="eclipse.plugins" basedir="."> | |||
| <property name="aspectj.modules.dir" location="${basedir}/.."/> | |||
| <import file="${aspectj.modules.dir}/build/build-properties.xml" /> | |||
| <target name="info"> | |||
| <echo> | |||
| 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). | |||
| </echo> | |||
| </target> | |||
| <target name="init-eclipse-plugins" depends="init-properties"> | |||
| <property name="ep.dir" | |||
| location="${aspectj.modules.dir}/eclipse.plugin" | |||
| /> | |||
| <condition property="build.version.eclipse.plugins" | |||
| value="9.9.9" | |||
| > | |||
| <equals arg1="DEVELOPMENT" arg2="${build.version.long}" /> | |||
| </condition> | |||
| <condition property="build.version.eclipse.plugins" | |||
| value="${build.version.long}" | |||
| > | |||
| <not> | |||
| <equals arg1="DEVELOPMENT" | |||
| arg2="${build.version.long}" | |||
| /> | |||
| </not> | |||
| </condition> | |||
| <jar-property name="ep.aspectjrt.jar" | |||
| location="${aj.dist.dir}/tools/lib/aspectjrt.jar" | |||
| /> | |||
| <property name="ep.eclipse.dist.dir" | |||
| location="${aj.dist.dir}/ide/eclipse" | |||
| /> | |||
| </target> | |||
| <target name="eclipse.plugins" | |||
| depends="do-rt,do-source,do-ajde,do-doc" | |||
| /> | |||
| <target name="do-rt" depends="init-eclipse-plugins"> | |||
| <property name="name.rt" value="org.aspectj.aspectjrt" /> | |||
| <mkdir dir="${ep.eclipse.dist.dir}/${name.rt}" /> | |||
| <copy todir="${ep.eclipse.dist.dir}/${name.rt}" | |||
| file="${ep.aspectjrt.jar}" | |||
| /> | |||
| <build-eclipse-plugin name="${name.rt}" /> | |||
| </target> | |||
| <target name="do-source" depends="init-eclipse-plugins"> | |||
| <property name="name.source" | |||
| value="org.aspectj.ajde.source" | |||
| /> | |||
| <clean-dir dir="${ep.eclipse.dist.dir}/${name.source}/src" /> | |||
| <copy todir="${ep.eclipse.dist.dir}/${name.source}/src" | |||
| file="${aspectj.modules.dir}/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip" | |||
| /> | |||
| <!-- verify source dirs included: | |||
| grep 'kind="src"' */.classpath | sed '/testsrc/d;/path="\//d;s|\/.*path="|\/|;s|".*||' | |||
| compare filelist: ${aspectj.tools.modules} | |||
| --> | |||
| <zip destfile="${ep.eclipse.dist.dir}/${name.source}/src/aspectjsrc.zip" | |||
| > | |||
| <fileset dir="${aspectj.modules.dir}/ajbrowser/src" /> | |||
| <fileset dir="${aspectj.modules.dir}/ajde/src" /> | |||
| <fileset dir="${aspectj.modules.dir}/ajde.core/src" /> | |||
| <fileset dir="${aspectj.modules.dir}/ajdoc/src" /> | |||
| <fileset dir="${aspectj.modules.dir}/asm/src" /> | |||
| <fileset dir="${aspectj.modules.dir}/aspectj5rt/java5-src" | |||
| /> | |||
| <fileset dir="${aspectj.modules.dir}/aspectj5rt/src" /> | |||
| <fileset dir="${aspectj.modules.dir}/bridge/src" /> | |||
| <fileset dir="${aspectj.modules.dir}/loadtime/src" /> | |||
| <fileset dir="${aspectj.modules.dir}/org.aspectj.matcher/src" /> | |||
| <fileset dir="${aspectj.modules.dir}/loadtime5/java5-src" | |||
| /> | |||
| <fileset dir="${aspectj.modules.dir}/org.aspectj.ajdt.core/src" | |||
| /> | |||
| <!--fileset dir="${aspectj.modules.dir}/org.aspectj.lib/src" | |||
| /--> | |||
| <fileset dir="${aspectj.modules.dir}/runtime/src" /> | |||
| <fileset dir="${aspectj.modules.dir}/taskdefs/src" /> | |||
| <fileset dir="${aspectj.modules.dir}/util/src" /> | |||
| <fileset dir="${aspectj.modules.dir}/weaver/src" /> | |||
| <fileset dir="${aspectj.modules.dir}/weaver5/java5-src" /> | |||
| </zip> | |||
| <build-eclipse-plugin name="${name.source}" /> | |||
| </target> | |||
| <target name="do-ajde" depends="init-eclipse-plugins"> | |||
| <property name="name.ajde" value="org.aspectj.ajde" /> | |||
| <jar-property name="ep.aspectjtools.jar" | |||
| location="${aj.dist.dir}/tools/lib/aspectjtools.jar" | |||
| /> | |||
| <clean-dir dir="${ep.eclipse.dist.dir}/${name.ajde}" /> | |||
| <copy todir="${ep.eclipse.dist.dir}/${name.ajde}"> | |||
| <fileset file="${ep.aspectjrt.jar}" /> | |||
| <fileset file="${ep.aspectjtools.jar}" /> | |||
| </copy> | |||
| <jar destfile="${ep.eclipse.dist.dir}/${name.ajde}/ajde.jar"> | |||
| <zipfileset src="${ep.aspectjtools.jar}" | |||
| includes="org/aspectj/**" | |||
| /> | |||
| <!-- TODO dangerous assumption: only org.aspectj? not org.eclipse or org.osgi? --> | |||
| </jar> | |||
| <build-eclipse-plugin name="${name.ajde}" /> | |||
| </target> | |||
| <target name="do-doc" depends="init-eclipse-plugins"> | |||
| <available property="ep.docs.available" | |||
| file="${aj.dist.dir}/docs/doc/examples/build.xml" | |||
| /> | |||
| <fail unless="ep.docs.available" | |||
| message="no doc in ${aj.dist.dir}" | |||
| /> | |||
| <property name="name.doc" value="org.aspectj.ajde.doc" /> | |||
| <clean-dir dir="${ep.eclipse.dist.dir}/${name.doc}/doc" /> | |||
| <copy todir="${ep.eclipse.dist.dir}/${name.doc}/doc"> | |||
| <fileset dir="${aj.dist.dir}/docs/doc" /> | |||
| </copy> | |||
| <build-eclipse-plugin name="${name.doc}" /> | |||
| </target> | |||
| <macrodef name="build-eclipse-plugin"> | |||
| <attribute name="name" /> | |||
| <sequential> | |||
| <mkdir dir="${ep.eclipse.dist.dir}/@{name}" /> | |||
| <copy todir="${ep.eclipse.dist.dir}/@{name}"> | |||
| <fileset dir="${ep.dir}/@{name}" /> | |||
| </copy> | |||
| <replace file="${ep.eclipse.dist.dir}/@{name}/plugin.xml" | |||
| token="build.version.eclipse.plugins" | |||
| value="${build.version.eclipse.plugins}" | |||
| /> | |||
| <jar destfile="${ep.eclipse.dist.dir}/@{name}_${build.version.eclipse.plugins}.jar" | |||
| > | |||
| <fileset dir="${ep.eclipse.dist.dir}/@{name}" /> | |||
| </jar> | |||
| </sequential> | |||
| </macrodef> | |||
| </project> | |||
+ 0
- 61
eclipse.plugin/diff-build-results.sh
View File
| @@ -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 | |||
+ 0
- 28
eclipse.plugin/org.aspectj.ajde.doc/about.html
View File
| @@ -1,28 +0,0 @@ | |||
| <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> | |||
| <html> | |||
| <head> | |||
| <title>About</title> | |||
| <meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> | |||
| </head> | |||
| <body lang="EN-US"> | |||
| <h3>About This Content</h3> | |||
| <p>May 2, 2006</p> | |||
| <h3>License</h3> | |||
| <p>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 <a href="../../org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>. | |||
| For purposes of the EPL, "Program" will mean the Content.</p> | |||
| <p>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 <a href="/">http://www.eclipse.org</a>.</p> | |||
| </body> | |||
| </html> | |||
+ 0
- 13
eclipse.plugin/org.aspectj.ajde.doc/plugin.properties
View File
| @@ -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 | |||
+ 0
- 22
eclipse.plugin/org.aspectj.ajde.doc/plugin.xml
View File
| @@ -1,22 +0,0 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
| <plugin | |||
| id="org.aspectj.ajde.doc" | |||
| name="%pluginName" | |||
| version="build.version.eclipse.plugins" | |||
| provider-name="%providerName"> | |||
| <runtime> | |||
| </runtime> | |||
| <requires> | |||
| <import plugin="org.eclipse.help"/> | |||
| </requires> | |||
| <extension point="org.eclipse.help.toc"> | |||
| <toc file="toc.xml" primary="true"/> | |||
| <toc file="toc_ajquickref.xml"/> | |||
| <toc file="toc_ajprogguide.xml"/> | |||
| <toc file="toc_ajsemantics.xml"/> | |||
| </extension> | |||
| </plugin> | |||
+ 0
- 21
eclipse.plugin/org.aspectj.ajde.doc/toc.xml
View File
| @@ -1,21 +0,0 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
| <?NLS TYPE="org.eclipse.help.toc"?> | |||
| <!-- ============================================================================= --> | |||
| <!-- Define topics for the main guide --> | |||
| <!-- ============================================================================= --> | |||
| <toc label="AspectJ"> | |||
| <topic label="Quick Reference"> | |||
| <link toc="toc_ajquickref.xml" /> | |||
| </topic> | |||
| <topic label="Programming Guide"> | |||
| <link toc="toc_ajprogguide.xml" /> | |||
| </topic> | |||
| <topic label="AspectJ Language Semantics"> | |||
| <link toc="toc_ajsemantics.xml" /> | |||
| </topic> | |||
| <topic label="API Documentation" href="doc/api/index.html"/> | |||
| <topic label="FAQ" href="doc/faq.html"/> | |||
| <topic label="README for v1.1" href="doc/README-11.html"/> | |||
| <topic label="Porting Notes" href="doc/porting.html"/> | |||
| <topic label="AspectJ on the WWW" href="http://www.eclipse.org/aspectj"/> | |||
| </toc> | |||
+ 0
- 100
eclipse.plugin/org.aspectj.ajde.doc/toc_ajprogguide.xml
View File
| @@ -1,100 +0,0 @@ | |||
| <toc label="AspectJ Programming Guide"> | |||
| <topic label="Preface" href="doc/progguide/preface.html"/> | |||
| <topic label="1. Getting Started with AspectJ" href="doc/progguide/starting.html"> | |||
| <topic label="Introduction" href="doc/progguide/starting.html#starting-intro"/> | |||
| <topic label="Introduction to AspectJ" href="doc/progguide/starting-aspectj.html"> | |||
| <topic label="The Dynamic Join Point Model" href="doc/progguide/starting-aspectj.html#d0e181"/> | |||
| <topic label="Pointcuts" href="doc/progguide/starting-aspectj.html#d0e194"/> | |||
| <topic label="Advice" href="doc/progguide/starting-aspectj.html#d0e304"/> | |||
| <topic label="Inter-type declarations" href="doc/progguide/starting-aspectj.html#d0e422"/> | |||
| <topic label="Aspects" href="doc/progguide/starting-aspectj.html#d0e491"/> | |||
| </topic> | |||
| <topic label="Development Aspects" href="doc/progguide/starting-development.html"> | |||
| <topic label="Tracing" href="doc/progguide/starting-development.html#d0e513"/> | |||
| <topic label="Profiling and Logging" href="doc/progguide/starting-development.html#d0e541"/> | |||
| <topic label="Pre- and Post-Conditions" href="doc/progguide/starting-development.html#d0e586"/> | |||
| <topic label="Contract Enforcement" href="doc/progguide/starting-development.html#d0e624"/> | |||
| <topic label="Configuration Management" href="doc/progguide/starting-development.html#d0e658"/> | |||
| </topic> | |||
| <topic label="Production Aspects" href="doc/progguide/starting-production.html"> | |||
| <topic label="Change Monitoring" href="doc/progguide/starting-production.html#d0e671"/> | |||
| <topic label="Context Passing" href="doc/progguide/starting-production.html#d0e742"/> | |||
| <topic label="Providing Consistent Behavior" href="doc/progguide/starting-production.html#starting-production-consistentBehavior"/> | |||
| </topic> | |||
| <topic label="Conclusion" href="doc/progguide/starting-conclusion.html"/> | |||
| </topic> | |||
| <topic label="2. The AspectJ Language" href="doc/progguide/language.html"> | |||
| <topic label="Introduction" href="doc/progguide/language.html#language-intro"/> | |||
| <topic label="The Anatomy of an Aspect" href="doc/progguide/language-anatomy.html"> | |||
| <topic label="An Example Aspect" href="doc/progguide/language-anatomy.html#d0e863"/> | |||
| <topic label="Pointcuts" href="doc/progguide/language-anatomy.html#d0e880"/> | |||
| <topic label="Advice" href="doc/progguide/language-anatomy.html#d0e923"/> | |||
| </topic> | |||
| <topic label="Join Points and Pointcuts" href="doc/progguide/language-joinPoints.html"> | |||
| <topic label="Some Example Pointcuts" href="doc/progguide/language-joinPoints.html#d0e1018"/> | |||
| <topic label="call vs. execution" href="doc/progguide/language-joinPoints.html#d0e1288"/> | |||
| <topic label="Pointcut composition" href="doc/progguide/language-joinPoints.html#d0e1334"/> | |||
| <topic label="Pointcut Parameters" href="doc/progguide/language-joinPoints.html#d0e1438"/> | |||
| <topic label="Example: Handle Liveness" href="doc/progguide/language-joinPoints.html#d0e1564"/> | |||
| </topic> | |||
| <topic label="Advice" href="doc/progguide/language-advice.html"/> | |||
| <topic label="Inter-type declarations" href="doc/progguide/language-interType.html"> | |||
| <topic label="Inter-type Scope" href="doc/progguide/language-interType.html#d0e1812"/> | |||
| <topic label="Example: Point Assertions" href="doc/progguide/language-interType.html#d0e1837"/> | |||
| </topic> | |||
| <topic label="thisJoinPoint" href="doc/progguide/language-thisJoinPoint.html"/> | |||
| </topic> | |||
| <topic label="3. Examples" href="doc/progguide/examples.html"> | |||
| <topic label="Introduction" href="doc/progguide/examples.html#examples-intro"/> | |||
| <topic label="Obtaining, Compiling and Running the Examples" href="doc/progguide/examples-howto.html"/> | |||
| <topic label="Basic Techniques" href="doc/progguide/examples-basic.html"> | |||
| <topic label="Join Points and thisJoinPoint" href="doc/progguide/examples-basic.html#examples-joinPoints"/> | |||
| <topic label="Roles and Views" href="doc/progguide/examples-basic.html#examples-roles"/> | |||
| </topic> | |||
| <topic label="Development Aspects" href="doc/progguide/examples-development.html"> | |||
| <topic label="Tracing using aspects" href="doc/progguide/examples-development.html#d0e2474"/> | |||
| </topic> | |||
| <topic label="Production Aspects" href="doc/progguide/examples-production.html"> | |||
| <topic label="A Bean Aspect" href="doc/progguide/examples-production.html#d0e2676"/> | |||
| <topic label="The Subject/Observer Protocol" href="doc/progguide/examples-production.html#d0e2858"/> | |||
| <topic label="A Simple Telecom Simulation" href="doc/progguide/examples-production.html#d0e2995"/> | |||
| </topic> | |||
| <topic label="Reusable Aspects" href="doc/progguide/examples-reusable.html"> | |||
| <topic label="Tracing using Aspects, Revisited" href="doc/progguide/examples-reusable.html#d0e3339"/> | |||
| </topic> | |||
| </topic> | |||
| <topic label="4. Idioms" href="doc/progguide/idioms.html"> | |||
| <topic label="Introduction" href="doc/progguide/idioms.html#idioms-intro"/> | |||
| </topic> | |||
| <topic label="5. Pitfalls" href="doc/progguide/pitfalls.html"> | |||
| <topic label="Introduction" href="doc/progguide/pitfalls.html#pitfalls-intro"/> | |||
| <topic label="Infinite loops" href="doc/progguide/pitfalls-infiniteLoops.html"/> | |||
| </topic> | |||
| <topic label="Implementation Limitations" href="doc/progguide/limitations.html"/> | |||
| </toc> | |||
+ 0
- 12
eclipse.plugin/org.aspectj.ajde.doc/toc_ajquickref.xml
View File
| @@ -1,12 +0,0 @@ | |||
| <toc label="AspectJ Quick Reference"> | |||
| <topic label="Pointcuts" href="doc/progguide/quick.html#quick-pointcuts"/> | |||
| <topic label="Type Patterns" href="doc/progguide/quick-typePatterns.html"/> | |||
| <topic label="Advice" href="doc/progguide/quick-advice.html"/> | |||
| <topic label="Inter-type member declarations" href="doc/progguide/quick-interType.html"/> | |||
| <topic label="Other declarations" href="doc/progguide/quick-other.html"/> | |||
| <topic label="Aspects" href="doc/progguide/quick-aspectAssociations.html"/> | |||
| <topic label="PDF version (Letter)" href="doc/quick.pdf"/> | |||
| <topic label="PDF version (A4)" href="doc/quickA4.pdf"/> | |||
| </toc> | |||
+ 0
- 42
eclipse.plugin/org.aspectj.ajde.doc/toc_ajsemantics.xml
View File
| @@ -1,42 +0,0 @@ | |||
| <toc label="AspectJ Language Semantics" href="doc/progguide/semantics.html"> | |||
| <topic label="Introduction" href="doc/progguide/semantics.html#semantics-intro"/> | |||
| <topic label="Join Points" href="doc/progguide/semantics-joinPoints.html"/> | |||
| <topic label="Pointcuts" href="doc/progguide/semantics-pointcuts.html"> | |||
| <topic label="Pointcut definition" href="doc/progguide/semantics-pointcuts.html#d0e4929"/> | |||
| <topic label="Context exposure" href="doc/progguide/semantics-pointcuts.html#d0e4971"/> | |||
| <topic label="Primitive pointcuts" href="doc/progguide/semantics-pointcuts.html#d0e5019"/> | |||
| <topic label="Signatures" href="doc/progguide/semantics-pointcuts.html#d0e5320"/> | |||
| <topic label="Matching" href="doc/progguide/semantics-pointcuts.html#d0e5368"/> | |||
| <topic label="Type patterns" href="doc/progguide/semantics-pointcuts.html#d0e5550"/> | |||
| </topic> | |||
| <topic label="Advice" href="doc/progguide/semantics-advice.html"> | |||
| <topic label="Advice modifiers" href="doc/progguide/semantics-advice.html#d0e5795"/> | |||
| <topic label="Advice and checked exceptions" href="doc/progguide/semantics-advice.html#d0e5803"/> | |||
| <topic label="Advice precedence" href="doc/progguide/semantics-advice.html#d0e5867"/> | |||
| <topic label="Reflective access to the join point" href="doc/progguide/semantics-advice.html#d0e5944"/> | |||
| </topic> | |||
| <topic label="Static crosscutting" href="doc/progguide/semantics-declare.html"> | |||
| <topic label="Inter-type member declarations" href="doc/progguide/semantics-declare.html#d0e6005"/> | |||
| <topic label="Access modifiers" href="doc/progguide/semantics-declare.html#d0e6165"/> | |||
| <topic label="Conflicts" href="doc/progguide/semantics-declare.html#d0e6180"/> | |||
| <topic label="Extension and Implementation" href="doc/progguide/semantics-declare.html#d0e6274"/> | |||
| <topic label="Interfaces with members" href="doc/progguide/semantics-declare.html#d0e6317"/> | |||
| <topic label="Warnings and Errors" href="doc/progguide/semantics-declare.html#d0e6361"/> | |||
| <topic label="Softened exceptions" href="doc/progguide/semantics-declare.html#d0e6393"/> | |||
| <topic label="Advice Precedence" href="doc/progguide/semantics-declare.html#d0e6432"/> | |||
| <topic label="Statically determinable pointcuts" href="doc/progguide/semantics-declare.html#d0e6495"/> | |||
| </topic> | |||
| <topic label="Aspects" href="doc/progguide/semantics-aspects.html"> | |||
| <topic label="Aspect Extension" href="doc/progguide/semantics-aspects.html#d0e6539"/> | |||
| <topic label="Aspect instantiation" href="doc/progguide/semantics-aspects.html#d0e6559"/> | |||
| <topic label="Aspect privilege" href="doc/progguide/semantics-aspects.html#d0e6722"/> | |||
| </topic> | |||
| </toc> | |||
+ 0
- 86
eclipse.plugin/org.aspectj.ajde.source/about.html
View File
| @@ -1,86 +0,0 @@ | |||
| <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> | |||
| <html> | |||
| <head> | |||
| <title>About</title> | |||
| <meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> | |||
| </head> | |||
| <body lang="EN-US"> | |||
| <h3>About This Content</h3> | |||
| <p>May 2, 2006</p> | |||
| <h3>License</h3> | |||
| <p>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 <a href="../../org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>. | |||
| For purposes of the EPL, "Program" will mean the Content.</p> | |||
| <p>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 <a href="/">http://www.eclipse.org</a>.</p> | |||
| <h3>Third Party Content</h3> | |||
| <p>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.</p> | |||
| <em> | |||
| <h4>BCEL v5.1</h4> | |||
| <p>This product contains software developed by the | |||
| Apache Software Foundation (<a href="http://www.apache.org/">http://www.apache.org</a>).</p> | |||
| <p>AspectJ includes a modified version of the Apache Jakarta Byte Code Engineering Library (BCEL) v5.1. | |||
| BCEL is available at <a href="http://jakarta.apache.org/bcel/">http://jakarta.apache.org/bcel/</a>. 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</p> | |||
| <h4>ASM v2.2.1</h4> | |||
| <p>AspectJ includes a binary version of ASM v2.2.1 (<a href="http://asm.objectweb.org/index.html">http://asm.objectweb.org/</a>) | |||
| The source code for ASM is available from the ObjectWeb download site at | |||
| <a href="http://asm.objectweb.org/download/">http://asm.objectweb.org/download/</a>. | |||
| <p>The ASM license is available at <a href="http://asm.objectweb.org/license.html">http://asm.objectweb.org/license.html</a>. | |||
| The license is also reproduced here: | |||
| </p> | |||
| <pre>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. | |||
| </pre> | |||
| </em> | |||
| </body> | |||
| </html> | |||
+ 0
- 13
eclipse.plugin/org.aspectj.ajde.source/plugin.properties
View File
| @@ -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 | |||
+ 0
- 7
eclipse.plugin/org.aspectj.ajde.source/plugin.xml
View File
| @@ -1,7 +0,0 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
| <plugin | |||
| id="org.aspectj.ajde.source" | |||
| name="%pluginName" | |||
| version="build.version.eclipse.plugins" | |||
| provider-name="%providerName"> | |||
| </plugin> | |||
+ 0
- 86
eclipse.plugin/org.aspectj.ajde/about.html
View File
| @@ -1,86 +0,0 @@ | |||
| <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> | |||
| <html> | |||
| <head> | |||
| <title>About</title> | |||
| <meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> | |||
| </head> | |||
| <body lang="EN-US"> | |||
| <h3>About This Content</h3> | |||
| <p>May 2, 2006</p> | |||
| <h3>License</h3> | |||
| <p>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 <a href="../../org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>. | |||
| For purposes of the EPL, "Program" will mean the Content.</p> | |||
| <p>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 <a href="/">http://www.eclipse.org</a>.</p> | |||
| <h3>Third Party Content</h3> | |||
| <p>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.</p> | |||
| <em> | |||
| <h4>BCEL v5.1</h4> | |||
| <p>This product contains software developed by the | |||
| Apache Software Foundation (<a href="http://www.apache.org/">http://www.apache.org</a>).</p> | |||
| <p>AspectJ includes a modified version of the Apache Jakarta Byte Code Engineering Library (BCEL) v5.1. | |||
| BCEL is available at <a href="http://jakarta.apache.org/bcel/">http://jakarta.apache.org/bcel/</a>. 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</p> | |||
| <h4>ASM v2.2.1</h4> | |||
| <p>AspectJ includes a binary version of ASM v2.2.1 (<a href="http://asm.objectweb.org/index.html">http://asm.objectweb.org/</a>) | |||
| The source code for ASM is available from the ObjectWeb download site at | |||
| <a href="http://asm.objectweb.org/download/">http://asm.objectweb.org/download/</a>. | |||
| <p>The ASM license is available at <a href="http://asm.objectweb.org/license.html">http://asm.objectweb.org/license.html</a>. | |||
| The license is also reproduced here: | |||
| </p> | |||
| <pre>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. | |||
| </pre> | |||
| </em> | |||
| </body> | |||
| </html> | |||
+ 0
- 13
eclipse.plugin/org.aspectj.ajde/plugin.properties
View File
| @@ -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 | |||
+ 0
- 25
eclipse.plugin/org.aspectj.ajde/plugin.xml
View File
| @@ -1,25 +0,0 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
| <plugin | |||
| id="org.aspectj.ajde" | |||
| name="%pluginName" | |||
| version="build.version.eclipse.plugins" | |||
| provider-name="%providerName"> | |||
| <runtime> | |||
| <library name="ajde.jar"> | |||
| <export name="*"/> | |||
| <!-- M4 bug <packages prefixes="org.aspectj"/> --> | |||
| </library> | |||
| <library name="aspectjrt.jar"> | |||
| <export name="*"/> | |||
| <!-- <packages prefixes="org.aspectj"/> --> | |||
| </library> | |||
| <library name="aspectjtools.jar"> | |||
| <!-- this library is deliberately NOT exported --> | |||
| </library> | |||
| </runtime> | |||
| </plugin> | |||
+ 0
- 28
eclipse.plugin/org.aspectj.aspectjrt/about.html
View File
| @@ -1,28 +0,0 @@ | |||
| <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> | |||
| <html> | |||
| <head> | |||
| <title>About</title> | |||
| <meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> | |||
| </head> | |||
| <body lang="EN-US"> | |||
| <h3>About This Content</h3> | |||
| <p>May 2, 2006</p> | |||
| <h3>License</h3> | |||
| <p>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 <a href="../../org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>. | |||
| For purposes of the EPL, "Program" will mean the Content.</p> | |||
| <p>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 <a href="/">http://www.eclipse.org</a>.</p> | |||
| </body> | |||
| </html> | |||
+ 0
- 13
eclipse.plugin/org.aspectj.aspectjrt/plugin.properties
View File
| @@ -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 | |||
+ 0
- 16
eclipse.plugin/org.aspectj.aspectjrt/plugin.xml
View File
| @@ -1,16 +0,0 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
| <plugin | |||
| id="org.aspectj.aspectjrt" | |||
| name="%pluginName" | |||
| version="build.version.eclipse.plugins" | |||
| provider-name="%providerName"> | |||
| <runtime> | |||
| <library name="aspectjrt.jar"> | |||
| <packages prefixes="org.aspectj"/> | |||
| </library> | |||
| </runtime> | |||
| </plugin> | |||
+ 1
- 1
org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/BuildArgParser.java
View File
| @@ -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); | |||
+ 5
- 5
org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
View File
| @@ -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<String> 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; | |||
| } | |||
+ 2
- 2
org.aspectj.ajdt.core/src/main/java/org/aspectj/tools/ajc/Main.java
View File
| @@ -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 | |||
+ 2
- 2
org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties
View File
| @@ -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} | |||
+ 1
- 1
org.aspectj.matcher/src/main/java/org/aspectj/weaver/Dump.java
View File
| @@ -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() { | |||
+ 1
- 1
weaver/src/main/java/org/aspectj/weaver/tools/WeavingAdaptor.java
View File
| @@ -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() { | |||
Loading…