Merge pull request #774 from Systems-Modeling/ST6RI-943

ST6RI-943 Restore ability to install and run without Maven build

Author: seidewitz

README.adoc

@@ -41,6 +41,7 @@ image:oomph-projects.png[oomph projects]
 9. (Optional) For PlantUML visualization, GraphViz is needed.  Visit https://www.graphviz.org/download/ and download the appropriate package for your environment.
    * In the menu of Window > Preferences > PlantUML in Eclipse environment, you may set up the path to GraphViz executable if Eclipse cannot automatically find it.  For detail, visit https://plantuml.com/en/eclipse
 
+*Note.* If you are going to be changing code, you should do a Maven build once the installation build completes, as described in item 5 below.
 
 ==== Manual installation
 
@@ -62,22 +63,31 @@ image:oomph-projects.png[oomph projects]
    * `https://github.com/Systems-Modeling/SySML-v2-Pilot-Implementation.git`
 
 3. Import projects from the repository into your Eclipse workspace. This should include at least the projects:
-   * `org.omg.sysml`
    * `org.omg.kerml.expressions.xtext`
    * `org.omg.kerml.expressions.xtext.ide`
    * `org.omg.kerml.expressions.xtext.ui`
    * `org.omg.kerml.xtext`
    * `org.omg.kerml.xtext.ide`
    * `org.omg.kerml.xtext.ui`
+   * `org.omg.sysml`
+   * `org.omg.sysml.logic`
+   * `org.omg.sysml.logic.bundle`
+   * `org.omg.sysml.model`
+   * `org.omg.sysml.model.bundle`
+   * `org.omg.sysml.target`
    * `org.omg.sysml.xtext`
    * `org.omg.sysml.xtext.ide`
    * `org.omg.sysml.xtext.ui`
 
-4. https://maven.apache.org/[Maven] is used to perform a coordinated build of all projects (including packaging the SysML Interactive JAR file that is used by `org.omg.sysml.jupyter`). 
-        * To build the repository, invoke `mvn clean package` from the base `SysML-v2-Pilot-Implementation` directory.
-        * If you have https://www.eclipse.org/m2e/[M2Eclipse] installed (with the Tycho Project Configurators connector), it can also launch a Maven build in Eclipse using the launch configuration in `SysML-v2-Pilot-Implementation/launch`.
+4. In the project `org.omg.sysml.target`, open `org.omg.sysml.target.target`.
+   * Click the Refresh button on the right. When the refresh is complete, it should show "nnn plug-ins available" next to each URL.
+   * Click "Reload Target Platform" on the upper right. 
+   
+5. https://maven.apache.org/[Maven] is used to perform a coordinated build of all projects.
+   * To build the repository, invoke `mvn clean install` from the base `SysML-v2-Pilot-Implementation` directory.
+   * If you have https://www.eclipse.org/m2e/[M2Eclipse] installed (with the Tycho Project Configurators connector), it can also launch a Maven build in Eclipse using the launch configuration in `SysML-v2-Pilot-Implementation/launch`.
 
-=== Prototype SysML Implementation
+=== Runtime Editing Environment
 
 ==== Getting Started
 1. Right click on project `org.omg.sysml`, and select Run As > Eclipse Application. This should launch a new runtime Eclipse instance.
@@ -115,7 +125,7 @@ image:project-wizard.png[project wizard]
 
 5. Right-click the new project and select Configure > Convert to an Xtext project. This step sets up the indexing infrastructure necessary for resolving references between different files.
 
-6. Create any text files with `.kerml` or `.sysml` extensions to start working with a new file.  
+6. Create a text file with a `.kerml` or `.sysml` extension to start working with a new file.  
 
 **Note:** Adding the project references to an existing project can be done in the project Properties dialog available from the popup menu on the project in the Project References page.
 

org.omg.sysml.logic.bundle/.gitignore

@@ -1,3 +1,2 @@
 target/
-lib/
 model/

org.omg.sysml.logic.bundle/lib/org.omg.sysml.logic-0.60.0-SNAPSHOT.jar

@@ -30,22 +30,31 @@
     <plugins>
       <!-- Copy org.omg.sysml.logic jar in lib/ before the Tycho build -->
       <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>${maven-antrun-plugin.version}</version>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>${maven-resources-plugin.version}</version>
         <executions>
           <execution>
             <id>copy-jar-org.omg.sysml.logic</id>
             <phase>initialize</phase>
             <goals>
-              <goal>run</goal>
+              <goal>copy-resources</goal>
             </goals>
             <configuration>
-              <target>
-                <mkdir dir="${project.basedir}/lib"/>
-                <copy file="${project.basedir}/../org.omg.sysml.logic/target/org.omg.sysml.logic-${project.version}.jar"
-                      tofile="${project.basedir}/lib/org.omg.sysml.logic-${project.version}.jar"
-                      overwrite="true"/>
-              </target>
+              <outputDirectory>${project.basedir}/lib</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${project.basedir}/../org.omg.sysml.logic/target</directory>
+                  <includes>
+                    <include>org.omg.sysml.logic-*.jar</include>
+                  </includes>
+                  <excludes>
+                    <exclude>*-sources.jar</exclude>
+                    <exclude>*-tests.jar</exclude>
+                  </excludes>
+                  <filtering>false</filtering>
+                </resource>
+              </resources>
             </configuration>
           </execution>
         </executions>
@@ -69,10 +78,10 @@
                   <pluginExecution>
                     <pluginExecutionFilter>
                       <groupId>org.apache.maven.plugins</groupId>
-                      <artifactId>maven-antrun-plugin</artifactId>
+                      <artifactId>maven-resources-plugin</artifactId>
                       <versionRange>[0,)</versionRange>
                       <goals>
-                        <goal>run</goal>
+                        <goal>copy-resources</goal>
                       </goals>
                     </pluginExecutionFilter>
                     <action>

org.omg.sysml.logic.bundle/pom.xml

@@ -1,3 +1,2 @@
 target/
-lib/
 model/