Merge pull request #1104 from codeborne/exclude-docviewer

Fixes #1103 do not include `docviewer` module by default
playframework · Feb 13, 2017 · 14c2d07 · 14c2d07
2 parents 3f739e8 + 43ddf7b
commit 14c2d07
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/framework/pym/play/commands/base.py b/framework/pym/play/commands/base.py
@@ -97,7 +97,6 @@ def new(app, args, env, cmdloader=None):
  print "~"
 
  # Configure modules 
- runDepsAfter = False
  for m in md:
  # Check dependencies.yml of the module
  depsYaml = os.path.join(env["basedir"], 'modules/%s/conf/dependencies.yml' % m)
@@ -106,12 +105,10 @@ def new(app, args, env, cmdloader=None):
  try:
  moduleDefinition = re.search(r'self:\s*(.*)\s*', deps).group(1)
  replaceAll(os.path.join(app.path, 'conf/dependencies.yml'), r'- play\n', '- play\n - %s\n' % moduleDefinition )
- runDepsAfter = True
  except Exception:
  pass
 
- if runDepsAfter:
- cmdloader.commands['dependencies'].execute(command='dependencies', app=app, args=['--sync'], env=env, cmdloader=cmdloader)
+ cmdloader.commands['dependencies'].execute(command='dependencies', app=app, args=['--sync'], env=env, cmdloader=cmdloader)
 
  print "~ OK, the application is created."
  print "~ Start it with : play run %s" % sys.argv[2]

diff --git a/framework/src/play/Play.java b/framework/src/play/Play.java
@@ -778,10 +778,6 @@ public static void loadModules(VirtualFile appRoot) {
  if (Play.runingInTestMode()) {
  addModule(appRoot, "_testrunner", new File(Play.frameworkPath, "modules/testrunner"));
  }
-
- if (Play.mode == Mode.DEV) {
- addModule(appRoot, "_docviewer", new File(Play.frameworkPath, "modules/docviewer"));
- }
  }
 
  /**

diff --git a/framework/src/play/deps/YamlParser.java b/framework/src/play/deps/YamlParser.java
@@ -176,6 +176,9 @@ public ModuleDescriptorParser getParser() {
  if(depName.matches("play\\s+->\\s+secure") || depName.equals("secure")) {
  depName = "play -> secure " + System.getProperty("play.version");
  }
+ if(depName.matches("play\\s+->\\s+docviewer") || depName.equals("docviewer")) {
+ depName = "play -> docviewer " + System.getProperty("play.version");
+ }
 
  // Pattern compile to match [organisation name] - > [artifact] [revision] [classifier]
  Matcher m = Pattern.compile("([^\\s]+)\\s*[-][>]\\s*([^\\s]+)\\s+([^\\s]+)(\\s+[^\\s]+)?.*").matcher(depName);

diff --git a/resources/application-skel/conf/dependencies.yml b/resources/application-skel/conf/dependencies.yml
@@ -2,3 +2,4 @@
 
 require:
  - play
+ - play -> docviewer