Commit 504455d7 authored by Robert Smith's avatar Robert Smith
Browse files

Working on Linux build



Removed references to JME3 bundles. Fixed version numbers on new
packages. Added references to the jfxswt.jar in JavaFX plug-in pom
files. 
Signed-off-by: Robert Smith's avatarRobert Smith <SmithRW@ornl.gov>
parent 0f43373f
......@@ -40,7 +40,6 @@ Import-Package: javafx.embed.swt;version="2.2.0",
org.eclipse.ice.viz.service.geometry.shapes,
org.eclipse.ice.viz.service.geometry.widgets,
org.eclipse.ice.viz.service.internal,
org.eclipse.ice.viz.service.jme3.mesh,
org.eclipse.ice.viz.service.mesh.datastructures,
org.eclipse.ice.viz.service.mesh.properties,
org.eclipse.ice.viz.service.modeling,
......
......@@ -23,8 +23,6 @@ import org.eclipse.ice.viz.service.IVizService;
import org.eclipse.ice.viz.service.IVizServiceFactory;
import org.eclipse.ice.viz.service.geometry.widgets.TransformationView;
import org.eclipse.ice.viz.service.geometry.widgets.TransformationView;
import org.eclipse.ice.viz.service.jme3.mesh.IMeshSelectionListener;
import org.eclipse.ice.viz.service.jme3.mesh.IMeshSelectionListener;
import org.eclipse.ice.viz.service.mesh.datastructures.IMeshVizCanvas;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.MenuManager;
......@@ -58,8 +56,8 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
* @author Taylor Patterson, Jordan H. Deyton
*/
public class ICEMeshPage extends ICEFormPage
implements ISelectionListener, IMeshSelectionListener,
ISelectionProvider, ITabbedPropertySheetPageContributor {
implements ISelectionListener, ISelectionProvider,
ITabbedPropertySheetPageContributor {
/**
* Eclipse view ID
......@@ -410,17 +408,6 @@ public class ICEMeshPage extends ICEFormPage
return;
}
/**
* This method should make the appropriate ISelectionProvider calls to send
* the recent update to the MeshApplication's selection to the other
* ISelectionListeners.
*/
@Override
public void selectionChanged() {
return;
}
// ---- Implements ISelectionProvider ---- //
/**
* @see ISelectionProvider#addSelectionChangedListener(ISelectionChangedListener)
......
This diff is collapsed.
......@@ -271,7 +271,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<plugin id="org.eclipse.ice.caebat.batml" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.ice.client.rcp" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.ice.client.widgets" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.ice.client.widgets.rcp" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.ice.datastructures" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.ice.dependencies" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.ice.developer" autoStart="true" startLevel="0" />
......@@ -313,4 +312,4 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<cssInfo>
</cssInfo>
</product>
\ No newline at end of file
</product>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="mars" sequenceNumber="181">
<?pde version="3.8"?><target name="mars" sequenceNumber="182">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
......@@ -117,11 +117,9 @@
<unit id="org.eclipse.swtbot.feature.group" version="2.3.0.201506081302"/>
<repository location="http://download.eclipse.org/releases/mars/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.fx.runtime.min.feature.feature.group" version="2.1.0.201508240501"/>
<repository location="http://download.eclipse.org/efxclipse/runtime-shared-released/2.1.0/site/"/>
<unit id="org.eclipse.fx.runtime.min.feature.feature.group" version="2.1.0.201508240501"/>
<repository location="http://download.eclipse.org/efxclipse/runtime-shared-released/2.1.0/site"/>
</location>
</locations>
</target>
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: JavaFX Geometry Visualization Services Plugin
Bundle-SymbolicName: org.eclipse.ice.viz.service.javafx.geometry;singleton:=true
Bundle-Version: 2.1.7.20150825
Bundle-Version: 2.1.8
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/vizGeometryService.xml
Require-Bundle: org.eclipse.ui,
......
......@@ -6,10 +6,33 @@
<parent>
<groupId>ICE</groupId>
<artifactId>org.eclipse.ice.build</artifactId>
<version>2.1.7.20150825</version>
<version>2.1.8</version>
<relativePath>../${pom-filename}</relativePath>
</parent>
<groupId>ICE</groupId>
<artifactId>org.eclipse.ice.viz.service.javafx.geometry</artifactId>
<packaging>eclipse-plugin</packaging>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<encoding>UTF-8</encoding>
<extraClasspathElements>
<extraClasspathElement>
<groupId>com.oracle</groupId>
<artifactId>javafx</artifactId>
<version>8.0.0-SNAPSHOT</version>
<systemPath>${java.home}/lib/jfxswt.jar</systemPath>
<scope>system</scope>
</extraClasspathElement>
</extraClasspathElements>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
\ No newline at end of file
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: JavaFX Mesh Visualization Services Plugin
Bundle-SymbolicName: org.eclipse.ice.viz.service.javafx.mesh;singleton:=true
Bundle-Version: 2.1.7.20150825
Bundle-Version: 2.1.8
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/FXMeshService.xml
Require-Bundle: org.eclipse.ui,
......
......@@ -6,10 +6,33 @@
<parent>
<groupId>ICE</groupId>
<artifactId>org.eclipse.ice.build</artifactId>
<version>2.1.7.20150825</version>
<version>2.1.8</version>
<relativePath>../${pom-filename}</relativePath>
</parent>
<groupId>ICE</groupId>
<artifactId>org.eclipse.ice.viz.service.javafx.mesh</artifactId>
<packaging>eclipse-plugin</packaging>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<encoding>UTF-8</encoding>
<extraClasspathElements>
<extraClasspathElement>
<groupId>com.oracle</groupId>
<artifactId>javafx</artifactId>
<version>8.0.0-SNAPSHOT</version>
<systemPath>${java.home}/lib/jfxswt.jar</systemPath>
<scope>system</scope>
</extraClasspathElement>
</extraClasspathElements>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
\ No newline at end of file
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: JavaFX Visualization Services Test Plugin
Bundle-SymbolicName: org.eclipse.ice.viz.service.javafx.test;singleton:=true
Bundle-Version: 2.1.7.20150825
Bundle-Version: 2.1.8
Fragment-Host: org.eclipse.ice.viz.service.javafx
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/ControllerFactory.xml,
......
......@@ -6,7 +6,7 @@
<parent>
<groupId>ICE</groupId>
<artifactId>org.eclipse.ice.build</artifactId>
<version>2.1.7.20150825</version>
<version>2.1.8</version>
<relativePath>../${pom-filename}</relativePath>
</parent>
<groupId>ICE</groupId>
......
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: JavaFX Visualization Services Plugin
Bundle-SymbolicName: org.eclipse.ice.viz.service.javafx;singleton:=true
Bundle-Version: 2.1.7.20150825
Bundle-Version: 2.1.8
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
......
......@@ -6,10 +6,33 @@
<parent>
<groupId>ICE</groupId>
<artifactId>org.eclipse.ice.build</artifactId>
<version>2.1.7.20150825</version>
<version>2.1.8</version>
<relativePath>../${pom-filename}</relativePath>
</parent>
<groupId>ICE</groupId>
<artifactId>org.eclipse.ice.viz.service.javafx</artifactId>
<packaging>eclipse-plugin</packaging>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<encoding>UTF-8</encoding>
<extraClasspathElements>
<extraClasspathElement>
<groupId>com.oracle</groupId>
<artifactId>javafx</artifactId>
<version>8.0.0-SNAPSHOT</version>
<systemPath>${java.home}/lib/jfxswt.jar</systemPath>
<scope>system</scope>
</extraClasspathElement>
</extraClasspathElements>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
\ No newline at end of file
......@@ -70,66 +70,65 @@
<module>org.eclipse.ice.target.mars</module>
<module>../ICEDeps/org.eclipse.ice.dependencies</module>
<module>org.eclipse.ice.client</module>
<!-- <module>org.eclipse.ice.client.test</module> -->
<module>org.eclipse.ice.client.test</module>
<module>org.eclipse.ice.client.compatibility</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.rcp</module>
<!-- <module>org.eclipse.ice.client.widgets.test</module> -->
<module>org.eclipse.ice.client.widgets.moose.test</module>
<!-- <module>org.eclipse.ice.client.widgets.rcp</module> -->
<module>org.eclipse.ice.client.widgets.test</module>
<module>org.eclipse.ice.client.widgets.test.utils</module>
<!-- <module>org.eclipse.ice.client.widgets.rcp.test</module> -->
<!-- <module>org.eclipse.ice.client.widgets.rcp.test</module> -->
<module>org.eclipse.ice.client.rcp</module>
<module>org.eclipse.ice.datastructures</module>
<!-- <module>org.eclipse.ice.datastructures.test</module> -->
<module>org.eclipse.ice.datastructures.test</module>
<module>org.eclipse.ice.developer</module>
<module>org.eclipse.ice.developer.moose</module>
<module>org.eclipse.ice.core</module>
<!-- <module>org.eclipse.ice.core.test</module> -->
<module>org.eclipse.ice.core.test</module>
<module>org.eclipse.ice.item</module>
<!-- <module>org.eclipse.ice.item.test</module> -->
<module>org.eclipse.ice.item.test</module>
<module>org.eclipse.ice.persistence.xml</module>
<!-- <module>org.eclipse.ice.persistence.xml.test</module> -->
<module>org.eclipse.ice.persistence.xml.test</module>
<module>org.eclipse.ice.io</module>
<!-- <module>org.eclipse.ice.io.test</module> -->
<!-- <module>org.eclipse.ice.reactor.plant</module> -->
<!-- <module>org.eclipse.ice.reactor.plant.test</module> -->
<module>org.eclipse.ice.io.test</module>
<module>org.eclipse.ice.reactor.plant</module>
<module>org.eclipse.ice.reactor.plant.test</module>
<module>org.eclipse.ice.vibe</module>
<!-- <module>org.eclipse.ice.vibe.test</module> -->
<module>org.eclipse.ice.vibe.test</module>
<module>org.eclipse.ice.proteus</module>
<!-- <module>org.eclipse.ice.proteus.test</module> -->
<module>org.eclipse.ice.proteus.test</module>
<module>org.eclipse.ice.mesh</module>
<!-- <module>org.eclipse.ice.mesh.test</module> -->
<module>org.eclipse.ice.mesh.test</module>
<module>org.eclipse.ice.nek5000</module>
<!-- <module>org.eclipse.ice.nek5000.test</module> -->
<module>org.eclipse.ice.nek5000.test</module>
<module>../visit_java_client/gov.lbnl.visit.swt</module>
<module>org.eclipse.ice.viz</module>
<!-- <module>org.eclipse.ice.viz.test</module> -->
<module>org.eclipse.ice.viz.test</module>
<module>org.eclipse.ice.viz.service</module>
<!-- <module>org.eclipse.ice.viz.service.test</module> -->
<module>org.eclipse.ice.viz.service.test</module>
<module>org.eclipse.ice.viz.service.geometry</module>
<!-- <module>org.eclipse.ice.viz.service.geometry.test</module> -->
<module>org.eclipse.ice.viz.service.geometry.test</module>
<module>org.eclipse.ice.viz.service.javafx</module>
<!-- <module>org.eclipse.ice.viz.service.javafx.test</module> -->
<!-- <module>org.eclipse.ice.viz.service.javafx.geometry</module> -->
<!-- <module>org.eclipse.ice.viz.service.javafx.test</module> -->
<module>org.eclipse.ice.viz.service.javafx.geometry</module>
<module>org.eclipse.ice.viz.service.javafx.mesh</module>
<!-- <module>org.eclipse.ice.viz.service.jme3</module> -->
<!-- <module>org.eclipse.ice.viz.service.jme3.test</module> -->
<!-- <module>org.eclipse.ice.viz.service.jme3</module>
<module>org.eclipse.ice.viz.service.jme3.test</module> -->
<module>org.eclipse.ice.viz.service.mesh</module>
<!-- <module>org.eclipse.ice.viz.service.mesh.test</module> -->
<module>org.eclipse.ice.viz.service.mesh.test</module>
<module>org.eclipse.ice.viz.service.visit</module>
<!-- <module>org.eclipse.ice.viz.service.visit.test</module> -->
<module>org.eclipse.ice.viz.service.visit.test</module>
<module>org.eclipse.ice.viz.service.paraview</module>
<module>org.eclipse.ice.viz.service.paraview.web</module>
<!-- <module>org.eclipse.ice.viz.service.paraview.test</module> -->
<module>org.eclipse.ice.viz.service.paraview.test</module>
<module>org.eclipse.ice.materials</module>
<!-- <module>org.eclipse.ice.materials.test</module> -->
<module>org.eclipse.ice.materials.test</module>
<module>org.eclipse.ice.materials.ui</module>
<module>org.eclipse.ice.caebat.batml</module>
<!-- <module>org.eclipse.ice.caebat.batml.test</module> -->
<module>org.eclipse.ice.caebat.batml.test</module>
<module>org.eclipse.ice.reflectivity</module>
<!-- <module>org.eclipse.ice.reflectivity.test</module> -->
<module>org.eclipse.ice.reflectivity.test</module>
<module>org.eclipse.ice.reflectivity.ui</module>
<!-- DO NOT ADD PLUGINS AFTER THIS LINE! THE FOLLOWING BUNDLE MUST BUILD
LAST! -->
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment