Merge branch 'next'

Signed-off-by: Jay Jay Billings <billingsjj@ornl.gov>
eclipse · May 31, 2017 · 0bb4f23 · 0bb4f23
2 parents 5f9e07c + 430d154
commit 0bb4f23
Show file tree

Hide file tree

Showing 591 changed files with 4,699 additions and 2,248 deletions.
diff --git a/docs/installation/src/content.tex b/docs/installation/src/content.tex
@@ -22,9 +22,7 @@ \subsection{ICE Installation}
 \end{enumerate}
 
 \subsection{Starting ICE for the first time}
-To start ICE, double-click on the application executable to open up ICE. When the workspace chooser
-dialog opens, select the default workspace by clicking on the \texttt{OK}
-button.
+To start ICE, double-click on the application executable, i.e. \textit{ICE_SDK} file, which is located in the \textit{ice.sdk.product*} directory created by opening the zip file referenced in the previous section. The latter operation will open up ICE. When the workspace chooser dialog opens, select the default workspace by clicking on the \texttt{OK} button.
 You can enter your own directory for the workspace location, but please make sure that it is writable and readable by you, and you remember where it is.
 \begin{center} \includegraphics[width=\textwidth]{figures/workspace}
 \end{center}

diff --git a/docs/visualization/src/content.tex b/docs/visualization/src/content.tex
@@ -138,7 +138,7 @@ \subsection{Opening a Plot Editor}
 
 To open a Plot Editor, a file that uses this editor must first be placed in the
 Project Explorer. This view lists files imported into ICE. To access the Project
-Explorer, use the the menu bar at the top of the window and navigate to Window
+Explorer, use the menu bar at the top of the window and navigate to Window
 $\rightarrow$ Show View $\rightarrow$ Project Explorer. Depending on the active
 Eclipse perspective, opening this view may require selecting Other\ldots and
 finding the Project Explorer in the dialog under the General category in the

diff --git a/org.eclipse.ice.aggregator.swtbot/.project b/org.eclipse.ice.aggregator.swtbot/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.ice.aggregator.swtbot</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>
diff --git a/org.eclipse.ice.aggregator.swtbot/pom.xml b/org.eclipse.ice.aggregator.swtbot/pom.xml
@@ -0,0 +1,45 @@
+<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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.eclipse.ice.aggregator</groupId>
+  <artifactId>org.eclipse.ice.aggregator</artifactId>
+  <packaging>pom</packaging>
+  <name>Eclipse ICE SWTBot UI Integration Tests Aggregator</name>
+  <description>Aggregator Bundle for running the SWTBot UI tests for Eclipse ICE</description>
+  <parent>
+  	<groupId>org.eclipse.ice</groupId>
+  	<artifactId>org.eclipse.ice.parent</artifactId>
+  	<version>2.2.0-SNAPSHOT</version>
+  	<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
+  </parent>
+  <modules>
+  	<module>../org.eclipse.ice.tests.ui.swtbot</module>
+  	<module>../org.eclipse.ice.tests.client.widgets.utils</module>
+  	<module>../org.eclipse.ice.caebat.batml</module>
+  	<module>../org.eclipse.ice.client</module>
+  	<module>../org.eclipse.ice.client.compatibility</module>
+  	<module>../org.eclipse.ice.client.rcp</module>
+  	<module>../org.eclipse.ice.client.widgets</module>
+  	<module>../org.eclipse.ice.client.widgets.moose</module>
+  	<module>../org.eclipse.ice.core</module>
+  	<module>../org.eclipse.ice.datastructures</module>
+  	<module>../org.eclipse.ice.developer</module>
+  	<module>../org.eclipse.ice.developer.moose</module>
+  	<module>../org.eclipse.ice.geometry</module>
+  	<module>../org.eclipse.ice.io</module>
+  	<module>../org.eclipse.ice.item</module>
+  	<module>../org.eclipse.ice.materials</module>
+  	<module>../org.eclipse.ice.materials.ui</module>
+   	<module>../org.eclipse.ice.materials.feature</module>
+  	<module>../org.eclipse.ice.mesh</module>
+  	<module>../org.eclipse.ice.nek5000</module>
+  	<module>../org.eclipse.ice.parent</module>
+  	<module>../org.eclipse.ice.persistence.xml</module>
+  	<module>../org.eclipse.ice.projectgeneration</module>
+  	<module>../org.eclipse.ice.proteus</module>
+  	<module>../org.eclipse.ice.reactor.plant</module>
+  	<module>../org.eclipse.ice.reflectivity</module>
+  	<module>../org.eclipse.ice.reflectivity.ui</module>
+  	<module>../org.eclipse.ice.target.oxygen</module>
+  	<module>../org.eclipse.ice.vibe</module>	  	
+  </modules>
+</project>
diff --git a/org.eclipse.ice.aggregator/ICE.setup b/org.eclipse.ice.aggregator/ICE.setup
@@ -29,7 +29,7 @@
   <setupTask
       xsi:type="setup:EclipseIniTask"
       option="-Doomph.redirection.ice"
-      value="=https://git.eclipse.org/c/eclipse/ice.git/plain/org.eclipse.ice.aggregator/ICE.setup->${git.clone.ice.location|uri}/org.eclipse.ice.aggregator/ICE.setup"
+      value="=https://raw.githubusercontent.com/eclipse/ice/master/org.eclipse.ice.aggregator/ICE.setup->${git.clone.ice.location|uri}/org.eclipse.ice.aggregator/ICE.setup"
       vm="true">
     <description>Set an Oomph redirection system property to redirect the logical location of this setup to its physical location in the Git clone.</description>
   </setupTask>
@@ -97,7 +97,7 @@
       </detail>
       <detail
           key="label">
-        <value>${scope.project.label} github.remote.uris repository</value>
+        <value>${scope.project.label} Github repository</value>
       </detail>
       <detail
           key="target">
@@ -124,13 +124,17 @@
             url="http://download.eclipse.org/releases/oxygen"/>
         <repository
             url="http://download.eclipse.org/cbi/updates/license"/>
+        <repository
+            url="http://download.eclipse.org/modeling/emf/cdo/orbit/latest-R"/>
       </repositoryList>
       <repositoryList
           name="Neon">
         <repository
             url="http://download.eclipse.org/releases/neon"/>
         <repository
             url="http://download.eclipse.org/cbi/updates/license"/>
+        <repository
+            url="http://download.eclipse.org/modeling/emf/cdo/orbit/latest-R"/>
       </repositoryList>
       <repositoryList
           name="Mars">

diff --git a/org.eclipse.ice.aggregator/pom.xml b/org.eclipse.ice.aggregator/pom.xml
@@ -7,57 +7,58 @@
   <description>Aggregator Bundle for building Eclipse ICE</description>
   <parent>
   	<groupId>org.eclipse.ice</groupId>
-  	<artifactId>org.eclipse.ice.build</artifactId>
-  	<version>2.2.0-SNAPSHOT</version>
+  	<artifactId>org.eclipse.ice.parent</artifactId>
+  	<version>2.2.1-SNAPSHOT</version>
   	<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
   </parent>
   <modules>
+  	<module>../org.eclipse.ice.parent</module>
   	<module>../org.eclipse.ice.caebat.batml</module>
-  	<module>../org.eclipse.ice.caebat.batml.test</module>
+  	<module>../org.eclipse.ice.tests.caebat.batml</module>
   	<module>../org.eclipse.ice.client</module>
   	<module>../org.eclipse.ice.client.compatibility</module>
   	<module>../org.eclipse.ice.client.rcp</module>
-  	<module>../org.eclipse.ice.client.test</module>
+  	<module>../org.eclipse.ice.tests.client</module>
   	<module>../org.eclipse.ice.client.widgets</module>
   	<module>../org.eclipse.ice.client.widgets.moose</module>
-  	<module>../org.eclipse.ice.client.widgets.moose.test</module>
-  	<module>../org.eclipse.ice.client.widgets.test</module>
-  	<module>../org.eclipse.ice.client.widgets.test.utils</module>
+  	<module>../org.eclipse.ice.tests.client.widgets.moose</module>
+  	<module>../org.eclipse.ice.tests.client.widgets</module>
+  	<module>../org.eclipse.ice.tests.client.widgets.utils</module>
   	<module>../org.eclipse.ice.core</module>
-  	<module>../org.eclipse.ice.core.test</module>
+  	<module>../org.eclipse.ice.tests.core</module>
   	<module>../org.eclipse.ice.datastructures</module>
-  	<module>../org.eclipse.ice.datastructures.test</module>
+  	<module>../org.eclipse.ice.tests.datastructures</module>
   	<module>../org.eclipse.ice.developer</module>
   	<module>../org.eclipse.ice.developer.moose</module>
+  	<module>../org.eclipse.ice.geometry</module>
   	<module>../org.eclipse.ice.io</module>
-  	<module>../org.eclipse.ice.io.test</module>
+  	<module>../org.eclipse.ice.tests.io</module>
   	<module>../org.eclipse.ice.item</module>
-  	<module>../org.eclipse.ice.item.test</module>
+  	<module>../org.eclipse.ice.tests.item</module>
   	<module>../org.eclipse.ice.materials</module>
-  	<module>../org.eclipse.ice.materials.test</module>
+  	<module>../org.eclipse.ice.tests.materials</module>
   	<module>../org.eclipse.ice.materials.ui</module>
    	<module>../org.eclipse.ice.materials.feature</module>
   	<module>../org.eclipse.ice.mesh</module>
-  	<module>../org.eclipse.ice.mesh.test</module>
+  	<module>../org.eclipse.ice.tests.mesh</module>
   	<module>../org.eclipse.ice.nek5000</module>
-  	<module>../org.eclipse.ice.nek5000.test</module>
-  	<module>../org.eclipse.ice.parent</module>
+  	<module>../org.eclipse.ice.tests.nek5000</module>
   	<module>../org.eclipse.ice.persistence.xml</module>
-  	<module>../org.eclipse.ice.persistence.xml.test</module>
+  	<module>../org.eclipse.ice.tests.persistence.xml</module>
   	<module>../org.eclipse.ice.projectgeneration</module>
-  	<module>../org.eclipse.ice.projectgeneration.test</module>
+  	<module>../org.eclipse.ice.tests.projectgeneration</module>
   	<module>../org.eclipse.ice.proteus</module>
-  	<module>../org.eclipse.ice.proteus.test</module>
+  	<module>../org.eclipse.ice.tests.proteus</module>
   	<module>../org.eclipse.ice.reactor.plant</module>
-  	<module>../org.eclipse.ice.reactor.plant.test</module>
+  	<module>../org.eclipse.ice.tests.reactor.plant</module>
   	<module>../org.eclipse.ice.reflectivity</module>
-  	<module>../org.eclipse.ice.reflectivity.test</module>
+  	<module>../org.eclipse.ice.tests.reflectivity</module>
   	<module>../org.eclipse.ice.reflectivity.ui</module>
-  	<module>../org.eclipse.ice.target.neon</module>
+  	<module>../org.eclipse.ice.target.oxygen</module>
   	<module>../org.eclipse.ice.vibe</module>
-  	<module>../org.eclipse.ice.vibe.test</module>
+  	<module>../org.eclipse.ice.tests.vibe</module>
   	<module>../org.eclipse.ice.feature</module>  	
   	<module>../org.eclipse.ice.repository</module>    	
   	<module>../org.eclipse.ice.product</module>  		  	
   </modules>
-</project>
+</project>
diff --git a/org.eclipse.ice.caebat.batml/META-INF/MANIFEST.MF b/org.eclipse.ice.caebat.batml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BatteryML
 Bundle-SymbolicName: org.eclipse.ice.caebat.batml;singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.1.qualifier
 Service-Component: OSGI-INF/xsdcomponent.xml
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: org.eclipse.core.filesystem,

diff --git a/org.eclipse.ice.caebat.batml/pom.xml b/org.eclipse.ice.caebat.batml/pom.xml
@@ -5,12 +5,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.eclipse.ice</groupId>
-		<artifactId>org.eclipse.ice.build</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
+		<artifactId>org.eclipse.ice.parent</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
 		<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.ice</groupId>
 	<artifactId>org.eclipse.ice.caebat.batml</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
+	<version>2.2.1-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.eclipse.ice.client.compatibility/META-INF/MANIFEST.MF b/org.eclipse.ice.client.compatibility/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ICE Compability Bundle for Eclipse RCP/RAP
 Bundle-SymbolicName: org.eclipse.ice.client.compatibility
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: org.eclipse.jface.action,
  org.eclipse.jface.databinding.swt,

diff --git a/org.eclipse.ice.client.compatibility/pom.xml b/org.eclipse.ice.client.compatibility/pom.xml
@@ -5,8 +5,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.eclipse.ice</groupId>
-		<artifactId>org.eclipse.ice.build</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
+		<artifactId>org.eclipse.ice.parent</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
 		<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.ice</groupId>

diff --git a/org.eclipse.ice.client.rcp/META-INF/MANIFEST.MF b/org.eclipse.ice.client.rcp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ICE
 Bundle-SymbolicName: org.eclipse.ice.client.rcp;singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: com.sun.jersey.api.client,
  com.sun.jersey.api.client.filter,

diff --git a/org.eclipse.ice.client.rcp/plugin.xml b/org.eclipse.ice.client.rcp/plugin.xml
@@ -99,4 +99,21 @@
         </property>
      </product>
   </extension>
+  <extension
+        point="org.eclipse.ui.menus">
+     <menuContribution
+           allPopups="false"
+           locationURI="menu:help?after=additions">
+        <command
+              commandId="org.eclipse.equinox.p2.ui.discovery.commands.ShowRepositoryCatalog"
+              label="Install EASE Components"
+              style="push"
+              tooltip="Install EASE Additional Components">
+           <parameter
+                 name="org.eclipse.equinox.p2.ui.discovery.commands.RepositoryParameter"
+                 value="http://download.eclipse.org/ease/update/release">
+           </parameter>
+        </command>
+     </menuContribution>
+  </extension>
 </plugin>
diff --git a/org.eclipse.ice.client.rcp/pom.xml b/org.eclipse.ice.client.rcp/pom.xml
@@ -5,8 +5,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.eclipse.ice</groupId>
-		<artifactId>org.eclipse.ice.build</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
+		<artifactId>org.eclipse.ice.parent</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
 		<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.ice</groupId>

diff --git a/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF b/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ICE Moose Widgets
 Bundle-SymbolicName: org.eclipse.ice.client.widgets.moose;singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: org.apache.commons.io,
  org.eclipse.cdt.core.model,

diff --git a/org.eclipse.ice.client.widgets.moose/pom.xml b/org.eclipse.ice.client.widgets.moose/pom.xml
@@ -5,8 +5,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.eclipse.ice</groupId>
-		<artifactId>org.eclipse.ice.build</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
+		<artifactId>org.eclipse.ice.parent</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
 		<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.ice</groupId>

diff --git a/...client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEEclipseFormWidget.java b/...client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEEclipseFormWidget.java
@@ -38,24 +38,6 @@ public class MOOSEEclipseFormWidget extends EclipseFormWidget {
 	private static final Logger logger = LoggerFactory
 			.getLogger(MOOSEEclipseFormWidget.class);
 
-	/**
-	 * The visualization service factory provided to MOOSEFormEditors through
-	 * OSGi.
-	 */
-	private final IVizServiceFactory vizServiceFactory;
-
-	/**
-	 * The default constructor.
-	 * 
-	 * @param factory
-	 *            The visualization service factory provided to MOOSEFormEditors
-	 *            through OSGi.
-	 */
-	public MOOSEEclipseFormWidget(IVizServiceFactory factory) {
-		// Nothing to do yet.
-		this.vizServiceFactory = factory;
-	}
-
 	/**
 	 * This operation displays the {@link MOOSEFormEditor} instead of the
 	 * standard ICEFormEditor.
@@ -81,8 +63,8 @@ public void display() {
 			// FIXME Since this is a static method, it should probably be set
 			// from a more general OSGi-referencing service in the main widgets
 			// bundle.
-			org.eclipse.ice.client.widgets.ICEFormEditor
-					.setVizServiceFactory(vizServiceFactory);
+//			org.eclipse.ice.client.widgets.ICEFormEditor
+//					.setVizServiceFactory(vizServiceFactory);
 
 		} catch (PartInitException e) {
 			// Dump the stacktrace if something happens.

diff --git a/...client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormWidgetBuilder.java b/...client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormWidgetBuilder.java
@@ -66,40 +66,7 @@ public String getTargetFormName() {
 	 */
 	@Override
 	public IFormWidget build() {
-		return new MOOSEEclipseFormWidget(vizServiceFactory);
+		return new MOOSEEclipseFormWidget();
 	}
 
-	/**
-	 * This method is called by the OSGi implementation to bind the
-	 * {@link IVizServiceFactory} (an OSGi service) to this instance.
-	 * 
-	 * @param factory
-	 *            The factory service available through OSGi.
-	 */
-	public void setVizServiceFactory(IVizServiceFactory factory) {
-		this.vizServiceFactory = factory;
-
-		IConfigurationElement[] elements = Platform.getExtensionRegistry()
-				.getConfigurationElementsFor("org.eclipse.eavp.viz.service.IVizServiceFactory");
-		logger.info("MOOSEFormWidgetBuilder: Available configuration elements");
-		for(IConfigurationElement element : elements){
-			logger.info(element.getName());
-		}
-
-		return;
-
-	}
-
-	/**
-	 * This method is called by the OSGi implementation to unbind the
-	 * {@link IVizServiceFactory} (an OSGi service) from this instance.
-	 * 
-	 * @param factory
-	 *            The factory service that is no longer available through OSGi.
-	 */
-	public void unsetVizServiceFactory(IVizServiceFactory factory) {
-		if (factory == this.vizServiceFactory) {
-			this.vizServiceFactory = null;
-		}
-	}
 }