Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[ice-build] [eclipse/ice] ac780d: Merging next into mccaskey/joblauncherRefactor

  Branch: refs/heads/jay/cleanup
  Home:   https://github.com/eclipse/ice
  Commit: ac780d22d1f1aff77d15e258e3ad1209fc62f088
      https://github.com/eclipse/ice/commit/ac780d22d1f1aff77d15e258e3ad1209fc62f088
  Author: amccaskey <mccaskeyaj@xxxxxxxx>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    M native/org.eclipse.ice.updater/src/ErrorLogger.cpp
    M native/org.eclipse.ice.updater/src/ErrorLogger.h
    M native/org.eclipse.ice.updater/src/LibcurlUtils.cpp
    M native/org.eclipse.ice.updater/src/LibcurlUtils.h
    M native/org.eclipse.ice.updater/src/Post.cpp
    M native/org.eclipse.ice.updater/src/Post.h
    M native/org.eclipse.ice.updater/src/PostType.h
    M native/org.eclipse.ice.updater/src/PropertyType.h
    M native/org.eclipse.ice.updater/src/Updater.cpp
    M native/org.eclipse.ice.updater/src/Updater.h
    M native/org.eclipse.ice.updater/tests/ErrorLoggerTester.cpp
    M native/org.eclipse.ice.updater/tests/LibcurlUtilsTester.cpp
    M native/org.eclipse.ice.updater/tests/PostTester.cpp
    M native/org.eclipse.ice.updater/tests/PostTester.php
    M native/org.eclipse.ice.updater/tests/TesterPropertyType.h
    M native/org.eclipse.ice.updater/tests/TesterUtils.cpp
    M native/org.eclipse.ice.updater/tests/TesterUtils.h
    M native/org.eclipse.ice.updater/tests/TesterUtilsConfig.h
    M native/org.eclipse.ice.updater/tests/TesterUtilsConfig.h.in
    M native/org.eclipse.ice.updater/tests/UpdaterTester.cpp
    M native/org.eclipse.ice.updater/tests/UpdaterTester.php
    M org.eclipse.ice.client.widgets.reactoreditor.test/src/org/eclipse/ice/client/widgets/reactoreditor/test/DenovoReactorFactory.java
    M org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfFileFactoryTester.java
    M org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfReaderFactoryTester.java
    M org.eclipse.ice.io.test/src/org/eclipse/ice/io/hdf/test/HdfWriterFactoryTester.java
    M org.eclipse.ice.io/src/org/eclipse/ice/io/hdf/HdfFileFactory.java
    M org.eclipse.ice.io/src/org/eclipse/ice/io/hdf/HdfReaderFactory.java
    M org.eclipse.ice.io/src/org/eclipse/ice/io/hdf/HdfWriterFactory.java
    M org.eclipse.ice.io/src/org/eclipse/ice/io/hdf/IHdfReadable.java
    M org.eclipse.ice.io/src/org/eclipse/ice/io/hdf/IHdfReader.java
    M org.eclipse.ice.io/src/org/eclipse/ice/io/hdf/IHdfWriteable.java
    M org.eclipse.ice.io/src/org/eclipse/ice/io/hdf/IHdfWriter.java
    M org.eclipse.ice.reactor.test/src/org/eclipse/ice/reactor/test/LWRComponentReaderTester.java
    M org.eclipse.ice.reactor.test/src/org/eclipse/ice/reactor/test/LWRComponentWriterTester.java
    M org.eclipse.ice.reactor.test/src/org/eclipse/ice/reactor/test/pwr/PWReactorHDF5IntegrationTester.java

  Log Message:
  -----------
  Merging next into mccaskey/joblauncherRefactor

Signed-off-by: amccaskey <mccaskeyaj@xxxxxxxx>


  Commit: e5ef364a78369e545602bdde03be5d79f05548a6
      https://github.com/eclipse/ice/commit/e5ef364a78369e545602bdde03be5d79f05548a6
  Author: amccaskey <mccaskeyaj@xxxxxxxx>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    M org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java
    M org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeActionFactory.java
    M org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestAction.java
    M org.eclipse.ice.item/plugin.xml
    A org.eclipse.ice.item/schema/actionFactory.exsd
    A org.eclipse.ice.item/schema/actions.exsd
    M org.eclipse.ice.item/src/org/eclipse/ice/item/IActionFactory.java
    A org.eclipse.ice.item/src/org/eclipse/ice/item/ICEActionFactory.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/Item.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/Action.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/JobLaunchAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteFileDownloadAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteFileUploadAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/TaggedOutputWriterAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/JobLauncher.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/CheckMooseInputAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/RemoteYamlSyntaxGenerator.java

  Log Message:
  -----------
  Started work on IActionFactory and JobLauncher. 

Created ICEActionFactory default implementation of IActionFactory.

Fixed bug in MOOSEFormEditor for showing plant view if app is Relap-7. 

Signed-off-by: amccaskey <mccaskeyaj@xxxxxxxx>


  Commit: 2481b9330eb4ba0e5ae1fc80d9293bc8aabee59f
      https://github.com/eclipse/ice/commit/2481b9330eb4ba0e5ae1fc80d9293bc8aabee59f
  Author: amccaskey <mccaskeyaj@xxxxxxxx>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    M org.eclipse.ice.item.test/META-INF/MANIFEST.MF
    M org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeActionFactory.java
    A org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ICEActionFactoryTester.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/IActionFactory.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/ICEActionFactory.java

  Log Message:
  -----------
  Adding getAvailableActions() method to IActionFactory. 

Added method to query available Action names. Created unit tester for
ICEActionFactory. 

Signed-off-by: amccaskey <mccaskeyaj@xxxxxxxx>


  Commit: f9f5da5ba915c391c5aa5bf77d17f16f15b2679d
      https://github.com/eclipse/ice/commit/f9f5da5ba915c391c5aa5bf77d17f16f15b2679d
  Author: amccaskey <mccaskeyaj@xxxxxxxx>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    M org.eclipse.ice.item/plugin.xml
    M org.eclipse.ice.item/src/org/eclipse/ice/item/Item.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/JobLaunchAction.java
    A org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteFileDownloadAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteFileUploadAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/TaggedOutputWriterAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/JobLauncher.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/CheckMooseInputAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSE.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSEModel.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/RemoteYamlSyntaxGenerator.java

  Log Message:
  -----------
  Created RemoteAction subclass of Action

Added new RemoteAction that clients can subclass for Actions that
interact with a Remote Host and need to leverage the IRemoteConnection. 

Configured CheckMooseInputAction, RemoteUpload/Download, and
RemoteYamlSyntaxGen to subclass RemoteAction and also set them up to
properly use the input Dictionary and provide just a nullary
constructor. 

Configured JobLaunchAction to properly use these Actions. 

Signed-off-by: amccaskey <mccaskeyaj@xxxxxxxx>


  Commit: ca63c966e82017b9d1a22489d8a13c12570733ac
      https://github.com/eclipse/ice/commit/ca63c966e82017b9d1a22489d8a13c12570733ac
  Author: amccaskey <mccaskeyaj@xxxxxxxx>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/JobLaunchAction.java

  Log Message:
  -----------
  Fixing bug #66 - file upload bug on job launch. 

Signed-off-by: amccaskey <mccaskeyaj@xxxxxxxx>


  Commit: e6a4e15564f0714b8c45367ded6ab28d462a13be
      https://github.com/eclipse/ice/commit/e6a4e15564f0714b8c45367ded6ab28d462a13be
  Author: amccaskey <mccaskeyaj@xxxxxxxx>
  Date:   2015-12-15 (Tue, 15 Dec 2015)

  Changed paths:
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/JobLaunchAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteFileDownloadAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteFileUploadAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/CheckMooseInputAction.java

  Log Message:
  -----------
  Committing some basic code clean up. 

Signed-off-by: amccaskey <mccaskeyaj@xxxxxxxx>


  Commit: 91d5d4b5445acf713f19cbf76d693b79ce90fb3a
      https://github.com/eclipse/ice/commit/91d5d4b5445acf713f19cbf76d693b79ce90fb3a
  Author: amccaskey <mccaskeyaj@xxxxxxxx>
  Date:   2015-12-15 (Tue, 15 Dec 2015)

  Changed paths:
    M org.eclipse.ice.item/plugin.xml
    A org.eclipse.ice.item/src/org/eclipse/ice/item/action/ExecutionHelper.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/JobLaunchAction.java
    A org.eclipse.ice.item/src/org/eclipse/ice/item/action/LocalExecutionAction.java
    A org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/ICEJob.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/JobLauncher.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/RemoteYamlSyntaxGenerator.java

  Log Message:
  -----------
  Implemented LocalExecutionAction for local job launches. 

Restructured the JobLauncher to use this new LocalExecutionAction for
local job launches. Created a new ICEJob subclass of Eclipse Job that
takes a list of Actions to execute as part of the Eclipse Jobs API. 

Signed-off-by: amccaskey <mccaskeyaj@xxxxxxxx>


  Commit: 12b8d52b5894923399a1dbf9d6375729268441cc
      https://github.com/eclipse/ice/commit/12b8d52b5894923399a1dbf9d6375729268441cc
  Author: amccaskey <mccaskeyaj@xxxxxxxx>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M org.eclipse.ice.client/src/org/eclipse/ice/client/internal/ItemProcessor.java
    M org.eclipse.ice.item/META-INF/MANIFEST.MF
    M org.eclipse.ice.item/plugin.xml
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/Action.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/ExecutionHelper.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/JobLaunchAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/LocalExecutionAction.java
    A org.eclipse.ice.item/src/org/eclipse/ice/item/action/LocalFilesCopyAction.java
    A org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteExecutionAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteFileDownloadAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteFileUploadAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/ICEJob.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/JobLauncher.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/CheckMooseInputAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSE.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSEModel.java

  Log Message:
  -----------
  Finished JobLauncher/IActionFactory Refactor. 

This commit updates the JobLauncher to use the IActionFactory reference
to perform job launches. It creates a list of Actions based on the data
in the action data map and then passes those Actions to a custom Eclipse
Job class for execution and monitoring. Actions now post text to the
Eclipse Console. Added/Modified RemoteFileUploadAction,
RemoteExecutionAction, RemoteFileDownloadAction, LocalExecutionAction,
and LocalFilesCopyAction. 

This commit also fixes bugs in MOOSEModel (non-unique keys in app
preferences) and MOOSELauncher (failed to reset host in hosts table to
localhost after remote execution).

Signed-off-by: amccaskey <mccaskeyaj@xxxxxxxx>


  Commit: a8b1dc1f8250dae9bb29a1d751d1a874999e44ce
      https://github.com/eclipse/ice/commit/a8b1dc1f8250dae9bb29a1d751d1a874999e44ce
  Author: amccaskey <mccaskeyaj@xxxxxxxx>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestJobLauncher.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/ICEJob.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/JobLauncher.java

  Log Message:
  -----------
  Fixing test error for when Action NeedsInfo.

Signed-off-by: amccaskey <mccaskeyaj@xxxxxxxx>


  Commit: 3795cb7a27c8473a09ee1b78384adab16c740098
      https://github.com/eclipse/ice/commit/3795cb7a27c8473a09ee1b78384adab16c740098
  Author: amccaskey <mccaskeyaj@xxxxxxxx>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M org.eclipse.ice.item/META-INF/MANIFEST.MF
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteFileDownloadAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteFileUploadAction.java

  Log Message:
  -----------
  Set up RemoteAction to prompt user for Connection Info

Setup RemoteAction to leverage org.eclipse.remote Service Interfaces to
prompt the user to create a new IRemoteConnection if the specified host
name is not already in the Connection Preferences Table. 

Signed-off-by: amccaskey <mccaskeyaj@xxxxxxxx>


  Commit: cacfa6240cb6ffc8eb0bb067420eb1294bc02cc1
      https://github.com/eclipse/ice/commit/cacfa6240cb6ffc8eb0bb067420eb1294bc02cc1
  Author: amccaskey <mccaskeyaj@xxxxxxxx>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobLauncherTester.java
    M org.eclipse.ice.item/META-INF/MANIFEST.MF

  Log Message:
  -----------
  Turning off NeedsInfo test since that functionality is not used anymore.

Signed-off-by: amccaskey <mccaskeyaj@xxxxxxxx>


  Commit: fab2e5d4b450bfffd0aa14f84646b74dc159e672
      https://github.com/eclipse/ice/commit/fab2e5d4b450bfffd0aa14f84646b74dc159e672
  Author: amccaskey <mccaskeyaj@xxxxxxxx>
  Date:   2015-12-18 (Fri, 18 Dec 2015)

  Changed paths:
    M org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobLauncherTester.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteExecutionAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/ICEJob.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/JobLauncher.java

  Log Message:
  -----------
  Making ICEJob creation extensible, removing need for NeedsInfo Flag

This commit adds a protected createICEJob method to JobLauncher to
enable subclasses to provide custom Eclipse Job implementations. This
also removes the test for JobLauncher NeedsInfo since its no longer
used. 

Signed-off-by: amccaskey <mccaskeyaj@xxxxxxxx>


  Commit: 33edc91f3b8e3e35bfd557fb34de31e8cb90790e
      https://github.com/eclipse/ice/commit/33edc91f3b8e3e35bfd557fb34de31e8cb90790e
  Author: amccaskey <mccaskeyaj@xxxxxxxx>
  Date:   2015-12-21 (Mon, 21 Dec 2015)

  Changed paths:
    M org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/ICEJob.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/JobLauncher.java

  Log Message:
  -----------
  Enabling better JobLauncher and ICEJob extensibility. 

Signed-off-by: amccaskey <mccaskeyaj@xxxxxxxx>


  Commit: 987245b6307d2cd508783c998a4fbb0c8c8daa1f
      https://github.com/eclipse/ice/commit/987245b6307d2cd508783c998a4fbb0c8c8daa1f
  Author: amccaskey <mccaskeyaj@xxxxxxxx>
  Date:   2015-12-21 (Mon, 21 Dec 2015)

  Changed paths:
    R CMakeLists.txt
    R examples/CMakeLists.txt
    R examples/SampleReactor.cpp
    R examples/TestDriver.cpp
    R examples/TestDriver.h
    R examples/WriteReactorExample.cpp
    R native/about.html
    R native/epl-v10.html
    R native/notice.html
    R native/org.eclipse.ice.datastructures.native/.cproject
    R native/org.eclipse.ice.datastructures.native/.project
    R native/org.eclipse.ice.datastructures.native/CMakeLists.txt
    R native/org.eclipse.ice.datastructures.native/ICEObject/Identifiable.h
    R native/org.eclipse.ice.datastructures.native/ICEObject/Persistable.h
    R native/org.eclipse.ice.datastructures.native/IData.h
    R native/org.eclipse.ice.datastructures.native/IDataProvider.h
    R native/org.eclipse.ice.datastructures.native/componentVisitor/IComponentVisitor.h
    R native/org.eclipse.ice.datastructures.native/updateableComposite/Component.h
    R native/org.eclipse.ice.datastructures.native/updateableComposite/Composite.h
    R native/org.eclipse.ice.datastructures.native/updateableComposite/IComponentListener.h
    R native/org.eclipse.ice.datastructures.native/updateableComposite/IUpdateable.h
    R native/org.eclipse.ice.io.native.test/.cproject
    R native/org.eclipse.ice.io.native.test/.project
    R native/org.eclipse.ice.io.native.test/CMakeLists.txt
    R native/org.eclipse.ice.io.native.test/hdf_test/CMakeLists.txt
    R native/org.eclipse.ice.io.native.test/hdf_test/HdfFileFactoryTester.cpp
    R native/org.eclipse.ice.io.native.test/hdf_test/HdfReaderFactoryTester.cpp
    R native/org.eclipse.ice.io.native.test/hdf_test/HdfWriterFactoryTester.cpp
    R native/org.eclipse.ice.io.native/.cproject
    R native/org.eclipse.ice.io.native/.project
    R native/org.eclipse.ice.io.native/CMakeLists.txt
    R native/org.eclipse.ice.io.native/hdf/CMakeLists.txt
    R native/org.eclipse.ice.io.native/hdf/HdfFileFactory.cpp
    R native/org.eclipse.ice.io.native/hdf/HdfFileFactory.h
    R native/org.eclipse.ice.io.native/hdf/HdfReaderFactory.cpp
    R native/org.eclipse.ice.io.native/hdf/HdfReaderFactory.h
    R native/org.eclipse.ice.io.native/hdf/HdfWriterFactory.cpp
    R native/org.eclipse.ice.io.native/hdf/HdfWriterFactory.h
    R native/org.eclipse.ice.io.native/hdf/IHdfReadable.h
    R native/org.eclipse.ice.io.native/hdf/IHdfReader.h
    R native/org.eclipse.ice.io.native/hdf/IHdfWriteable.h
    R native/org.eclipse.ice.io.native/hdf/IHdfWriter.h
    R native/org.eclipse.ice.reactor.native.test/.cproject
    R native/org.eclipse.ice.reactor.native.test/.project
    R native/org.eclipse.ice.reactor.native.test/CMakeLists.txt
    R native/org.eclipse.ice.reactor.native.test/FeatureSetTester.cpp
    R native/org.eclipse.ice.reactor.native.test/GridLabelProviderTester.cpp
    R native/org.eclipse.ice.reactor.native.test/GridLocationTester.cpp
    R native/org.eclipse.ice.reactor.native.test/HDF5LWRTagTypeTester.cpp
    R native/org.eclipse.ice.reactor.native.test/LWRComponentReaderTester.cpp
    R native/org.eclipse.ice.reactor.native.test/LWRComponentTester.cpp
    R native/org.eclipse.ice.reactor.native.test/LWRComponentWriterTester.cpp
    R native/org.eclipse.ice.reactor.native.test/LWRCompositeTester.cpp
    R native/org.eclipse.ice.reactor.native.test/LWRDataProviderTester.cpp
    R native/org.eclipse.ice.reactor.native.test/LWRDataTester.cpp
    R native/org.eclipse.ice.reactor.native.test/LWRGridManagerTester.cpp
    R native/org.eclipse.ice.reactor.native.test/LWRRodTester.cpp
    R native/org.eclipse.ice.reactor.native.test/LWReactorTester.cpp
    R native/org.eclipse.ice.reactor.native.test/MaterialBlockTester.cpp
    R native/org.eclipse.ice.reactor.native.test/MaterialTester.cpp
    R native/org.eclipse.ice.reactor.native.test/RingTester.cpp
    R native/org.eclipse.ice.reactor.native.test/TubeTester.cpp
    R native/org.eclipse.ice.reactor.native.test/bwr/BWReactorTester.cpp
    R native/org.eclipse.ice.reactor.native.test/pwr/ControlBankTester.cpp
    R native/org.eclipse.ice.reactor.native.test/pwr/FuelAssemblyTester.cpp
    R native/org.eclipse.ice.reactor.native.test/pwr/IncoreInstrumentTester.cpp
    R native/org.eclipse.ice.reactor.native.test/pwr/PWRAssemblyTester.cpp
    R native/org.eclipse.ice.reactor.native.test/pwr/PressurizedWaterReactorTester.cpp
    R native/org.eclipse.ice.reactor.native.test/pwr/RodClusterAssemblyTester.cpp
    R native/org.eclipse.ice.reactor.native/.cproject
    R native/org.eclipse.ice.reactor.native/.project
    R native/org.eclipse.ice.reactor.native/AssemblyType.h
    R native/org.eclipse.ice.reactor.native/CMakeLists.txt
    R native/org.eclipse.ice.reactor.native/FeatureSet.cpp
    R native/org.eclipse.ice.reactor.native/FeatureSet.h
    R native/org.eclipse.ice.reactor.native/GridLabelProvider.cpp
    R native/org.eclipse.ice.reactor.native/GridLabelProvider.h
    R native/org.eclipse.ice.reactor.native/GridLocation.cpp
    R native/org.eclipse.ice.reactor.native/GridLocation.h
    R native/org.eclipse.ice.reactor.native/HDF5LWRTagType.h
    R native/org.eclipse.ice.reactor.native/IGridManager.h
    R native/org.eclipse.ice.reactor.native/LWRComponent.cpp
    R native/org.eclipse.ice.reactor.native/LWRComponent.h
    R native/org.eclipse.ice.reactor.native/LWRComponentReader.cpp
    R native/org.eclipse.ice.reactor.native/LWRComponentReader.h
    R native/org.eclipse.ice.reactor.native/LWRComponentWriter.cpp
    R native/org.eclipse.ice.reactor.native/LWRComponentWriter.h
    R native/org.eclipse.ice.reactor.native/LWRComposite.cpp
    R native/org.eclipse.ice.reactor.native/LWRComposite.h
    R native/org.eclipse.ice.reactor.native/LWRData.cpp
    R native/org.eclipse.ice.reactor.native/LWRData.h
    R native/org.eclipse.ice.reactor.native/LWRDataProvider.cpp
    R native/org.eclipse.ice.reactor.native/LWRDataProvider.h
    R native/org.eclipse.ice.reactor.native/LWRGridManager.cpp
    R native/org.eclipse.ice.reactor.native/LWRGridManager.h
    R native/org.eclipse.ice.reactor.native/LWRRod.cpp
    R native/org.eclipse.ice.reactor.native/LWRRod.h
    R native/org.eclipse.ice.reactor.native/LWReactor.cpp
    R native/org.eclipse.ice.reactor.native/LWReactor.h
    R native/org.eclipse.ice.reactor.native/Material.cpp
    R native/org.eclipse.ice.reactor.native/Material.h
    R native/org.eclipse.ice.reactor.native/MaterialBlock.cpp
    R native/org.eclipse.ice.reactor.native/MaterialBlock.h
    R native/org.eclipse.ice.reactor.native/MaterialType.h
    R native/org.eclipse.ice.reactor.native/Ring.cpp
    R native/org.eclipse.ice.reactor.native/Ring.h
    R native/org.eclipse.ice.reactor.native/Tube.cpp
    R native/org.eclipse.ice.reactor.native/Tube.h
    R native/org.eclipse.ice.reactor.native/TubeType.h
    R native/org.eclipse.ice.reactor.native/UtilityOperations.cpp
    R native/org.eclipse.ice.reactor.native/UtilityOperations.h
    R native/org.eclipse.ice.reactor.native/bwr/BWReactor.cpp
    R native/org.eclipse.ice.reactor.native/bwr/BWReactor.h
    R native/org.eclipse.ice.reactor.native/pwr/ControlBank.cpp
    R native/org.eclipse.ice.reactor.native/pwr/ControlBank.h
    R native/org.eclipse.ice.reactor.native/pwr/FuelAssembly.cpp
    R native/org.eclipse.ice.reactor.native/pwr/FuelAssembly.h
    R native/org.eclipse.ice.reactor.native/pwr/IncoreInstrument.cpp
    R native/org.eclipse.ice.reactor.native/pwr/IncoreInstrument.h
    R native/org.eclipse.ice.reactor.native/pwr/PWRAssembly.cpp
    R native/org.eclipse.ice.reactor.native/pwr/PWRAssembly.h
    R native/org.eclipse.ice.reactor.native/pwr/PressurizedWaterReactor.cpp
    R native/org.eclipse.ice.reactor.native/pwr/PressurizedWaterReactor.h
    R native/org.eclipse.ice.reactor.native/pwr/RodClusterAssembly.cpp
    R native/org.eclipse.ice.reactor.native/pwr/RodClusterAssembly.h
    R native/org.eclipse.ice.reactor.sfr.native.test/.cproject
    R native/org.eclipse.ice.reactor.sfr.native.test/.project
    R native/org.eclipse.ice.reactor.sfr.native.test/CMakeLists.txt
    R native/org.eclipse.ice.reactor.sfr.native.test/FeatureSetTester.cpp
    R native/org.eclipse.ice.reactor.sfr.native.test/GridDataManagerTester.cpp
    R native/org.eclipse.ice.reactor.sfr.native.test/GridManagerTester.cpp
    R native/org.eclipse.ice.reactor.sfr.native.test/MaterialBlockTester.cpp
    R native/org.eclipse.ice.reactor.sfr.native.test/MaterialTester.cpp
    R native/org.eclipse.ice.reactor.sfr.native.test/PinAssemblyTester.cpp
    R native/org.eclipse.ice.reactor.sfr.native.test/ReflectorAssemblyTester.cpp
    R native/org.eclipse.ice.reactor.sfr.native.test/RingTester.cpp
    R native/org.eclipse.ice.reactor.sfr.native.test/SFRAssemblyTester.cpp
    R native/org.eclipse.ice.reactor.sfr.native.test/SFRComponentTester.cpp
    R native/org.eclipse.ice.reactor.sfr.native.test/SFRCompositeTester.cpp
    R native/org.eclipse.ice.reactor.sfr.native.test/SFRDataTester.cpp
    R native/org.eclipse.ice.reactor.sfr.native.test/SFRPinTester.cpp
    R native/org.eclipse.ice.reactor.sfr.native.test/SFRRodTester.cpp
    R native/org.eclipse.ice.reactor.sfr.native.test/SFReactorIOHandlerTester.cpp
    R native/org.eclipse.ice.reactor.sfr.native.test/SFReactorTester.cpp
    R native/org.eclipse.ice.reactor.sfr.native/.cproject
    R native/org.eclipse.ice.reactor.sfr.native/.project
    R native/org.eclipse.ice.reactor.sfr.native/AssemblyType.h
    R native/org.eclipse.ice.reactor.sfr.native/CMakeLists.txt
    R native/org.eclipse.ice.reactor.sfr.native/FeatureSet.cpp
    R native/org.eclipse.ice.reactor.sfr.native/FeatureSet.h
    R native/org.eclipse.ice.reactor.sfr.native/GridDataManager.cpp
    R native/org.eclipse.ice.reactor.sfr.native/GridDataManager.h
    R native/org.eclipse.ice.reactor.sfr.native/GridManager.cpp
    R native/org.eclipse.ice.reactor.sfr.native/GridManager.h
    R native/org.eclipse.ice.reactor.sfr.native/IGridManager.h
    R native/org.eclipse.ice.reactor.sfr.native/ISFRComponentVisitor.h
    R native/org.eclipse.ice.reactor.sfr.native/Material.cpp
    R native/org.eclipse.ice.reactor.sfr.native/Material.h
    R native/org.eclipse.ice.reactor.sfr.native/MaterialBlock.cpp
    R native/org.eclipse.ice.reactor.sfr.native/MaterialBlock.h
    R native/org.eclipse.ice.reactor.sfr.native/SFRComponent.cpp
    R native/org.eclipse.ice.reactor.sfr.native/SFRComponent.h
    R native/org.eclipse.ice.reactor.sfr.native/SFRComposite.cpp
    R native/org.eclipse.ice.reactor.sfr.native/SFRComposite.h
    R native/org.eclipse.ice.reactor.sfr.native/SFRData.cpp
    R native/org.eclipse.ice.reactor.sfr.native/SFRData.h
    R native/org.eclipse.ice.reactor.sfr.native/SFReactor.cpp
    R native/org.eclipse.ice.reactor.sfr.native/SFReactor.h
    R native/org.eclipse.ice.reactor.sfr.native/SFReactorFactory.cpp
    R native/org.eclipse.ice.reactor.sfr.native/SFReactorFactory.h
    R native/org.eclipse.ice.reactor.sfr.native/SFReactorIOHandler.cpp
    R native/org.eclipse.ice.reactor.sfr.native/SFReactorIOHandler.h
    R native/org.eclipse.ice.reactor.sfr.native/UtilityOperations.cpp
    R native/org.eclipse.ice.reactor.sfr.native/UtilityOperations.h
    R native/org.eclipse.ice.reactor.sfr.native/assembly/PinAssembly.cpp
    R native/org.eclipse.ice.reactor.sfr.native/assembly/PinAssembly.h
    R native/org.eclipse.ice.reactor.sfr.native/assembly/PinType.h
    R native/org.eclipse.ice.reactor.sfr.native/assembly/ReflectorAssembly.cpp
    R native/org.eclipse.ice.reactor.sfr.native/assembly/ReflectorAssembly.h
    R native/org.eclipse.ice.reactor.sfr.native/assembly/Ring.cpp
    R native/org.eclipse.ice.reactor.sfr.native/assembly/Ring.h
    R native/org.eclipse.ice.reactor.sfr.native/assembly/SFRAssembly.cpp
    R native/org.eclipse.ice.reactor.sfr.native/assembly/SFRAssembly.h
    R native/org.eclipse.ice.reactor.sfr.native/assembly/SFRPin.cpp
    R native/org.eclipse.ice.reactor.sfr.native/assembly/SFRPin.h
    R native/org.eclipse.ice.reactor.sfr.native/assembly/SFRRod.cpp
    R native/org.eclipse.ice.reactor.sfr.native/assembly/SFRRod.h
    R native/org.eclipse.ice.updater/.cproject
    R native/org.eclipse.ice.updater/.project
    R native/org.eclipse.ice.updater/CMakeLists.txt
    R native/org.eclipse.ice.updater/README
    R native/org.eclipse.ice.updater/src/.project
    R native/org.eclipse.ice.updater/src/CMakeLists.txt
    R native/org.eclipse.ice.updater/src/ErrorLogger.cpp
    R native/org.eclipse.ice.updater/src/ErrorLogger.h
    R native/org.eclipse.ice.updater/src/LICENSE
    R native/org.eclipse.ice.updater/src/LibcurlUtils.cpp
    R native/org.eclipse.ice.updater/src/LibcurlUtils.h
    R native/org.eclipse.ice.updater/src/Post.cpp
    R native/org.eclipse.ice.updater/src/Post.h
    R native/org.eclipse.ice.updater/src/PostType.h
    R native/org.eclipse.ice.updater/src/PropertyType.h
    R native/org.eclipse.ice.updater/src/Updater.cpp
    R native/org.eclipse.ice.updater/src/Updater.h
    R native/org.eclipse.ice.updater/tests/CMakeLists.txt
    R native/org.eclipse.ice.updater/tests/ErrorLoggerTester.cpp
    R native/org.eclipse.ice.updater/tests/LibcurlUtilsTester.cpp
    R native/org.eclipse.ice.updater/tests/PostTester.cpp
    R native/org.eclipse.ice.updater/tests/PostTester.php
    R native/org.eclipse.ice.updater/tests/SampleText.txt
    R native/org.eclipse.ice.updater/tests/TesterPropertyType.h
    R native/org.eclipse.ice.updater/tests/TesterUtils.cpp
    R native/org.eclipse.ice.updater/tests/TesterUtils.h
    R native/org.eclipse.ice.updater/tests/TesterUtilsConfig.h
    R native/org.eclipse.ice.updater/tests/TesterUtilsConfig.h.in
    R native/org.eclipse.ice.updater/tests/UpdaterTester.cpp
    R native/org.eclipse.ice.updater/tests/UpdaterTester.php
    R native/org.eclipse.ice.updater/updater.properties
    R native/org.eclipse.ice.updater/updatertests.properties
    M org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java
    M org.eclipse.ice.feature/feature.xml
    R org.eclipse.ice.usud/.cproject
    R org.eclipse.ice.usud/.project
    R org.eclipse.ice.usud/about.html
    R org.eclipse.ice.usud/pom.xml
    R org.eclipse.ice.usud/src/org.eclipse.ice.usud.cpp
    M org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVProxyPlot.java

  Log Message:
  -----------
  Merging next into mccaskey/joblauncherRefactor

Signed-off-by: amccaskey <mccaskeyaj@xxxxxxxx>


  Commit: 227f9268498c9f689c700d2773c8c3861f237a02
      https://github.com/eclipse/ice/commit/227f9268498c9f689c700d2773c8c3861f237a02
  Author: amccaskey <mccaskeyaj@xxxxxxxx>
  Date:   2015-12-23 (Wed, 23 Dec 2015)

  Changed paths:
    M org.eclipse.ice.client/src/org/eclipse/ice/client/internal/ItemProcessor.java
    M org.eclipse.ice.item.test/META-INF/MANIFEST.MF
    M org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeActionFactory.java
    A org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ICEActionFactoryTester.java
    M org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobLauncherTester.java
    M org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestAction.java
    M org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestJobLauncher.java
    M org.eclipse.ice.item/META-INF/MANIFEST.MF
    M org.eclipse.ice.item/plugin.xml
    A org.eclipse.ice.item/schema/actionFactory.exsd
    A org.eclipse.ice.item/schema/actions.exsd
    M org.eclipse.ice.item/src/org/eclipse/ice/item/IActionFactory.java
    A org.eclipse.ice.item/src/org/eclipse/ice/item/ICEActionFactory.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/Item.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/Action.java
    A org.eclipse.ice.item/src/org/eclipse/ice/item/action/ExecutionHelper.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/JobLaunchAction.java
    A org.eclipse.ice.item/src/org/eclipse/ice/item/action/LocalExecutionAction.java
    A org.eclipse.ice.item/src/org/eclipse/ice/item/action/LocalFilesCopyAction.java
    A org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteAction.java
    A org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteExecutionAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteFileDownloadAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteFileUploadAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/TaggedOutputWriterAction.java
    A org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/ICEJob.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/JobLauncher.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/CheckMooseInputAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSE.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSEModel.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/RemoteYamlSyntaxGenerator.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/mccaskey/joblauncherRefactor' into
next


  Commit: 3a8dd69091b1248d46a798179359b1143df2b40f
      https://github.com/eclipse/ice/commit/3a8dd69091b1248d46a798179359b1143df2b40f
  Author: Jay Jay Billings <billingsjj@xxxxxxxx>
  Date:   2015-12-26 (Sat, 26 Dec 2015)

  Changed paths:
    M org.eclipse.ice.client/src/org/eclipse/ice/client/internal/ItemProcessor.java
    M org.eclipse.ice.item.test/META-INF/MANIFEST.MF
    M org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeActionFactory.java
    A org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/ICEActionFactoryTester.java
    M org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/JobLauncherTester.java
    M org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestAction.java
    M org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestJobLauncher.java
    M org.eclipse.ice.item/META-INF/MANIFEST.MF
    M org.eclipse.ice.item/plugin.xml
    A org.eclipse.ice.item/schema/actionFactory.exsd
    A org.eclipse.ice.item/schema/actions.exsd
    M org.eclipse.ice.item/src/org/eclipse/ice/item/IActionFactory.java
    A org.eclipse.ice.item/src/org/eclipse/ice/item/ICEActionFactory.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/Item.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/Action.java
    A org.eclipse.ice.item/src/org/eclipse/ice/item/action/ExecutionHelper.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/JobLaunchAction.java
    A org.eclipse.ice.item/src/org/eclipse/ice/item/action/LocalExecutionAction.java
    A org.eclipse.ice.item/src/org/eclipse/ice/item/action/LocalFilesCopyAction.java
    A org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteAction.java
    A org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteExecutionAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteFileDownloadAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteFileUploadAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/action/TaggedOutputWriterAction.java
    A org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/ICEJob.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/JobLauncher.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/CheckMooseInputAction.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSE.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSEModel.java
    M org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/RemoteYamlSyntaxGenerator.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/next' into jay/cleanup

Conflicts:
	org.eclipse.ice.item/src/org/eclipse/ice/item/action/RemoteFileUploadAction.java
	org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSE.java
	org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/RemoteYamlSyntaxGenerator.java

Signed-off-by: Jay Jay Billings <billingsjj@xxxxxxxx>


Compare: https://github.com/eclipse/ice/compare/936b0cee4697...3a8dd69091b1

Back to the top