Skip to content
This repository has been archived by the owner on May 23, 2019. It is now read-only.

Commit

Permalink
Merge branch 'dvl-issue107' into dvl-issue103
Browse files Browse the repository at this point in the history
  • Loading branch information
hdsdi3g committed May 17, 2015
2 parents f6acb8b + bce54c0 commit b87a044
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 7 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -11,6 +11,7 @@ conf/app.d/*
conf/application.conf
conf/dependencies.yml
conf/*.db
modules/*
public/img/personalized/*
Test.java
play-new-password.txt
Expand Down
2 changes: 1 addition & 1 deletion app/hd3gtv/mydmam/module/MyDMAMModulesManager.java
Expand Up @@ -198,7 +198,7 @@ public static LinkedHashMap<String, File> getAllConfDirectories() {
if (modules_names != null) {
modules_names.remove("play");
for (int pos_mn = 0; pos_mn < modules_names.size(); pos_mn++) {
File conf_dir = new File(applicationconf.getProperty("module." + modules_names.get(pos_mn), "") + File.separator + "conf");
File conf_dir = new File(applicationconf.getProperty("module." + modules_names.get(pos_mn), "") + File.separator + "conf"); // TODO use dependencies.yml for that
if ((conf_dir.exists() == false) | (conf_dir.isDirectory() == false)) {
Log2.log.error("Can't found module conf directory", new FileNotFoundException(conf_dir.getPath()), new Log2Dump("module name", modules_names.get(pos_mn)));
continue;
Expand Down
4 changes: 0 additions & 4 deletions conf/application.conf.examples
Expand Up @@ -217,7 +217,3 @@ mail.smtp=mock
%test.db.url=jdbc:h2:mem:play;MODE=MYSQL;LOCK_MODE=0
%test.jpa.ddl=create
%test.mail.smtp=mock

# Enable modules here
# ~~~~~
# module.foobar=/opt/play/mydmam-module-foobar
16 changes: 14 additions & 2 deletions conf/dependencies.yml.examples
@@ -1,7 +1,19 @@
# Application dependencies
# - configure this file
# - play dependencies --verbose
# - don't forget to rename all files to module/* in {mymodulename-1.0} else Play don't load them.

require:
- play
# - myorganisation -> mymodulename 1.0

# Enables modules here :
# - foobar
#repositories:
# - myModules:
# type: chain
# using:
# - locRep:
# type: local
# descriptor: /path/to/the/all/modules/[module]/conf/dependencies.yml
# artifact: /path/to/the/all/modules/[module]
# contains:
# - myorganisation -> *

0 comments on commit b87a044

Please sign in to comment.