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

Fix configuration file generation and reading #3024

Merged
merged 1 commit into from Jul 20, 2018

Conversation

Projects
None yet
2 participants
@jelovirt
Member

jelovirt commented Jul 19, 2018

Various configuration files are not read from correct locations, thus not all configuration data is available in all places. Fix the issue by removing lib/configuration.properties and retain only config/configuration.properties.

Fix configuration file generation and reading
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
@raducoravu

This comment has been minimized.

Member

raducoravu commented Jul 20, 2018

@jelovirt One question, the now removed configuration.properties had a dita ot version key inside. Was this key moved to the other one? This information was quite useful even for plugins, for example a plugin could load the properties file in its build.xml and depending on the DITA OT version integrate in one way or another.

@jelovirt

This comment has been minimized.

Member

jelovirt commented Jul 20, 2018

@raducoravu Version info was already duplicated in application.properties and that's the correct location for it. application.properties is added to dost.jar and cannot be modified (easily), thus that's the configuration file for configuration items that should not be modified by users. configuration.properties on the other hand is for configuration items that are considered to be under user control.

@jelovirt jelovirt requested a review from raducoravu Jul 20, 2018

@raducoravu raducoravu merged commit 5c9beeb into dita-ot:hotfix/3.1.2 Jul 20, 2018

2 checks passed

DCO All commits have a DCO sign-off from the author
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@raducoravu

This comment has been minimized.

Member

raducoravu commented Jul 20, 2018

Makes sense, I'll look to see how can I read a properties file from inside a JAR file directly from the build.xml. Probably it's feasible using the jar:file protocol.

@jelovirt

This comment has been minimized.

Member

jelovirt commented Jul 20, 2018

@raducoravu See build_init.xml for example of reading resources from classpath in Ant.

@raducoravu

This comment has been minimized.

Member

raducoravu commented Jul 20, 2018

Oh, this one, nice:

<loadproperties>
   <javaresource name="application.properties"/>
 </loadproperties>

@jelovirt jelovirt deleted the jelovirt:feature/lib_configuration_properties branch Jul 20, 2018

@jelovirt jelovirt added this to the 3.1.2 milestone Aug 9, 2018

infotexture added a commit to dita-ot/docs that referenced this pull request Aug 11, 2018

Rename properties files topics per new locations
Per dita-ot/dita-ot#3024

Signed-off-by: Roger Sheen <roger@infotexture.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment