Commit 2974a4b7 authored by Robert Smith's avatar Robert Smith

Merge remote-tracking branch 'origin/2.2.2' into next

parents 33dd942c b1cf638e
......@@ -13,49 +13,49 @@
</parent>
<modules>
<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.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.tests.nek5000</module>
<module>../org.eclipse.ice.parent</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.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>
......
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.ice.io.test</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.ice.nek5000.test</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.ice.persistence.xml.test</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.ice.projectgeneration.test</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.ice.proteus.test</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.ice.reactor.plant.test</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.ice</groupId>
<artifactId>org.eclipse.ice.build</artifactId>
<version>2.2.0-SNAPSHOT</version>
<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.ice</groupId>
<artifactId>org.eclipse.ice.reactor.plant.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
<properties>
<sonar.skip>true</sonar.skip>
</properties>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.ice.reflectivity.test</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.ice</groupId>
<artifactId>org.eclipse.ice.build</artifactId>
<version>2.2.0-SNAPSHOT</version>
<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.ice</groupId>
<artifactId>org.eclipse.ice.reflectivity.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
<properties>
<sonar.skip>true</sonar.skip>
</properties>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.ice.caebat.batml.test</name>
<name>org.eclipse.ice.tests.caebat.batml</name>
<comment></comment>
<projects>
</projects>
......
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BatMLTest
Bundle-SymbolicName: org.eclipse.ice.caebat.batml.test
Bundle-SymbolicName: org.eclipse.ice.tests.caebat.batml
Bundle-Version: 2.2.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.junit;bundle-version="4.11.0",
......
......@@ -10,7 +10,7 @@
<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.ice</groupId>
<artifactId>org.eclipse.ice.caebat.batml.test</artifactId>
<artifactId>org.eclipse.ice.tests.caebat.batml</artifactId>
<packaging>eclipse-test-plugin</packaging>
<properties>
<sonar.skip>true</sonar.skip>
......
......@@ -10,7 +10,7 @@
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
package org.eclipse.ice.caebat.batml.test;
package org.eclipse.ice.tests.caebat.batml;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
......
......@@ -10,7 +10,7 @@
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
package org.eclipse.ice.caebat.batml.test;
package org.eclipse.ice.tests.caebat.batml;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
......
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.ice.client.widgets.moose.test</name>
<name>org.eclipse.ice.tests.client.widgets.moose</name>
<comment></comment>
<projects>
</projects>
......
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: MOOSE Widgets Test
Bundle-SymbolicName: org.eclipse.ice.client.widgets.moose.test
Bundle-SymbolicName: org.eclipse.ice.tests.client.widgets.moose
Bundle-Version: 2.2.0.qualifier
Bundle-Vendor: Oak Ridge National Laboratory
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.eclipse.ice.client.widgets.moose,
org.eclipse.ice.datastructures.form,
org.eclipse.ice.persistence.xml,
org.eclipse.ice.persistence.xml.test
org.eclipse.ice.tests.persistence.xml
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.0",
org.junit;bundle-version="4.12.0"
......@@ -10,7 +10,7 @@
<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.ice</groupId>
<artifactId>org.eclipse.ice.client.widgets.moose.test</artifactId>
<artifactId>org.eclipse.ice.tests.client.widgets.moose</artifactId>
<packaging>eclipse-plugin</packaging>
<properties>
<sonar.skip>true</sonar.skip>
......
package org.eclipse.ice.client.widgets.moose.test;
package org.eclipse.ice.tests.client.widgets.moose;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import org.eclipse.ice.persistence.xml.XMLFormContentDescriber;
import org.eclipse.ice.persistence.xml.test.XMLFormContentDescriberTester;
import org.eclipse.ice.tests.persistence.xml.XMLFormContentDescriberTester;
import org.eclipse.ice.client.widgets.moose.MooseXMLFormContentDescriber;
/**
......
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.ice.client.widgets.test.utils</name>
<name>org.eclipse.ice.tests.client.widgets.utils</name>
<comment></comment>
<projects>
</projects>
......
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ICE Client Widget Test Utilities
Bundle-SymbolicName: org.eclipse.ice.client.widgets.test.utils
Bundle-SymbolicName: org.eclipse.ice.tests.client.widgets.utils
Bundle-Version: 2.2.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.ice.datastructures,
......@@ -10,4 +10,4 @@ Require-Bundle: org.eclipse.ice.datastructures,
org.eclipse.swtbot.go
Import-Package: org.eclipse.ice.client.widgets,
org.eclipse.ice.datastructures.form
Export-Package: org.eclipse.ice.client.widgets.test.utils
Export-Package: org.eclipse.ice.tests.client.widgets.utils
......@@ -10,7 +10,7 @@
<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
</parent>
<groupId>org.eclipse.ice</groupId>
<artifactId>org.eclipse.ice.client.widgets.test.utils</artifactId>
<artifactId>org.eclipse.ice.tests.client.widgets.utils</artifactId>
<packaging>eclipse-plugin</packaging>
<properties>
<sonar.skip>true</sonar.skip>
......
......@@ -9,7 +9,7 @@
* Jordan Deyton - Initial API and implementation and/or initial documentation
*
*******************************************************************************/
package org.eclipse.ice.client.widgets.test.utils;
package org.eclipse.ice.tests.client.widgets.utils;
import java.io.BufferedWriter;
import java.io.File;
......
......@@ -9,7 +9,7 @@
* Jordan Deyton - Initial API and implementation and/or initial documentation
*
*******************************************************************************/
package org.eclipse.ice.client.widgets.test.utils;
package org.eclipse.ice.tests.client.widgets.utils;
import java.util.concurrent.atomic.AtomicReference;
......
......@@ -9,7 +9,7 @@
* Jordan Deyton - Initial API and implementation and/or initial documentation
*
*******************************************************************************/
package org.eclipse.ice.client.widgets.test.utils;
package org.eclipse.ice.tests.client.widgets.utils;
import java.io.File;
import java.io.IOException;
......
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.ice.tests.client.widgets</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>