Permalink
Browse files

Merge branch 'SAKIII-4082' of git://github.com/liyushan/3akai-ux into…

… SAKIII-4082

* 'SAKIII-4082' of git://github.com/liyushan/3akai-ux:
  Fix conflicts, SAKIII-4082: put hashed resources in processed-resources and jar file
  • Loading branch information...
2 parents 56bb507 + 43b099f commit 40e4fd3bf9de7cd23ec9c140c59e77208a49dc5b Nicolaas Matthijs committed Dec 5, 2011
Showing with 3 additions and 3 deletions.
  1. +1 −1 build.xml
  2. +2 −2 tools/hashfiles/config.properties
View
@@ -253,7 +253,7 @@
</target>
<!-- Target: Hash files-->
- <target name="hash_files" depends="optimize">
+ <target name="hash_files" depends="copy_optimized">
<!-- hashfiles jar gets put here by maven -->
<java jar="${settings.localRepository}/org/sakaiproject/nakamura/org.sakaiproject.nakamura.hashfiles/1.1-SNAPSHOT/org.sakaiproject.nakamura.hashfiles-1.1-SNAPSHOT.jar"
fork="true">
@@ -1,7 +1,7 @@
-basedir: target/optimized
+basedir: target/processed-resources
hash_file_types: js, css
need_to_change_file_types: html,js
-ignore_file_paths: devwidgets/_template,tools
+ignore_file_paths:
require_base_url: /dev/lib/
require_paths: jquery-plugins:jquery/plugins,jquery:jquery/jquery-1.5.2,jquery-ui:jquery/jquery-ui-1.8.13.custom,config:../configuration
require_dependency_file: /dev/lib/sakai/sakai.dependencies.js

0 comments on commit 40e4fd3

Please sign in to comment.