Merge remote-tracking branch 'origin/master' into andrew/proteus

Conflicts:
	org.eclipse.ice.target.kepler/kepler_rcp.target
	repository/org.eclipse.ice.repository/ice.product.launch

Signed-off-by: arbennett <bennettar@ornl.gov>

features/org.eclipse.ice.feature/feature.xml

@@ -2338,11 +2338,4 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.ice.viz.service.paraview"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>

repository/org.eclipse.ice.repository/ice.product

@@ -143,7 +143,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <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" />

src/org.eclipse.ice.client.widgets.moose/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

src/org.eclipse.ice.client.widgets.moose/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7

src/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: ICE Moose Widgets
 Bundle-SymbolicName: org.eclipse.ice.client.widgets.moose;singleton:=true
 Bundle-Version: 2.0.0
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: com.jme3.math,
  org.eclipse.core.resources,
  org.eclipse.core.runtime;version="3.4.0",
@@ -30,6 +30,10 @@ Require-Bundle: org.eclipse.ice.client.compatibility;bundle-version="2.0.0",
  org.eclipse.egit;bundle-version="3.2.0",
  org.eclipse.egit.core;bundle-version="3.2.0",
  org.eclipse.egit.github.core;bundle-version="3.2.0",
- org.eclipse.cdt.core;bundle-version="5.6.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.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

src/org.eclipse.ice.client.widgets.moose/plugin.xml

@@ -152,5 +152,55 @@
             </toolbar>
          </menuContribution>
       </extension>
+      <extension
+            point="org.eclipse.ui.preferencePages">
+         <page
+               class="org.eclipse.ice.client.widgets.moose.MoosePreferencePage"
+               id="org.eclipse.ice.client.widgets.moose.page1"
+               name="MOOSE">
+         </page>
+      </extension>
+
+
+      <extension
+         point="org.eclipse.ui.commands">
+      <command
+            defaultHandler="org.eclipse.ice.client.widgets.moose.NewKernelHandler"
+            id="org.eclipse.ice.client.widgets.moose.newkernel"
+            name="Kernel">
+      </command>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <!--<menuContribution
+            locationURI="popup:common.new.menu?after=new">
+         <command
+               commandId="org.eclipse.ice.client.widgets.moose.newkernel"
+               label="New MOOSE Kernel"
+               style="push">
+            <visibleWhen
+                  checkEnabled="false">
+               <with
+                     variable="activeWorkbenchWindow.activePerspective">
+                  <equals
+                        value="org.eclipse.cdt.ui.CPerspective">
+                  </equals>
+               </with>
+            </visibleWhen>
+         </command>
+      </menuContribution>-->
+      <menuContribution
+            locationURI="popup:common.new.menu?after=new">
+         <menu
+               id="org.eclipse.ui.navigator.ProjectExplorer.newmooseobject"
+               label="MOOSE Object">
+            <command
+                  commandId="org.eclipse.ice.client.widgets.moose.newkernel"
+                  label="Kernel"
+                  style="push">
+            </command>
+         </menu>
+      </menuContribution>
+   </extension>
 
 </plugin>