Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes to configuration handling #1844

Merged
merged 2 commits into from
Jul 25, 2015
Merged

Conversation

immortius
Copy link
Member

Addressing #1843

  • Extracted out RootConfig from Config, separating handling of config load/save from the bean class used to hold the root of the configuration.
  • Moved default configuration values into a resource.
  • Changed serverPort configuration to be overridden by a system property during load.
  • Changed saveGameEnabled configuration to be overridden (but not saved) by a system property.
  • Removed TransientConfig as no longer needed
  • Mapped the existing Terasology commandline options to set system properties.

* Extracted out RootConfig from Config, separating handling of config load/save from the bean class used to hold the root of the configuration.
* Moved default configuration values into a resource.
* Changed serverPort configuration to be overridden by a system property during load.
* Changed saveGameEnabled configuration to be overridden (but not saved) by a system property.
* Removed TransientConfig as no longer needed
* Mapped the existing Terasology commandline options to set system properties.
@GooeyHub
Copy link
Member

Refer to this link for build results (access rights to CI server needed):
http://jenkins.terasology.org/job/TerasologyPRs/193/

Build Log
last 5 lines

[...truncated 2164 lines...]
Build step 'Publish JUnit test result report' changed build result to UNSTABLE
[ANALYSIS-COLLECTOR] Computing warning deltas based on reference build #192
Notifying upstream projects of job completion
Setting status of 03bd6d7bd309bf6c60556bf369305c3738c6d509 to FAILURE with url http://jenkins.terasology.org/job/TerasologyPRs/193/ and message: Merged build finished.

Uh oh, something went wrong with the build. Need to check on that

A little bit of reorganisation.
@GooeyHub
Copy link
Member

Refer to this link for build results (access rights to CI server needed):
http://jenkins.terasology.org/job/TerasologyPRs/194/
Hooray Jenkins reported success with all tests good!

@msteiger
Copy link
Member

Looks good to me.

immortius added a commit that referenced this pull request Jul 25, 2015
Fixes to configuration handling
@immortius immortius merged commit 245b715 into MovingBlocks:develop Jul 25, 2015
@Cervator Cervator modified the milestone: v0.54.0 Jul 28, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants