Commit d1867798 authored by Greg Watson's avatar Greg Watson
Browse files

Issue #179 - updates for new EAVP structure and repo


Signed-off-by: Greg Watson's avatarGreg Watson <g.watson@computer.org>
parent eb10a872
......@@ -56,27 +56,6 @@
<module>../org.eclipse.ice.target.mars</module>
<module>../org.eclipse.ice.vibe</module>
<module>../org.eclipse.ice.vibe.test</module>
<module>../org.eclipse.eavp.feature</module>
<module>../org.eclipse.eavp.viz</module>
<module>../org.eclipse.eavp.viz.service</module>
<module>../org.eclipse.eavp.viz.service.geometry</module>
<module>../org.eclipse.eavp.viz.service.geometry.test</module>
<module>../org.eclipse.eavp.viz.service.javafx</module>
<module>../org.eclipse.eavp.viz.service.javafx.geometry</module>
<module>
../org.eclipse.eavp.viz.service.javafx.geometry.test
</module>
<module>../org.eclipse.eavp.viz.service.javafx.mesh</module>
<module>../org.eclipse.eavp.viz.service.javafx.test</module>
<module>../org.eclipse.eavp.viz.service.mesh</module>
<module>../org.eclipse.eavp.viz.service.mesh.test</module>
<module>../org.eclipse.eavp.viz.service.paraview</module>
<module>../org.eclipse.eavp.viz.service.paraview.test</module>
<module>../org.eclipse.eavp.viz.service.paraview.web</module>
<module>../org.eclipse.eavp.viz.service.test</module>
<module>../org.eclipse.eavp.viz.service.visit</module>
<module>../org.eclipse.eavp.viz.service.visit.test</module>
<module>../org.eclipse.eavp.viz.test</module>
<module>../org.eclipse.ice.feature</module>
<module>../org.eclipse.ice.repository</module>
<module>../org.eclipse.ice.product</module>
......
......@@ -4,48 +4,28 @@ Bundle-Name: ICE Moose Widgets
Bundle-SymbolicName: org.eclipse.ice.client.widgets.moose;singleton:=true
Bundle-Version: 2.1.8.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: org.apache.commons.io;version="2.0.1",
org.eclipse.cdt.core,
Import-Package: org.apache.commons.io,
org.eclipse.cdt.core.model,
org.eclipse.cdt.core.model.util,
org.eclipse.cdt.core.settings.model,
org.eclipse.cdt.core.settings.model.extension,
org.eclipse.cdt.make.core,
org.eclipse.cdt.managedbuilder.core,
org.eclipse.cdt.managedbuilder.internal.core,
org.eclipse.cdt.managedbuilder.ui.wizards,
org.eclipse.cdt.newmake.core,
org.eclipse.core.resources,
org.eclipse.core.runtime;version="3.4.0",
org.eclipse.core.runtime.jobs,
org.eclipse.core.runtime.preferences;version="3.3.0",
org.eclipse.core.runtime,
org.eclipse.eavp.viz.datastructures.VizObject,
org.eclipse.eavp.viz.service,
org.eclipse.eavp.viz.service.internal,
org.eclipse.eavp.viz.service.javafx.geometry,
org.eclipse.eavp.viz.service.javafx.geometry.plant,
org.eclipse.egit.github.core;version="3.2.0",
org.eclipse.egit.github.core.client;version="3.2.0",
org.eclipse.egit.github.core.service;version="3.2.0",
org.eclipse.ice.client.common,
org.eclipse.ice.client.common.properties,
org.eclipse.ice.client.widgets,
org.eclipse.ice.iclient.uiwidgets,
org.eclipse.ice.item,
org.eclipse.ice.item.jobLauncher,
org.eclipse.ice.item.nuclear,
org.eclipse.ice.persistence.xml,
org.eclipse.ice.reactor.plant,
org.eclipse.jgit.api;version="4.0.0",
org.eclipse.jgit.api.errors;version="4.0.0",
org.eclipse.ui,
org.eclipse.ui.views.properties,
org.eclipse.ui.views.properties.tabbed,
org.osgi.framework;version="1.7.0",
org.slf4j;version="1.7.2"
Require-Bundle: org.eclipse.ice.client.compatibility;bundle-version="2.0.0",
org.osgi.framework,
org.slf4j
Require-Bundle: org.eclipse.ice.client.compatibility,
org.eclipse.ice.datastructures,
org.eclipse.core.runtime;bundle-version="3.11.0",
org.eclipse.swt
org.eclipse.core.runtime
Service-Component: OSGI-INF/viewFactory.xml
Export-Package: org.eclipse.ice.client.widgets.moose
Bundle-Vendor: Oak Ridge National Laboratory
......
......@@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.ice.client.widgets;bundle-version="2.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.eclipse.eavp.viz.service.geometry.shapes,
org.eclipse.eavp.viz.service.geometry.widgets,
org.eclipse.eavp.viz.service.modeling,
org.eclipse.eavp.viz.modeling,
org.eclipse.ui,
org.junit
Require-Bundle: org.eclipse.swtbot.eclipse.core,
......
......@@ -14,9 +14,9 @@ package org.eclipse.ice.client.widgets.test;
import static org.junit.Assert.assertTrue;
import org.eclipse.eavp.viz.service.modeling.BasicView;
import org.eclipse.eavp.viz.service.modeling.ShapeController;
import org.eclipse.eavp.viz.service.modeling.ShapeMesh;
import org.eclipse.eavp.viz.modeling.base.BasicView;
import org.eclipse.eavp.viz.modeling.ShapeController;
import org.eclipse.eavp.viz.modeling.ShapeMesh;
import org.eclipse.ice.client.widgets.ICEFormEditor;
import org.eclipse.ice.client.widgets.ICEGeometryPage;
import org.eclipse.ice.datastructures.form.GeometryComponent;
......
......@@ -18,14 +18,14 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import org.eclipse.eavp.viz.modeling.base.BasicView;
import org.eclipse.eavp.viz.modeling.properties.MeshProperty;
import org.eclipse.eavp.viz.modeling.ShapeController;
import org.eclipse.eavp.viz.modeling.ShapeMesh;
import org.eclipse.eavp.viz.service.geometry.shapes.GeometryMeshProperty;
import org.eclipse.eavp.viz.service.geometry.shapes.OperatorType;
import org.eclipse.eavp.viz.service.geometry.shapes.ShapeType;
import org.eclipse.eavp.viz.service.geometry.widgets.ShapeTreeContentProvider;
import org.eclipse.eavp.viz.service.modeling.BasicView;
import org.eclipse.eavp.viz.service.modeling.MeshProperty;
import org.eclipse.eavp.viz.service.modeling.ShapeController;
import org.eclipse.eavp.viz.service.modeling.ShapeMesh;
import org.eclipse.ice.datastructures.form.GeometryComponent;
import org.junit.Test;
......
......@@ -15,14 +15,14 @@ package org.eclipse.ice.client.widgets.test.geometry;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import org.eclipse.eavp.viz.modeling.base.BasicView;
import org.eclipse.eavp.viz.modeling.properties.MeshProperty;
import org.eclipse.eavp.viz.modeling.ShapeController;
import org.eclipse.eavp.viz.modeling.ShapeMesh;
import org.eclipse.eavp.viz.service.geometry.shapes.GeometryMeshProperty;
import org.eclipse.eavp.viz.service.geometry.shapes.OperatorType;
import org.eclipse.eavp.viz.service.geometry.shapes.ShapeType;
import org.eclipse.eavp.viz.service.geometry.widgets.ShapeTreeLabelProvider;
import org.eclipse.eavp.viz.service.modeling.BasicView;
import org.eclipse.eavp.viz.service.modeling.MeshProperty;
import org.eclipse.eavp.viz.service.modeling.ShapeController;
import org.eclipse.eavp.viz.service.modeling.ShapeMesh;
import org.junit.Test;
/**
......
......@@ -30,16 +30,18 @@ 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.VizObject,
org.eclipse.eavp.viz.modeling,
org.eclipse.eavp.viz.modeling.base,
org.eclipse.eavp.viz.modeling.properties,
org.eclipse.eavp.viz.service,
org.eclipse.eavp.viz.service.csv,
org.eclipse.eavp.viz.service.datastructures,
org.eclipse.eavp.viz.service.datastructures.VizObject,
org.eclipse.eavp.viz.service.geometry.shapes,
org.eclipse.eavp.viz.service.geometry.widgets,
org.eclipse.eavp.viz.service.internal,
org.eclipse.eavp.viz.service.mesh.datastructures,
org.eclipse.eavp.viz.service.mesh.properties,
org.eclipse.eavp.viz.service.modeling,
org.eclipse.eavp.viz.service.widgets,
org.eclipse.gef,
org.eclipse.gef.editparts,
......
......@@ -14,12 +14,12 @@ package org.eclipse.ice.client.widgets;
import java.util.ArrayList;
import org.eclipse.eavp.viz.modeling.base.BasicController;
import org.eclipse.eavp.viz.modeling.FaceController;
import org.eclipse.eavp.viz.modeling.base.IController;
import org.eclipse.eavp.viz.modeling.properties.MeshCategory;
import org.eclipse.eavp.viz.modeling.properties.MeshProperty;
import org.eclipse.eavp.viz.service.mesh.properties.MeshSelection;
import org.eclipse.eavp.viz.service.modeling.BasicController;
import org.eclipse.eavp.viz.service.modeling.FaceController;
import org.eclipse.eavp.viz.service.modeling.IController;
import org.eclipse.eavp.viz.service.modeling.MeshCategory;
import org.eclipse.eavp.viz.service.modeling.MeshProperty;
import org.eclipse.ice.datastructures.ICEObject.IUpdateable;
import org.eclipse.ice.datastructures.ICEObject.IUpdateableListener;
import org.eclipse.ice.datastructures.form.Form;
......
......@@ -15,12 +15,12 @@ package org.eclipse.ice.client.widgets;
import java.util.ArrayList;
import java.util.Hashtable;
import org.eclipse.eavp.viz.service.modeling.MeshCategory;
import org.eclipse.eavp.viz.service.modeling.EdgeController;
import org.eclipse.eavp.viz.service.modeling.FaceController;
import org.eclipse.eavp.viz.service.modeling.IController;
import org.eclipse.eavp.viz.service.modeling.MeshProperty;
import org.eclipse.eavp.viz.service.modeling.VertexController;
import org.eclipse.eavp.viz.modeling.EdgeController;
import org.eclipse.eavp.viz.modeling.FaceController;
import org.eclipse.eavp.viz.modeling.base.IController;
import org.eclipse.eavp.viz.modeling.properties.MeshCategory;
import org.eclipse.eavp.viz.modeling.properties.MeshProperty;
import org.eclipse.eavp.viz.modeling.VertexController;
import org.eclipse.ice.client.common.PropertySource;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertySource;
......
......@@ -10,7 +10,9 @@ Require-Bundle: org.junit;bundle-version="4.8.2",
org.eclipse.eavp.viz.service.geometry,
org.eclipse.eavp.viz.service.mesh,
org.eclipse.platform;bundle-version="4.5.0",
org.eclipse.core.resources
org.eclipse.core.resources,
org.eclipse.eavp.viz.modeling,
org.eclipse.eavp.viz.datastructures
Import-Package: ca.odell.glazedlists,
ca.odell.glazedlists.event,
ca.odell.glazedlists.gui,
......
......@@ -23,12 +23,12 @@ import java.util.List;
import org.eclipse.eavp.viz.service.geometry.shapes.GeometryMeshProperty;
import org.eclipse.eavp.viz.service.geometry.shapes.OperatorType;
import org.eclipse.eavp.viz.service.geometry.shapes.ShapeType;
import org.eclipse.eavp.viz.service.modeling.BasicController;
import org.eclipse.eavp.viz.service.modeling.BasicView;
import org.eclipse.eavp.viz.service.modeling.IController;
import org.eclipse.eavp.viz.service.modeling.MeshProperty;
import org.eclipse.eavp.viz.service.modeling.ShapeController;
import org.eclipse.eavp.viz.service.modeling.ShapeMesh;
import org.eclipse.eavp.viz.modeling.base.BasicController;
import org.eclipse.eavp.viz.modeling.base.BasicView;
import org.eclipse.eavp.viz.modeling.base.IController;
import org.eclipse.eavp.viz.modeling.properties.MeshProperty;
import org.eclipse.eavp.viz.modeling.ShapeController;
import org.eclipse.eavp.viz.modeling.ShapeMesh;
import org.eclipse.ice.datastructures.ICEObject.Component;
import org.eclipse.ice.datastructures.form.GeometryComponent;
import org.junit.Test;
......
......@@ -22,17 +22,17 @@ import java.util.List;
import org.eclipse.eavp.viz.service.mesh.datastructures.NekPolygonController;
import org.eclipse.eavp.viz.service.mesh.datastructures.NekPolygonMesh;
import org.eclipse.eavp.viz.service.modeling.BasicController;
import org.eclipse.eavp.viz.service.modeling.BasicView;
import org.eclipse.eavp.viz.service.modeling.EdgeController;
import org.eclipse.eavp.viz.service.modeling.DetailedEdgeController;
import org.eclipse.eavp.viz.service.modeling.DetailedEdgeMesh;
import org.eclipse.eavp.viz.service.modeling.IController;
import org.eclipse.eavp.viz.service.modeling.LinearEdgeMesh;
import org.eclipse.eavp.viz.service.modeling.MeshCategory;
import org.eclipse.eavp.viz.service.modeling.MeshProperty;
import org.eclipse.eavp.viz.service.modeling.VertexController;
import org.eclipse.eavp.viz.service.modeling.VertexMesh;
import org.eclipse.eavp.viz.modeling.base.BasicController;
import org.eclipse.eavp.viz.modeling.base.BasicView;
import org.eclipse.eavp.viz.modeling.EdgeController;
import org.eclipse.eavp.viz.modeling.DetailedEdgeController;
import org.eclipse.eavp.viz.modeling.DetailedEdgeMesh;
import org.eclipse.eavp.viz.modeling.base.IController;
import org.eclipse.eavp.viz.modeling.LinearEdgeMesh;
import org.eclipse.eavp.viz.modeling.properties.MeshCategory;
import org.eclipse.eavp.viz.modeling.properties.MeshProperty;
import org.eclipse.eavp.viz.modeling.VertexController;
import org.eclipse.eavp.viz.modeling.VertexMesh;
import org.eclipse.ice.datastructures.form.MeshComponent;
import org.junit.Test;
......
......@@ -17,11 +17,11 @@ import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
import org.eclipse.eavp.viz.service.datastructures.VizObject.IManagedUpdateable;
import org.eclipse.eavp.viz.service.datastructures.VizObject.IManagedUpdateableListener;
import org.eclipse.eavp.viz.service.datastructures.VizObject.IVizUpdateable;
import org.eclipse.eavp.viz.service.datastructures.VizObject.IVizUpdateableListener;
import org.eclipse.eavp.viz.service.datastructures.VizObject.SubscriptionType;
import org.eclipse.eavp.viz.datastructures.VizObject.IManagedUpdateable;
import org.eclipse.eavp.viz.datastructures.VizObject.IManagedUpdateableListener;
import org.eclipse.eavp.viz.datastructures.VizObject.IVizUpdateable;
import org.eclipse.eavp.viz.datastructures.VizObject.IVizUpdateableListener;
import org.eclipse.eavp.viz.datastructures.VizObject.SubscriptionType;
import org.eclipse.ice.datastructures.ICEObject.IUpdateable;
import org.eclipse.ice.datastructures.ICEObject.IUpdateableListener;
......
......@@ -20,8 +20,10 @@ Import-Package: ca.odell.glazedlists,
org.eclipse.core.resources,
org.eclipse.core.runtime;version="3.5.0",
org.eclipse.core.runtime.content,
org.eclipse.eavp.viz.service.datastructures.VizObject,
org.eclipse.eavp.viz.service.modeling,
org.eclipse.eavp.viz.datastructures.VizObject,
org.eclipse.eavp.viz.modeling,
org.eclipse.eavp.viz.modeling.base,
org.eclipse.eavp.viz.modeling.properties,
org.eclipse.emf.common,
org.eclipse.emf.common.util,
org.eclipse.emf.ecore,
......
......@@ -19,11 +19,11 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import org.eclipse.eavp.viz.service.datastructures.VizObject.IManagedUpdateable;
import org.eclipse.eavp.viz.service.datastructures.VizObject.IManagedUpdateableListener;
import org.eclipse.eavp.viz.service.datastructures.VizObject.SubscriptionType;
import org.eclipse.eavp.viz.service.modeling.MeshProperty;
import org.eclipse.eavp.viz.service.modeling.ShapeController;
import org.eclipse.eavp.viz.modeling.properties.MeshProperty;
import org.eclipse.eavp.viz.modeling.ShapeController;
import org.eclipse.eavp.viz.datastructures.VizObject.IManagedUpdateable;
import org.eclipse.eavp.viz.datastructures.VizObject.IManagedUpdateableListener;
import org.eclipse.eavp.viz.datastructures.VizObject.SubscriptionType;
import org.eclipse.ice.datastructures.ICEObject.Component;
import org.eclipse.ice.datastructures.ICEObject.ICEObject;
import org.eclipse.ice.datastructures.ICEObject.IUpdateable;
......
......@@ -19,14 +19,14 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import org.eclipse.eavp.viz.service.datastructures.VizObject.IManagedUpdateable;
import org.eclipse.eavp.viz.service.datastructures.VizObject.IManagedUpdateableListener;
import org.eclipse.eavp.viz.service.datastructures.VizObject.SubscriptionType;
import org.eclipse.eavp.viz.service.modeling.BasicController;
import org.eclipse.eavp.viz.service.modeling.BasicMesh;
import org.eclipse.eavp.viz.service.modeling.BasicView;
import org.eclipse.eavp.viz.service.modeling.FaceController;
import org.eclipse.eavp.viz.service.modeling.IController;
import org.eclipse.eavp.viz.modeling.base.BasicController;
import org.eclipse.eavp.viz.modeling.base.BasicMesh;
import org.eclipse.eavp.viz.modeling.base.BasicView;
import org.eclipse.eavp.viz.modeling.FaceController;
import org.eclipse.eavp.viz.modeling.base.IController;
import org.eclipse.eavp.viz.datastructures.VizObject.IManagedUpdateable;
import org.eclipse.eavp.viz.datastructures.VizObject.IManagedUpdateableListener;
import org.eclipse.eavp.viz.datastructures.VizObject.SubscriptionType;
import org.eclipse.ice.datastructures.ICEObject.Component;
import org.eclipse.ice.datastructures.ICEObject.ICEObject;
import org.eclipse.ice.datastructures.componentVisitor.IComponentVisitor;
......
......@@ -8,6 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: com.spotify.docker.client,
org.apache.http.conn;version="4.3.4",
org.bouncycastle.openssl;version="1.51.0",
org.eclipse.eavp.viz.datastructures.VizObject,
org.eclipse.eavp.viz.service.mesh.datastructures,
org.eclipse.ice.core.iCore,
org.eclipse.ice.datastructures.entry,
......
......@@ -10,9 +10,10 @@ Import-Package: com.google.common.collect;version="10.0.1",
com.spotify.docker.client,
com.spotify.docker.client.messages,
org.apache.commons.io,
org.eclipse.eavp.viz.service.datastructures,
org.eclipse.eavp.viz.datastructures,
org.eclipse.eavp.viz.modeling,
org.eclipse.eavp.viz.modeling.base,
org.eclipse.eavp.viz.service.mesh.datastructures,
org.eclipse.eavp.viz.service.modeling,
org.eclipse.ice.datastructures.ICEObject,
org.eclipse.ice.datastructures.componentVisitor,
org.eclipse.ice.datastructures.form,
......
......@@ -15,9 +15,9 @@ package org.eclipse.ice.item.geometry;
import javax.xml.bind.annotation.XmlRootElement;
import org.eclipse.core.resources.IProject;
import org.eclipse.eavp.viz.service.modeling.BasicView;
import org.eclipse.eavp.viz.service.modeling.ShapeController;
import org.eclipse.eavp.viz.service.modeling.ShapeMesh;
import org.eclipse.eavp.viz.modeling.base.BasicView;
import org.eclipse.eavp.viz.modeling.ShapeController;
import org.eclipse.eavp.viz.modeling.ShapeMesh;
import org.eclipse.ice.datastructures.form.Form;
import org.eclipse.ice.datastructures.form.GeometryComponent;
import org.eclipse.ice.item.Item;
......
......@@ -7,3 +7,4 @@ Fragment-Host: org.eclipse.ice.mesh;bundle-version="2.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.junit
Bundle-Vendor: Oak Ridge National Laboratory
Import-Package: org.eclipse.eavp.viz.datastructures.VizObject
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