tidyup

12 files changed, 252 insertions, 33 deletions

diff --git a/build/installer-resources/properties.txt b/build/installer-resources/properties.txt
deleted file mode 100644
index f2ee1b595..000000000
--- a/build/installer-resources/properties.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-installer.main.class: @installer.main.class@
-installer.basedir: aspectj@build.version.majorminor@
-build.version.long: @build.version.long@
-build.version.short: @build.version.short@
-build.date: @build.date@
-build.time: @build.time@
-copyright.allRights.from1998: @copyright.allRights.from1998@
diff --git a/build/pom.xml b/build/pom.xml
index 5dcf70b71..0099d02a0 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -1,33 +1,125 @@
 <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>build</artifactId>
-  <packaging>jar</packaging>
-  <name>build</name>
+	<artifactId>build</artifactId>
+	<packaging>jar</packaging>
+	<name>build</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>testing-util</artifactId>
-      <version>${project.version}</version>
-    </dependency>
+	<dependencies>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>testing-util</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 
-    <dependency>
-      <groupId>ant</groupId>
-      <artifactId>ant</artifactId>
-      <version>1.0</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/../lib/ant/lib/ant.jar</systemPath>
-    </dependency>
-  </dependencies>
+		<dependency>
+			<groupId>ant</groupId>
+			<artifactId>ant</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../lib/ant/lib/ant.jar</systemPath>
+		</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.date</id>
+						<goals>
+							<goal>timestamp-property</goal>
+						</goals>
+						<configuration>
+							<name>build.date</name>
+							<pattern>E MMM d, YYYY</pattern>
+							<timeZone>Europe/Zurich</timeZone>
+							<!-- build.date: Monday Feb 4, 2019 -->
+							<timeZone>America/Los_Angeles</timeZone>
+						</configuration>
+					</execution>
+					<execution>
+						<id>build.time</id>
+						<goals>
+							<goal>timestamp-property</goal>
+						</goals>
+						<configuration>
+							<name>build.time</name>
+							<pattern>E 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>
+					<execution>
+						<id>year</id>
+						<goals>
+							<goal>timestamp-property</goal>
+						</goals>
+						<configuration>
+							<name>build.year</name>
+							<pattern>YYYY</pattern>
+							<timeZone>America/Los_Angeles</timeZone>
+							<!-- year: 2019 -->
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
+		<pluginManagement>
+			<plugins>
+				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.codehaus.mojo
+										</groupId>
+										<artifactId>
+											build-helper-maven-plugin
+										</artifactId>
+										<versionRange>
+											[1.9.1,)
+										</versionRange>
+										<goals>
+											<goal>
+												timestamp-property
+											</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
 
 </project>
diff --git a/build/installer-resources/aspectjBanner.gif b/build/src/main/resources/$installer$/org/aspectj/resources/aspectjBanner.gif
index 0a943c343..0a943c343 100644
--- a/build/installer-resources/aspectjBanner.gif
+++ b/build/src/main/resources/$installer$/org/aspectj/resources/aspectjBanner.gif
diff --git a/build/src/main/resources/$installer$/org/aspectj/resources/configure-auto.html b/build/src/main/resources/$installer$/org/aspectj/resources/configure-auto.html
new file mode 100644
index 000000000..6da643ef5
--- /dev/null
+++ b/build/src/main/resources/$installer$/org/aspectj/resources/configure-auto.html
@@ -0,0 +1,17 @@
+<html>
+
+<head>
+<title>auto configure</title>
+</head>
+
+<body>
+
+<p>The installer has successfully found the path to your Java home (J2SE 1.4 or greater).
+This path will be used as the default Java location when generating
+script files for launching the AspectJ compiler and core tools. Unless
+you know that this path is wrong, we suggest that you press
+<b>Next</b> to continue.</p>
+
+</body>
+
+</html>
diff --git a/build/src/main/resources/$installer$/org/aspectj/resources/configure-hand.html b/build/src/main/resources/$installer$/org/aspectj/resources/configure-hand.html
new file mode 100644
index 000000000..888db63df
--- /dev/null
+++ b/build/src/main/resources/$installer$/org/aspectj/resources/configure-hand.html
@@ -0,0 +1,21 @@
+<html>
+
+<head>
+<title>configure</title>
+</head>
+
+<body>
+
+<p>The installer cannot find the path to your Java home (J2SE 1.4 or greater).  
+Please try to find this directory on your path now.  It will probably look
+something like <code>jdk1.4.1</code>.  If you can't find this
+directory now, you may continue with the install, but you will have
+to either edit your launch scripts by hand or to set the JAVA_HOME
+environment variable to point to the right location.
+</p>
+
+<p>Press <b>Next</b> when ready to continue.</p>
+
+</body>
+
+</html>
diff --git a/build/installer-resources/contents.txt b/build/src/main/resources/$installer$/org/aspectj/resources/contents.txt
index 275d2b4ff..275d2b4ff 100644
--- a/build/installer-resources/contents.txt
+++ b/build/src/main/resources/$installer$/org/aspectj/resources/contents.txt
diff --git a/build/src/main/resources/$installer$/org/aspectj/resources/finish.html b/build/src/main/resources/$installer$/org/aspectj/resources/finish.html
new file mode 100644
index 000000000..204deb550
--- /dev/null
+++ b/build/src/main/resources/$installer$/org/aspectj/resources/finish.html
@@ -0,0 +1,28 @@
+<html>
+
+<head>
+<title>finish</title>
+</head>
+
+<body>
+
+<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> 
+      to your CLASSPATH.
+      This small .jar file contains classes required by any 
+      program compiled with the ajc compiler.
+      </li>
+  <li>Modify your PATH to include 
+      <code> <b>${installer.output.dir.bin}</b></code>.
+      This will make it easier to run ajc and ajbrowser. 
+      </li>
+</ol>
+
+<p>These steps are described in more detail in <code>
+<b>${installer.output.readme}</b></code>.</p>
+
+</body>
+
+</html>
diff --git a/build/src/main/resources/$installer$/org/aspectj/resources/install-finish.html b/build/src/main/resources/$installer$/org/aspectj/resources/install-finish.html
new file mode 100644
index 000000000..14281a0bf
--- /dev/null
+++ b/build/src/main/resources/$installer$/org/aspectj/resources/install-finish.html
@@ -0,0 +1,12 @@
+<html>
+
+<body>
+
+<p>&nbsp;</p>
+
+<p>The automatic installation process is complete.&nbsp; Press <b>Next </b>for
+some important final instructions.</p>
+
+</body>
+
+</html>
diff --git a/build/src/main/resources/$installer$/org/aspectj/resources/install-start.html b/build/src/main/resources/$installer$/org/aspectj/resources/install-start.html
new file mode 100644
index 000000000..b375c68aa
--- /dev/null
+++ b/build/src/main/resources/$installer$/org/aspectj/resources/install-start.html
@@ -0,0 +1,13 @@
+<html>
+
+<body>
+
+<p>&nbsp;</p>
+
+<p>Now installing to ${installer.output.dir}...</p>
+
+<p>Press <b>Cancel</b> to interrupt the installation.</p>
+
+</body>
+
+</html>
diff --git a/build/src/main/resources/$installer$/org/aspectj/resources/intro.html b/build/src/main/resources/$installer$/org/aspectj/resources/intro.html
new file mode 100644
index 000000000..b29bb9484
--- /dev/null
+++ b/build/src/main/resources/$installer$/org/aspectj/resources/intro.html
@@ -0,0 +1,25 @@
+<html>
+<body>
+
+<h2 align="center">Installer for AspectJ 9 Development Kit<sup><small>TM</small></sup></h2>
+
+<p align="center">Version ${build.version.long} built on ${build.date}</p>
+<p>This installs the complete AspectJ 9 Development Kit (AJDK) distribution, with
+the compiler, aspect libraries, structure browser, ant tasks,
+documentation, and examples.  
+This distribution is covered by the Eclipse Public License (see
+        http://www.eclipse.org/legal/epl-v10.html).
+<p>
+For IDE integrations or source code, see the project home page at
+http://eclipse.org/aspectj</p>
+
+
+<p>${copyright.allRights.from1998}</p>
+<p></p>
+
+<p>Press <b>Next</b> to continue. At any time you may press <b>Cancel</b>
+to exit the installation process.</p>
+
+</body>
+
+</html>
diff --git a/build/src/main/resources/$installer$/org/aspectj/resources/location.html b/build/src/main/resources/$installer$/org/aspectj/resources/location.html
new file mode 100644
index 000000000..0398ce4a5
--- /dev/null
+++ b/build/src/main/resources/$installer$/org/aspectj/resources/location.html
@@ -0,0 +1,11 @@
+<html>
+
+<body>
+
+<p>Please select a directory into which to install AspectJ.</p>
+<p>Press <b>Install</b> to begin the installation process 
+   to this directory.</p>
+
+</body>
+
+</html>
diff --git a/build/src/main/resources/$installer$/org/aspectj/resources/properties.txt b/build/src/main/resources/$installer$/org/aspectj/resources/properties.txt
new file mode 100644
index 000000000..f3abaf4f4
--- /dev/null
+++ b/build/src/main/resources/$installer$/org/aspectj/resources/properties.txt
@@ -0,0 +1,7 @@
+installer.main.class: $installer$.org.aspectj.ToolsInstaller
+installer.basedir: aspectj${build.version.majorminor}
+build.version.long: ${project.version}
+build.version.short: ${project.version}
+build.date: ${build.date}
+build.time: ${build.time}
+copyright.allRights.from1998: Copyright (c) 1998-2001 Xerox Corporation, 2002 Palo Alto Research Center, Incorporated, 2003-${build.year} Contributors.  All rights reserved.