Merge branch 'maintenance'

Author: seidewitz

.gitignore

@@ -0,0 +1,3 @@
+bin/
+target/
+.DS_Store

.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

.mvn/wrapper/maven-wrapper.jar

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

.mvn/wrapper/maven-wrapper.properties

@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Alf-Reference-Implementation</name>
+	<name>alf-ri</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>

.project

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,17 @@
+dist: trusty
+language: java
+jdk:
+- oraclejdk8
+install: skip
+script:
+- ./mvnw -v
+- ./mvnw clean install -f master
+- ./mvnw clean install
+- ./mvnw clean install -f tycho-pom.xml
+notifications:
+  email:
+    on_success: change
+    on_failure: change
+cache:
+  directories:
+  - "$HOME/.m2"

.travis.yml

@@ -1,5 +1,5 @@
 # Action Language for UML (Alf) <br> Open Source Reference Implementation
-_Copyright &copy; 2011-2019 Model Driven Solutions, Inc._
+_Copyright &copy; 2011-2020 Model Driven Solutions, Inc._
 
 Alf is an action language for UML developed in response to the OMG <em>Concrete 
 Syntax for a UML Action Language</em> Request for Proposals. The Alf specification 
@@ -27,8 +27,8 @@ The latest version of the implementation is available at http://alf.modeldriven.
 
 ## Licensing
 
-Data Access Technology, Inc. is copyright owner of the source code for this implementation. For licensing terms, see 
-the file [`LICENSING.txt`](https://github.com/ModelDriven/Alf-Reference-Implementation/blob/master/dist/LICENSING.txt).
+Model Driven Solutions, Inc., (formerly Data Access Technology, Inc.) is copyright owner of the source code for this implementation. 
+For licensing terms, see the file [`LICENSING.txt`](https://github.com/ModelDriven/Alf-Reference-Implementation/blob/master/dist/LICENSING.txt).
 
 ## Installation
 
@@ -41,9 +41,14 @@ The installation directory includes Unix (BASH) shell scripts and DOS batch file
 By default, the `Libraries` subdirectory is expected  to be in the same directory as the scripts. 
 If you move it, set the environment variable `ALF_LIB` to its path.
 
+## Further Information
+
+The following sections describe the project structure and build steps for the implementation. For further information on using it, 
+see the [wiki](https://github.com/ModelDriven/Alf-Reference-Implementation/wiki/Home). 
+
 ## Projects
 
-The implementation source is organized into four [Eclipse](http://www.eclipse.org) projects. Eclipse 4.6 or later is required.
+The base implementation source is organized into the following [Eclipse](http://www.eclipse.org) projects. The build is currently tested on Eclipse 2020-06 (4.16).
 
 * `org.modeldriven.alf` - This is the base project, including the
 Alf parser, static semantic checking and generic mapping to fUML.
@@ -64,10 +69,88 @@ metamodel implementation (v5.2.0 or later). It depends on Eclipse plugins and mu
 * `org.modeldriven.alf.eclipse.moka` - This project extends the 
 `org.modeldriven.alf.eclipse` project to allow compiled Alf text to be executed
 using the fUML execution engine from the [Moka framework](http://wiki.eclipse.org/Papyrus/UserGuide/ModelExecution)
-for model execution in the [Eclipse Papyrus](http://www.eclipse.org/papyrus) modeling tool (v3.1.0 or later).
+for model execution in the [Eclipse Papyrus](http://www.eclipse.org/papyrus) modeling tool (specifically v3.1.0).
 It depends on Eclipse plugins and must be built in an Eclipse environment. (Note: This project was called
 `org.modeldriven.alf.eclipse.papyrus` in previous versions of the reference implementation.)
 
-## Further Information
+* `org.modeldriven.alf.tests` - This project provides automated tests.
+
+## Building
+
+### Maven project structure
+
+The project structure under Maven allows building the regular Java modules and the Eclipse-based modules (using [Tycho](https://www.eclipse.org/tycho/)).
+
+#### Master module build
+
+* `./master/pom.xml` - a module that provides standard configurations to be shared by all modules, including the root module.
+
+#### Regular Java build
+
+* `./pom.xml` - the parent module for the regular Java modules
+* `./org.modeldriven.alf` - see [Projects](#Projects) above.
+* `./org.modeldriven.alf.fuml.impl` - see [Projects](#Projects) above.
+* `./org.modeldriven.alf.tests` - see [Projects](#Projects) above.
+* `./org.modeldriven.alf.bundle` - produces a OSGi-bundle from org.modeldriven.alf
+* `./org.modeldriven.alf.fuml.impl.bundle` - produces a OSGi-bundle from org.modeldriven.alf.fuml.impl
+
+#### Tycho build
+
+* `./tycho-pom.xml` - a convenience module that can be used for performing the Tycho (OSGi) aware part of the build. Equivalent to building `./tycho-parent/pom.xml`
+* `./tycho-parent/pom.xml` - the parent module for the Tycho/Eclipse modules
+* `./org.modeldriven.alf.eclipse` - see [Projects](#Projects) above.
+* `./org.modeldriven.alf.eclipse.moka` - see [Projects](#Projects) above.
+
+### Steps
+
+1. Master module build (required only once):
+
+```
+mvn clean install -f master
+```
+
+2. To perform the regular Java build, execute from the root directory:
+
+```
+mvn clean install
+```
+
+3. To perform the Tycho build, execute from the root directory:
+
+```
+mvn clean install -f tycho-pom.xml
+```
+
+## Importing into Eclipse
+
+### Prerequisites
+
+1. Eclipse JDT - Java development tools
+2. Eclipse PDE - Plug-in development environment
+3. Eclipse M2E - Maven Integration in Eclipse
+
+By downloading the Eclipse SDK, you should have all those components.
+
+### Importing as Eclipse projects
+
+That is the simplest way to import the codebase into Eclipse.
+
+1. Import the root directory location using the "Existing Projects into Workspace" option, making sure to select the "Search for nested projects" option.
+2. Configure the [target platform](https://help.eclipse.org/latest/index.jsp?topic=%2Forg.eclipse.pde.doc.user%2Fguide%2Ftools%2Fpreference_pages%2Ftarget_platform.htm) 
+preferences to use the `alf-ri.target` definition you just imported
+3. You may be asked to install M2E extensions to support Tycho projects - this is recommended.
+
+
+### Importing as Maven modules
+
+Alternately, you can import the code as Maven modules, which is recommended to obtain a configuration that is consistent with how the Maven build operates on the codebase.
+
+1. Import the repository root directory and all its children artifacts as "Existing Maven projects" (note that will *not* include the `alf.eclipse` and `alf.eclipse.moka projects`, 
+as they are *not* modules for the base Maven build). 
+**Note:** If you see a build problem with the message "*Duplicate bundle executions found. Please remove any explicitly defined bundle executions in your pom.xml.*", 
+make any non-content change to the POM file and save it, which should make the error go away.
+2. Import the `tycho-parent` directory and all its children artifacts as "Existing Maven projects".
+3. Configure the [target platform](https://help.eclipse.org/latest/index.jsp?topic=%2Forg.eclipse.pde.doc.user%2Fguide%2Ftools%2Fpreference_pages%2Ftarget_platform.htm) preferences 
+to use the `alf-ri.target` definition you just imported
+4. You may be asked to install M2E extensions to support Tycho projects - this is recommended.
 
-For further information on using the implementation, see the [wiki](https://github.com/ModelDriven/Alf-Reference-Implementation/wiki/Home). 

README.md

@@ -1,8 +1,8 @@
 Action Language for UML (Alf) Open Source Reference Implementation
 Licensing Information
 
-Data Access Technologies Inc.(Model Driven Solutions) is the copyright owner
-of the source code in this software entitled the Action Language for UML (Alf) 
+Model Driven Solutions, Inc. (formerly Data Access Technologies Inc.) is the copyright 
+owner of the source code in this software entitled the Action Language for UML (Alf) 
 Open Source Reference Implementation (the "Software"). The copyright owner hereby 
 licenses such Software to you for use under the GNU General Public License (GPL) 
 version 3 (at http://www.gnu.org/licenses/gpl-3.0.html and attached hereto as