Skip to content

Commit

Permalink
[playframework#660] Fix regression
Browse files Browse the repository at this point in the history
  • Loading branch information
@guillaumebort
guillaumebort committed Mar 26, 2011
1 parent 97785ec commit a851653
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
10 changes: 6 additions & 4 deletions framework/pym/play/utils.py
View file
Expand Up @@ -67,11 +67,13 @@ def getWithModules(args, env):
if os.path.isdir(os.path.join(env["basedir"], 'modules/%s' % f)) and f.find('%s-' % m) == 0:
dirname = os.path.join(env["basedir"], 'modules/%s' % f)
break
else:
print "~ Oops. Module " + m + " not found (try running `play install " + m + "`)"
print "~"
sys.exit(-1)
if not dirname:
print "~ Oops. Module " + m + " not found (try running `play install " + m + "`)"
print "~"
sys.exit(-1)

md.append(dirname)

return md

def package_as_war(app, env, war_path, war_zip_path, war_exclusion_list = []):
Expand Down
2 changes: 1 addition & 1 deletion nbproject/project.xml
View file
Expand Up @@ -103,7 +103,7 @@
<package-root>framework/src</package-root>
<package-root>modules/testrunner/src</package-root>
<package-root>modules/grizzly/src</package-root>
<classpath mode="compile">modules/grizzly/lib/grizzly-http-webserver-1.9.18-e.jar:modules/testrunner/firephoque/apache-mime4j-0.6.jar:modules/testrunner/firephoque/commons-codec-1.4.jar:modules/testrunner/firephoque/commons-collections-3.2.1.jar:modules/testrunner/firephoque/commons-io-1.4.jar:modules/testrunner/firephoque/commons-lang-2.4.jar:modules/testrunner/firephoque/commons-logging-1.1.1.jar:modules/testrunner/firephoque/cssparser-0.9.5.jar:modules/testrunner/firephoque/htmlunit-2.8.jar:modules/testrunner/firephoque/htmlunit-core-js-2.8.jar:modules/testrunner/firephoque/httpclient-4.0.1.jar:modules/testrunner/firephoque/httpcore-4.0.1.jar:modules/testrunner/firephoque/httpmime-4.0.1.jar:modules/testrunner/firephoque/nekohtml-1.9.14.jar:modules/testrunner/firephoque/sac-1.3.jar:modules/testrunner/firephoque/serializer-2.7.1.jar:modules/testrunner/firephoque/xalan-2.7.1.jar:modules/testrunner/firephoque/xercesImpl-2.9.1.jar:modules/testrunner/firephoque/xml-apis-1.3.04.jar:framework/lib/activation-1.1.1.jar:framework/lib/antlr-2.7.6.jar:framework/lib/bcprov-jdk15-1.45.jar:framework/lib/c3p0-0.9.1.2.jar:framework/lib/commons-beanutils-1.8.3.jar:framework/lib/commons-codec-1.4.jar:framework/lib/commons-collections-3.1.jar:framework/lib/commons-email-1.2.jar:framework/lib/commons-fileupload-1.2.jar:framework/lib/commons-io-1.4.jar:framework/lib/commons-lang-2.5.jar:framework/lib/commons-logging-1.1.1.jar:framework/lib/dom4j-1.6.1.jar:framework/lib/ehcache-core-2.0.0.jar:framework/lib/ezmorph-1.0.3.jar:framework/lib/geronimo-servlet_2.5_spec-1.2.jar:framework/lib/hibernate-commons-annotations-3.2.0.Final.jar:framework/lib/hibernate-core-3.6.0.Final.jar:framework/lib/hibernate-entitymanager-3.6.0.Final.jar:framework/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar:framework/lib/ivy-2.2.0.jar:framework/lib/jamon-2.7.jar:framework/lib/javassist-3.9.0.GA.jar:framework/lib/jaxen-1.1.jar:framework/lib/jj-imaging.jar:framework/lib/jj-simplecaptcha.jar:framework/lib/jj-textile.jar:framework/lib/jj-wikitext.jar:framework/lib/joda-time-1.6.jar:framework/lib/jregex-1.2_01.jar:framework/lib/jsr107cache-1.0.jar:framework/lib/jta-1.1.jar:framework/lib/junit-4.8.1.jar:framework/lib/log4j-1.2.15.jar:framework/lib/mail-1.4.3.jar:framework/lib/memcached-2.4.2.jar:framework/lib/mysql-connector-java-5.1.13.jar:framework/lib/org.eclipse.jdt.core-3.6.0.jar:framework/lib/oval-1.50.jar:framework/lib/signpost-core-1.2.jar:framework/lib/slf4j-api-1.6.1.jar:framework/lib/slf4j-log4j12-1.6.1.jar:framework/lib/snakeyaml-1.7.jar:framework/lib/xstream-1.3.jar:framework/lib/javax.inject-1.0.jar:framework/lib/asm-all-3.3.1.jar:framework/lib/commons-javaflow-1066591.jar:framework/lib/gson-1.6.jar:framework/lib/groovy-all-1.7.7.jar:framework/lib/commons-fileupload-1.2.2.jar:framework/lib/netty-3.2.4.Final.jar:framework/lib/async-http-client-1.6.1.jar:framework/lib/h2-1.3.149.jar:framework/lib/cglib-nodep-2.2.jar</classpath>
<classpath mode="compile">modules/grizzly/lib/grizzly-http-webserver-1.9.18-e.jar:modules/testrunner/firephoque/apache-mime4j-0.6.jar:modules/testrunner/firephoque/commons-codec-1.4.jar:modules/testrunner/firephoque/commons-collections-3.2.1.jar:modules/testrunner/firephoque/commons-io-1.4.jar:modules/testrunner/firephoque/commons-lang-2.4.jar:modules/testrunner/firephoque/commons-logging-1.1.1.jar:modules/testrunner/firephoque/cssparser-0.9.5.jar:modules/testrunner/firephoque/htmlunit-2.8.jar:modules/testrunner/firephoque/htmlunit-core-js-2.8.jar:modules/testrunner/firephoque/httpclient-4.0.1.jar:modules/testrunner/firephoque/httpcore-4.0.1.jar:modules/testrunner/firephoque/httpmime-4.0.1.jar:modules/testrunner/firephoque/nekohtml-1.9.14.jar:modules/testrunner/firephoque/sac-1.3.jar:modules/testrunner/firephoque/serializer-2.7.1.jar:modules/testrunner/firephoque/xalan-2.7.1.jar:modules/testrunner/firephoque/xercesImpl-2.9.1.jar:modules/testrunner/firephoque/xml-apis-1.3.04.jar:framework/lib/activation-1.1.1.jar:framework/lib/antlr-2.7.6.jar:framework/lib/bcprov-jdk15-1.45.jar:framework/lib/c3p0-0.9.1.2.jar:framework/lib/commons-beanutils-1.8.3.jar:framework/lib/commons-codec-1.4.jar:framework/lib/commons-collections-3.1.jar:framework/lib/commons-email-1.2.jar:framework/lib/commons-fileupload-1.2.jar:framework/lib/commons-io-1.4.jar:framework/lib/commons-lang-2.5.jar:framework/lib/commons-logging-1.1.1.jar:framework/lib/dom4j-1.6.1.jar:framework/lib/ehcache-core-2.0.0.jar:framework/lib/ezmorph-1.0.3.jar:framework/lib/geronimo-servlet_2.5_spec-1.2.jar:framework/lib/hibernate-commons-annotations-3.2.0.Final.jar:framework/lib/hibernate-entitymanager-3.6.0.Final.jar:framework/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar:framework/lib/ivy-2.2.0.jar:framework/lib/jamon-2.7.jar:framework/lib/javassist-3.9.0.GA.jar:framework/lib/jaxen-1.1.jar:framework/lib/jj-imaging.jar:framework/lib/jj-simplecaptcha.jar:framework/lib/jj-textile.jar:framework/lib/jj-wikitext.jar:framework/lib/joda-time-1.6.jar:framework/lib/jregex-1.2_01.jar:framework/lib/jsr107cache-1.0.jar:framework/lib/jta-1.1.jar:framework/lib/junit-4.8.1.jar:framework/lib/log4j-1.2.15.jar:framework/lib/mail-1.4.3.jar:framework/lib/memcached-2.4.2.jar:framework/lib/mysql-connector-java-5.1.13.jar:framework/lib/org.eclipse.jdt.core-3.6.0.jar:framework/lib/oval-1.50.jar:framework/lib/signpost-core-1.2.jar:framework/lib/slf4j-api-1.6.1.jar:framework/lib/slf4j-log4j12-1.6.1.jar:framework/lib/snakeyaml-1.7.jar:framework/lib/xstream-1.3.jar:framework/lib/javax.inject-1.0.jar:framework/lib/asm-all-3.3.1.jar:framework/lib/commons-javaflow-1066591.jar:framework/lib/gson-1.6.jar:framework/lib/groovy-all-1.7.7.jar:framework/lib/commons-fileupload-1.2.2.jar:framework/lib/netty-3.2.4.Final.jar:framework/lib/async-http-client-1.6.1.jar:framework/lib/h2-1.3.149.jar:framework/lib/cglib-nodep-2.2.jar:framework/lib/hibernate-core-3.6.1.Final.jar</classpath>
<built-to>framework/classes</built-to>
<source-level>1.5</source-level>
</compilation-unit>
Expand Down

0 comments on commit a851653

Please sign in to comment.