Commit 0bb4f238 authored by Jay Jay Billings's avatar Jay Jay Billings

Merge branch 'next'

Signed-off-by: default avatarJay Jay Billings <billingsjj@ornl.gov>
parents 5f9e07ce 430d1541
......@@ -22,9 +22,7 @@ ICE application executable.
\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}
......
......@@ -138,7 +138,7 @@ and ICE should begin connecting to VisIt.
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
......
<?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>
<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>
\ No newline at end of file
......@@ -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,6 +124,8 @@
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">
......@@ -131,6 +133,8 @@
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">
......
......@@ -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>
\ No newline at end of file
</project>
......@@ -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,
......
......@@ -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>
......@@ -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,
......
......@@ -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>
......
......@@ -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,
......
......@@ -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>
......@@ -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>
......
......@@ -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,
......
......@@ -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>
......
......@@ -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 class MOOSEEclipseFormWidget extends EclipseFormWidget {
// 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.
......
......@@ -66,40 +66,7 @@ public class MOOSEFormWidgetBuilder implements IFormWidgetBuilder {
*/
@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;
}
}
}
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ICEEclipseWidgets
Bundle-SymbolicName: org.eclipse.ice.client.widgets;singleton:=true
Bundle-Version: 2.2.0.qualifier
Bundle-Version: 2.2.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.ice.datastructures,
org.eclipse.ice.client.compatibility,
......@@ -32,7 +32,7 @@ Import-Package:
org.eclipse.e4.ui.model,
org.eclipse.e4.ui.model.application,
org.eclipse.e4.ui.model.application.ui,
org.eclipse.eavp.viz.datastructures,
org.eclipse.eavp.viz.datastructures.ui,
org.eclipse.eavp.viz.datastructures.VizObject,
org.eclipse.eavp.viz.modeling,
org.eclipse.eavp.viz.modeling.base,
......
......@@ -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>
......
......@@ -237,7 +237,7 @@ public class ICEFormEditor extends SharedHeaderFormEditor
* The service factory that should be used for generating
* visualizations.
*/
public static void setVizServiceFactory(IVizServiceFactory factory) {
public void setVizServiceFactory(IVizServiceFactory factory) {
vizFactory = factory;
Logger staticLogger = LoggerFactory.getLogger(ICEFormEditor.class);
staticLogger.info("ICEFormEditor Message: IVizServiceFactory set!");
......
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Client
Bundle-SymbolicName: org.eclipse.ice.client;singleton:=true
Bundle-Version: 2.2.0.qualifier
Bundle-Version: 2.2.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.ice.client.common,
org.eclipse.ice.client.common.internal,
......
......@@ -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>
......
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>default</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>default</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?><launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
<booleanAttribute key="append.args" value="true"/>
<booleanAttribute key="automaticAdd" value="false"/>
<booleanAttribute key="automaticValidate" value="false"/>
......@@ -14,16 +15,17 @@
<booleanAttribute key="default" value="true"/>
<booleanAttribute key="default_auto_start" value="true"/>
<intAttribute key="default_start_level" value="4"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
<booleanAttribute key="includeOptional" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -clean -data testDir"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dorg.osgi.service.http.port=8080 -Dice.projectLocation=/home/bkj/ICEFiles -Dcom.sun.jersey.config.property.packages=org.eclipse.ice.core.iCore -Dorg.osgi.framework.bundle.parent=ext;"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dorg.osgi.service.http.port=8082 -Dcom.sun.jersey.config.property.packages=org.eclipse.ice.core.iCore -Dorg.osgi.framework.bundle.parent=ext; -Declipse.log.level=INFO"/>
<stringAttribute key="pde.version" value="3.3"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="target_bundles" value="com.sun.jersey.jersey-servlet@default:default,org.eclipse.core.expressions@default:default,org.apache.lucene.core@default:default,org.apache.commons.codec@default:default,org.hamcrest.core@default:default,com.sun.jersey.jersey-core@default:default,org.apache.jasper@default:default,org.apache.lucene.highlighter@default:default,org.eclipse.core.commands@default:default,javax.ws.rs.jsr311-api@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.contenttype@default:default,org.eclipse.osgi@-1:true,javax.activation@default:default,org.apache.lucene.analysis@default:default,org.eclipse.core.resources@default:default,org.apache.lucene.snowball@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,com.sun.jersey.jersey-json@default:default,org.eclipse.equinox.weaving.hook@default:false,org.junit*4.8.2.v4_8_2_v20110321-1705@default:default,jackson-mapper-asl@default:default,org.eclipse.ui@default:default,org.eclipse.core.databinding.observable@default:default,com.sun.jersey.jersey-client@default:default,org.mortbay.jetty.server@default:default,org.eclipse.core.databinding@default:default,jackson-xc@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.variables@default:default,javax.xml.stream@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.ant.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui.forms@default:default,org.eclipse.swt@default:default,javax.xml.bind@default:default,org.eclipse.equinox.app@default:default,org.codehaus.jettison.jettison@default:default,org.eclipse.equinox.servletbridge.extensionbundle@default:false,org.apache.lucene.spellchecker@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.core.databinding.property@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.help.ui@default:default,org.eclipse.equinox.util@default:default,org.apache.commons.logging*1.0.4.v201101211617@default:default,com.jcraft.jsch@default:default,org.objectweb.asm@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.eclipse.equinox.preferences@default:default,org.apache.ant@default:default,org.eclipse.jface.databinding@default:default,javax.servlet.jsp@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.http.jetty@default:default,org.apache.lucene.queries@default:default,javax.mail@default:default,org.eclipse.jface@default:default,org.eclipse.ui.intro@default:default,commonj.sdo@default:default,javax.persistence@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.platform@default:default,org.apache.lucene@default:default,org.eclipse.equinox.http.servletbridge@default:default,org.mortbay.jetty.util@default:default,javax.transaction@default:false,jackson-core-asl@default:default,com.sun.jersey.jersey-server@default:default,com.ibm.icu@default:default,org.eclipse.equinox.servletbridge@default:default,org.eclipse.help.base@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,jackson-jaxrs@default:default,org.eclipse.core.jobs@default:default,org.eclipse.help@default:default,javax.xml@default:default,osgi.enterprise@default:default,org.apache.lucene.misc@default:default,org.eclipse.swt.gtk.linux.x86_64*3.7.2.v3740f@default:false,org.eclipse.core.runtime@default:true,org.apache.commons.el@default:default,org.apache.lucene.memory@default:default,javax.servlet@default:default,org.eclipse.swt.gtk.linux.x86_64*3.7.1.v3738a@default:false"/>
<stringAttribute key="target_bundles" value="bcpkix@default:default,bcprov@default:default,ca.odell.glazedlists@default:default,ch.ethz.iks.r_osgi.remote@default:default,com.google.gson@default:default,com.google.guava@default:default,com.google.inject.multibindings@default:false,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.spotify.docker-client.shaded@default:default,com.sun.jersey@default:default,com.sun.syndication@default:default,gov.lbnl.visit.swt@default:default,javax.activation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.ws.rs@default:default,javax.xml@default:default,org.antlr.runtime*3.2.0.v201101311130@default:default,org.antlr.runtime*4.3.0.v201502022030@default:default,org.apache.ant@default:default,org.apache.batik.css*1.7.0.v201011041433@default:default,org.apache.batik.util*1.7.0.v201011041433@default:default,org.apache.batik.util.gui*1.7.0.v200903091627@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging*1.0.4.v201101211617@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.math@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.eclipse.ant.core@default:default,org.eclipse.cdt.core.linux.x86_64@default:false,org.eclipse.cdt.core.linux@default:false,org.eclipse.cdt.core.native@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.swt.gtk@default:false,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.eavp.geometry.view.model@default:default,org.eclipse.eavp.viz.datastructures@default:default,org.eclipse.eavp.viz.modeling@default:default,org.eclipse.eavp.viz.service.mesh@default:default,org.eclipse.eavp.viz.service.visit@default:default,org.eclipse.eavp.viz.service@default:default,org.eclipse.eavp.viz@default:default,org.eclipse.ecf.discovery@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.osgi.services.distribution@default:default,org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy@default:default,org.eclipse.ecf.osgi.services.remoteserviceadmin@default:default,org.eclipse.ecf.provider.discovery@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.provider.r_osgi@default:default,org.eclipse.ecf.provider.remoteservice@default:default,org.eclipse.ecf.provider@default:default,org.eclipse.ecf.remoteservice.asyncproxy*1.0.100.v20150702-1411@default:default,org.eclipse.ecf.remoteservice.asyncproxy*2.0.100.v20150702-1411@default:default,org.eclipse.ecf.remoteservice.rest.synd@default:default,org.eclipse.ecf.remoteservice.rest@default:default,org.eclipse.ecf.remoteservice.servlet@default:default,org.eclipse.ecf.remoteservice.soap@default:default,org.eclipse.ecf.remoteservice@default:default,org.eclipse.ecf.sharedobject@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.http.servletbridge@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.region@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.servletbridge@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.util@default:default,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.fx.osgi@default:false,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.january.geometry.model@default:default,org.eclipse.january.geometry.xtext.obj@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jsch.core@default:default,org.eclipse.nebula.visualization.widgets@default:default,org.eclipse.nebula.visualization.xygraph@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services.remoteserviceadmin@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.platform@default:default,org.eclipse.remote.core@default:default,org.eclipse.remote.jsch.core@default:default,org.eclipse.remote.ui@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.swtbot.ant.junit@default:false,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.wst.jsdt.nashorn.extension@default:false,org.eclipse.xsd@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext@default:default,org.hamcrest.core@default:default,org.jdom@default:default,org.junit@default:default,org.objectweb.asm@default:default,org.slf4j.api@default:default,org.slf4j.impl.log4j12@default:false,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil*1.0.1.v200903091627@default:default,org.w3c.dom.svg@default:default"/>
<stringAttribute key="timestamp" value="1342815545071"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
<stringAttribute key="workspace_bundles" value="org.eclipse.ice.core@default:true,org.eclipse.ice.item@default:true,org.eclipse.ice.datastructures@default:true,org.eclipse.ice.nek5000@default:true,org.eclipse.ice.filesimulation@default:true"/>
</launchConfiguration>
\ No newline at end of file
<stringAttribute key="workspace_bundles" value="org.eclipse.ice.core@default:true,org.eclipse.ice.datastructures@default:true,org.eclipse.ice.io@default:default,org.eclipse.ice.item@default:true,org.eclipse.ice.materials@default:default,org.eclipse.ice.nek5000@default:true,org.eclipse.ice.persistence.xml@default:default"/>
</launchConfiguration>
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Core
Bundle-SymbolicName: org.eclipse.ice.core;singleton:=true
Bundle-Version: 2.2.0.qualifier
Bundle-Version: 2.2.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.ice.core.iCore,
org.eclipse.ice.core.launcher
......
......@@ -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>
......
......@@ -37,8 +37,6 @@ import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
......@@ -157,6 +155,12 @@ public class Core extends Application implements ICore, BundleActivator {
*/
private ServiceRegistration<ICore> registration;
/**
* This constant is used by ECF to register the exported interfaces for the
* remote OSGI service.
*/
private static final String OSGI_SERVICE_EXPORTED_INTERFACES = "service.exported.interfaces";
/**
* An alternative constructor that allows the Core to be constructed with a
* particular ItemManager. This is used for testing.
......@@ -168,7 +172,7 @@ public class Core extends Application implements ICore, BundleActivator {
// Setup the ItemManager and the project table
itemManager = manager;
projectTable = new Hashtable<String, IProject>();
projectTable = new Hashtable<>();
// Set the project location
if (!setupProjectLocation()) {
......@@ -189,7 +193,7 @@ public class Core extends Application implements ICore, BundleActivator {
// Setup the ItemManager and the project table
itemManager = new ItemManager();
projectTable = new Hashtable<String, IProject>();