Adding code to update the new moose project's include paths, indexer

still not working though. Started on the new kernel handler. Merge remote-tracking branch 'origin/master' into mccaskey/moose_fork_stork Conflicts: org.eclipse.ice.target.kepler/kepler_rcp.target repository/org.eclipse.ice.repository/ice.product.launch Signed-off-by: Alex McCaskey <mccaskeyaj@ornl.gov>
eclipse · Apr 21, 2015 · 471c039 · 471c039
2 parents 5c91b80 + 03ed727
commit 471c039
Show file tree

Hide file tree

Showing 106 changed files with 35,057 additions and 4,089 deletions.
diff --git a/README.md b/README.md
@@ -4,3 +4,7 @@ The Eclipse Integrated Computational Environment (ICE)
 Eclipse ICE Project Main Repository
 
 Build instructions available here: http://wiki.eclipse.org/ICE_Build_Instructions
+
+Contributions follow the standard Eclipse mechanisms. If you are looking at 
+this, then you are most likely using Git and can start the process by issuing 
+a pull request on our GitHub repo.
diff --git a/org.eclipse.ice.build/pom.xml b/org.eclipse.ice.build/pom.xml
@@ -347,8 +347,6 @@
 		<module>../tests/org.eclipse.ice.viz.service.test</module>
 		<module>../src/org.eclipse.ice.viz.service.visit</module>
 		<module>../tests/org.eclipse.ice.viz.service.visit.test</module>
-		<module>../src/org.eclipse.ice.viz.service.paraview</module>
-		<module>../tests/org.eclipse.ice.viz.service.paraview.test</module>
 		<module>../src/org.eclipse.ice.xolotl</module>
 		<module>../src/org.eclipse.ice.materials</module>
 		<module>../tests/org.eclipse.ice.materials.test</module>

diff --git a/org.eclipse.ice.target.kepler/kepler_rcp.target b/org.eclipse.ice.target.kepler/kepler_rcp.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="kepler_rcp" sequenceNumber="44">
+<?pde version="3.8"?><target name="kepler_rcp" sequenceNumber="50">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="2.2.1.201402241301"/>
@@ -83,8 +83,13 @@
 <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.mylyn.github.feature.feature.group" version="3.2.0.201312181205-r"/>
-<repository location="http://download.eclipse.org/releases/kepler"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group" version="1.3.0.201503261201"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.3.0.201503261201"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.3.0.201503261201"/>
+<unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.3.0.201503261201"/>
+<unit id="org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group" version="1.3.0.201503261201"/>
+<unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.3.0.201503261201"/>
+<repository location="http://download.eclipse.org/nattable/releases/1.3.0/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.mylyn.github.feature.feature.group" version="3.2.0.201312181205-r"/>

diff --git a/repository/org.eclipse.ice.repository/ice.macosx_product.launch b/repository/org.eclipse.ice.repository/ice.macosx_product.launch
diff --git a/repository/org.eclipse.ice.repository/ice.product b/repository/org.eclipse.ice.repository/ice.product
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="ICE" uid="ice.product" id="org.eclipse.ice.client.rcp.product" application="org.eclipse.ui.ide.workbench" version="2.0.0" useFeatures="true" includeLaunchers="true">
-
-   <configIni use="default">
-   </configIni>
-
-   <launcherArgs>
-      <programArgs>-consoleLog -console -clean
-      </programArgs>
-      <vmArgs>-Dvisit.port=5600 -DREFRESH_BUNDLES=FALSE -Xmx2048M -XX:MaxPermSize=1024M -Dmax_download_size=52428800
-      </vmArgs>
-      <vmArgsLin>-Dosgi.instance.area=@user.home/ICEFiles -Dvisit.binpath=@user.home/visit/bin
-      </vmArgsLin>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Dosgi.instance.area=@user.home/ICEFiles -Dvisit.binpath=@user.home/visit/bin
-      </vmArgsMac>
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="ICE" uid="ice.product" id="org.eclipse.ice.client.rcp.product" application="org.eclipse.ui.ide.workbench" version="2.0.0" useFeatures="true" includeLaunchers="true">
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+      <programArgs>-consoleLog -console -clean
+      </programArgs>
+      <vmArgs>-Dvisit.port=5600 -DREFRESH_BUNDLES=FALSE -Xmx2048M -XX:MaxPermSize=1024M -Dmax_download_size=52428800 -Dorg.eclipse.equinox.http.jetty.http.port=8080
+      </vmArgs>
+      <vmArgsLin>-Dosgi.instance.area=@user.home/ICEFiles -Dvisit.binpath=@user.home/visit/bin
+      </vmArgsLin>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Dosgi.instance.area=@user.home/ICEFiles -Dvisit.binpath=@user.home/visit/bin
+      </vmArgsMac>
       <vmArgsWin>-Dosgi.instance.area=@user.home\ICEFiles
 -Dvisit.binpath=C:\PROGRA~1\LLNL\VISIT2~1.2&quot;\r&quot;
--Djava.library.path=C:\PROGRA~1\HDF_Group\HDFView\2.10.1\lib&quot;\r&quot;
-      </vmArgsWin>
-   </launcherArgs>
-
-   <windowImages/>
-
-   <splash
-      location="org.eclipse.ice.client.rcp" />
-   <launcher name="ICE">
-      <solaris/>
-      <win useIco="false">
-         <bmp/>
-      </win>
-   </launcher>
-
-   <vm>
-   </vm>
-
-   <license>
-        <url>http://projects.eclipse.org/projects/technology.ice</url>
-        <text>
+-Djava.library.path=C:\PROGRA~1\HDF_Group\HDFView\2.10.1\lib&quot;\r&quot;
+      </vmArgsWin>
+   </launcherArgs>
+
+   <windowImages/>
+
+   <splash
+      location="org.eclipse.ice.client.rcp" />
+   <launcher name="ICE">
+      <solaris/>
+      <win useIco="false">
+         <bmp/>
+      </win>
+   </launcher>
+
+   <vm>
+   </vm>
+
+   <license>
+        <url>http://projects.eclipse.org/projects/technology.ice</url>
+        <text>
    Eclipse Foundation Software User Agreement
 
 July 1, 2014
@@ -91,67 +91,67 @@ Cryptography
 
 Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country&amp;apos;s laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
 
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, or countries, or both.
-         </text>
-   </license>
-
-   <plugins>
-   </plugins>
-
-   <features>
-      <feature id="org.eclipse.ice" version="2.0.0"/>
-      <feature id="org.eclipse.rcp" version="4.3.2.v20140221-1700"/>
-   </features>
-
-   <configurations>
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.e4.ui.workbench.addons.swt" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
-      <plugin id="org.eclipse.equinox.util" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.analysistool" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.client" 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.moose" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.client.widgets.rcp" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.client.widgets.reactoreditor" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.client.widgets.reactoreditor.grid" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.client.widgets.reactoreditor.lwr" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.client.widgets.reactoreditor.sfr" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.core" autoStart="true" startLevel="5" />
-      <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.io" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.item" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.kdd" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.materials" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.materials.ui" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.mesh" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.nek5000" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.persistence.xml" autoStart="true" startLevel="5" />
-      <plugin id="org.eclipse.ice.proteus" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.reactor" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.reactor.perspective" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.reactor.plant" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.reactor.sfr" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.reactorAnalyzer" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.sassena" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.vibe" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.viz" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.viz.service" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.viz.service.paraview" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.viz.service.visit" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ice.xolotl" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1" />
-      <plugin id="org.eclipse.platform" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ui.forms" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ui.intro" autoStart="true" startLevel="0" />
-      <property name="eclipse.p2.data.area" value="@config.dir/../p2" />
-      <property name="eclipse.p2.profile" value="epp.package.rcp" />
-   </configurations>
-
-</product>
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, or countries, or both.
+         </text>
+   </license>
+
+   <plugins>
+   </plugins>
+
+   <features>
+      <feature id="org.eclipse.ice" version="2.0.0"/>
+      <feature id="org.eclipse.rcp" version="4.3.2.v20140221-1700"/>
+   </features>
+
+   <configurations>
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.e4.ui.workbench.addons.swt" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="org.eclipse.equinox.util" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.analysistool" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.client" 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.moose" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.client.widgets.rcp" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.client.widgets.reactoreditor" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.client.widgets.reactoreditor.grid" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.client.widgets.reactoreditor.lwr" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.client.widgets.reactoreditor.sfr" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.core" autoStart="true" startLevel="5" />
+      <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.io" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.item" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.kdd" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.materials" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.materials.ui" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.mesh" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.nek5000" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.persistence.xml" autoStart="true" startLevel="5" />
+      <plugin id="org.eclipse.ice.proteus" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.reactor" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.reactor.perspective" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.reactor.plant" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.reactor.sfr" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.reactorAnalyzer" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.sassena" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.vibe" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.viz" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.viz.service" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.viz.service.paraview" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.viz.service.visit" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ice.xolotl" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1" />
+      <plugin id="org.eclipse.platform" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ui.forms" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.ui.intro" autoStart="true" startLevel="0" />
+      <property name="eclipse.p2.data.area" value="@config.dir/../p2" />
+      <property name="eclipse.p2.profile" value="epp.package.rcp" />
+   </configurations>
+
+</product>
diff --git a/repository/org.eclipse.ice.repository/ice.product.launch b/repository/org.eclipse.ice.repository/ice.product.launch
diff --git a/src/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF b/src/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF
@@ -19,8 +19,6 @@ Import-Package: com.jme3.math,
  org.eclipse.ice.item.jobLauncher,
  org.eclipse.ice.item.nuclear,
  org.eclipse.ice.reactor.plant,
- org.eclipse.ice.viz.service,
- org.eclipse.ice.viz.service.visit,
  org.eclipse.ui,
  org.eclipse.ui.views.properties,
  org.eclipse.ui.views.properties.tabbed,
@@ -34,6 +32,8 @@ Require-Bundle: org.eclipse.ice.client.compatibility;bundle-version="2.0.0",
  org.eclipse.egit.github.core;bundle-version="3.2.0",
  org.eclipse.cdt.core;bundle-version="5.6.0",
  org.eclipse.core.runtime;bundle-version="3.9.100",
- org.eclipse.cdt.make.core;bundle-version="7.3.0"
+ org.eclipse.cdt.make.core;bundle-version="7.3.0",
+ org.eclipse.cdt.managedbuilder.core;bundle-version="8.3.0",
+ org.eclipse.cdt.ui;bundle-version="5.7.0"
 Service-Component: OSGI-INF/MOOSEEditorComponent.xml
 Export-Package: org.eclipse.ice.client.widgets.moose
diff --git a/src/org.eclipse.ice.client.widgets.moose/plugin.xml b/src/org.eclipse.ice.client.widgets.moose/plugin.xml
@@ -167,12 +167,12 @@
       <command
             defaultHandler="org.eclipse.ice.client.widgets.moose.NewKernelHandler"
             id="org.eclipse.ice.client.widgets.moose.newkernel"
-            name="New MOOOSE Kernel">
+            name="Kernel">
       </command>
    </extension>
    <extension
          point="org.eclipse.ui.menus">
-      <menuContribution
+      <!--<menuContribution
             locationURI="popup:common.new.menu?after=new">
          <command
                commandId="org.eclipse.ice.client.widgets.moose.newkernel"
@@ -188,15 +188,15 @@
                </with>
             </visibleWhen>
          </command>
-      </menuContribution>
+      </menuContribution>-->
       <menuContribution
             locationURI="popup:common.new.menu?after=new">
          <menu
-               id="org.eclipse.ui.navigator.ProjectExplorer.newkernel"
-               label="New MOOSE Kernel">
+               id="org.eclipse.ui.navigator.ProjectExplorer.newmooseobject"
+               label="MOOSE Object">
             <command
                   commandId="org.eclipse.ice.client.widgets.moose.newkernel"
-                  label="New MOOSE Kernel"
+                  label="Kernel"
                   style="push">
             </command>
          </menu>