Permalink
Browse files

Merge branch 'play-2.1'

  • Loading branch information...
2 parents b4b39da + ac87019 commit 5802654832e75c05537aa47768f46f5f6046b4bc Jennifer Hickey and Maria Shaldibina committed Feb 23, 2013
Showing with 565 additions and 341 deletions.
  1. 0 play/{ → 2.0}/computer_database_autoconfig_disabled/README
  2. 0 ..._database_multi_dbs → 2.0/computer_database_autoconfig_disabled}/app/controllers/Application.java
  3. 0 ...{computer_database_multi_dbs → 2.0/computer_database_autoconfig_disabled}/app/models/Company.java
  4. 0 ...computer_database_multi_dbs → 2.0/computer_database_autoconfig_disabled}/app/models/Computer.java
  5. 0 ...r_database_multi_dbs → 2.0/computer_database_autoconfig_disabled}/app/views/createForm.scala.html
  6. 0 ...ter_database_multi_dbs → 2.0/computer_database_autoconfig_disabled}/app/views/editForm.scala.html
  7. 0 ...omputer_database_multi_dbs → 2.0/computer_database_autoconfig_disabled}/app/views/list.scala.html
  8. 0 play/{computer_database_scala → 2.0/computer_database_autoconfig_disabled}/app/views/main.scala.html
  9. 0 ...ase_scala → 2.0/computer_database_autoconfig_disabled}/app/views/twitterBootstrapInput.scala.html
  10. 0 play/{ → 2.0}/computer_database_autoconfig_disabled/conf/application.conf
  11. 0 play/{ → 2.0}/computer_database_autoconfig_disabled/conf/cloudfoundry.properties
  12. 0 ...omputer_database_scala → 2.0/computer_database_autoconfig_disabled}/conf/evolutions/default/1.sql
  13. 0 ...ter_database_multi_dbs → 2.0/computer_database_autoconfig_disabled}/conf/evolutions/default/2.sql
  14. 0 play/{computer_database_scala → 2.0/computer_database_autoconfig_disabled}/conf/messages
  15. 0 play/{computer_database_multi_dbs → 2.0/computer_database_autoconfig_disabled}/conf/routes
  16. +1 −1 play/{ → 2.0}/computer_database_autoconfig_disabled/pom.xml
  17. 0 play/{computer_database_multi_dbs → 2.0/computer_database_autoconfig_disabled}/project/Build.scala
  18. 0 play/{zentasks_cf_by_type → 2.0/computer_database_autoconfig_disabled}/project/build.properties
  19. 0 play/{zentasks_cf_by_type → 2.0/computer_database_autoconfig_disabled}/project/plugins.sbt
  20. 0 ..._database_scala → 2.0/computer_database_autoconfig_disabled}/public/stylesheets/bootstrap.min.css
  21. 0 ...puter_database_multi_dbs → 2.0/computer_database_autoconfig_disabled}/public/stylesheets/main.css
  22. 0 ...computer_database_multi_dbs → 2.0/computer_database_autoconfig_disabled}/test/FunctionalTest.java
  23. 0 ...omputer_database_multi_dbs → 2.0/computer_database_autoconfig_disabled}/test/IntegrationTest.java
  24. 0 play/{computer_database_multi_dbs → 2.0/computer_database_autoconfig_disabled}/test/ModelTest.java
  25. 0 play/{ → 2.0}/computer_database_cf_by_name/README
  26. 0 play/{ → 2.0}/computer_database_cf_by_name/app/controllers/Application.java
  27. 0 play/{computer_database_cf_by_type → 2.0/computer_database_cf_by_name}/app/models/Company.java
  28. 0 play/{computer_database_cf_by_type → 2.0/computer_database_cf_by_name}/app/models/Computer.java
  29. 0 .../{computer_database_jpa_mysql → 2.0/computer_database_cf_by_name}/app/views/createForm.scala.html
  30. 0 play/{computer_database_jpa_mysql → 2.0/computer_database_cf_by_name}/app/views/editForm.scala.html
  31. 0 play/{computer_database_cf_by_type → 2.0/computer_database_cf_by_name}/app/views/list.scala.html
  32. 0 play/{computer_database_multi_dbs → 2.0/computer_database_cf_by_name}/app/views/main.scala.html
  33. 0 ...database_multi_dbs → 2.0/computer_database_cf_by_name}/app/views/twitterBootstrapInput.scala.html
  34. 0 play/{ → 2.0}/computer_database_cf_by_name/conf/application.conf
  35. 0 play/{computer_database_multi_dbs → 2.0/computer_database_cf_by_name}/conf/evolutions/default/1.sql
  36. 0 play/{computer_database_jpa → 2.0/computer_database_cf_by_name}/conf/evolutions/default/2.sql
  37. 0 play/{computer_database_multi_dbs → 2.0/computer_database_cf_by_name}/conf/messages
  38. 0 play/{computer_database_jpa_mysql → 2.0/computer_database_cf_by_name}/conf/routes
  39. 0 play/{ → 2.0}/computer_database_cf_by_name/pom.xml
  40. 0 play/{computer_database_cf_by_type → 2.0/computer_database_cf_by_name}/project/Build.scala
  41. 0 play/{zentasks_cf_by_name → 2.0/computer_database_cf_by_name}/project/build.properties
  42. 0 play/{zentasks_cf_by_name → 2.0/computer_database_cf_by_name}/project/plugins.sbt
  43. 0 ...puter_database_multi_dbs → 2.0/computer_database_cf_by_name}/public/stylesheets/bootstrap.min.css
  44. 0 play/{computer_database_jpa_mysql → 2.0/computer_database_cf_by_name}/public/stylesheets/main.css
  45. 0 play/{ → 2.0}/computer_database_cf_by_type/README
  46. 0 play/{ → 2.0}/computer_database_cf_by_type/app/controllers/Application.java
  47. 0 play/{computer_database_cf_by_name → 2.0/computer_database_cf_by_type}/app/models/Company.java
  48. 0 play/{computer_database_cf_by_name → 2.0/computer_database_cf_by_type}/app/models/Computer.java
  49. 0 play/{computer_database_jpa → 2.0/computer_database_cf_by_type}/app/views/createForm.scala.html
  50. 0 play/{computer_database_jpa → 2.0/computer_database_cf_by_type}/app/views/editForm.scala.html
  51. 0 play/{computer_database_cf_by_name → 2.0/computer_database_cf_by_type}/app/views/list.scala.html
  52. 0 play/{computer_database_jpa_mysql → 2.0/computer_database_cf_by_type}/app/views/main.scala.html
  53. 0 ...database_jpa_mysql → 2.0/computer_database_cf_by_type}/app/views/twitterBootstrapInput.scala.html
  54. 0 play/{ → 2.0}/computer_database_cf_by_type/conf/application.conf
  55. 0 play/{computer_database_jpa → 2.0/computer_database_cf_by_type}/conf/evolutions/default/1.sql
  56. 0 play/{ → 2.0}/computer_database_cf_by_type/conf/evolutions/default/2.sql
  57. 0 play/{computer_database_jpa_mysql → 2.0/computer_database_cf_by_type}/conf/messages
  58. 0 play/{computer_database_jpa → 2.0/computer_database_cf_by_type}/conf/routes
  59. 0 play/{ → 2.0}/computer_database_cf_by_type/pom.xml
  60. 0 play/{computer_database_cf_by_name → 2.0/computer_database_cf_by_type}/project/Build.scala
  61. 0 play/{todolist_with_cfruntime → 2.0/computer_database_cf_by_type}/project/build.properties
  62. 0 play/{todolist_with_cfruntime → 2.0/computer_database_cf_by_type}/project/plugins.sbt
  63. 0 ...puter_database_jpa_mysql → 2.0/computer_database_cf_by_type}/public/stylesheets/bootstrap.min.css
  64. 0 play/{computer_database_jpa → 2.0/computer_database_cf_by_type}/public/stylesheets/main.css
  65. 0 play/{computer_database_jpa_mysql → 2.0/computer_database_cf_by_type}/test/FunctionalTest.java
  66. 0 play/{ → 2.0}/computer_database_cf_by_type/test/IntegrationTest.java
  67. 0 play/{ → 2.0}/computer_database_cf_by_type/test/ModelTest.java
  68. 0 play/{ → 2.0}/computer_database_jpa_mysql/README
  69. 0 play/{ → 2.0}/computer_database_jpa_mysql/app/controllers/Application.java
  70. 0 play/{ → 2.0}/computer_database_jpa_mysql/app/models/Company.java
  71. 0 play/{ → 2.0}/computer_database_jpa_mysql/app/models/Computer.java
  72. 0 .../{computer_database_cf_by_type → 2.0/computer_database_jpa_mysql}/app/views/createForm.scala.html
  73. 0 play/{computer_database_cf_by_type → 2.0/computer_database_jpa_mysql}/app/views/editForm.scala.html
  74. 0 play/{ → 2.0}/computer_database_jpa_mysql/app/views/list.scala.html
  75. 0 play/{computer_database_jpa → 2.0/computer_database_jpa_mysql}/app/views/main.scala.html
  76. 0 ...mputer_database_jpa → 2.0/computer_database_jpa_mysql}/app/views/twitterBootstrapInput.scala.html
  77. 0 play/{ → 2.0}/computer_database_jpa_mysql/conf/META-INF/persistence.xml
  78. 0 play/{ → 2.0}/computer_database_jpa_mysql/conf/application.conf
  79. 0 play/{ → 2.0}/computer_database_jpa_mysql/conf/evolutions/default/1.sql
  80. 0 play/{ → 2.0}/computer_database_jpa_mysql/conf/evolutions/default/2.sql
  81. 0 play/{computer_database_jpa → 2.0/computer_database_jpa_mysql}/conf/messages
  82. 0 play/{computer_database_cf_by_type → 2.0/computer_database_jpa_mysql}/conf/routes
  83. 0 play/{ → 2.0}/computer_database_jpa_mysql/pom.xml
  84. 0 play/{ → 2.0}/computer_database_jpa_mysql/project/Build.scala
  85. 0 play/{todolist → 2.0/computer_database_jpa_mysql}/project/build.properties
  86. 0 play/{todolist → 2.0/computer_database_jpa_mysql}/project/plugins.sbt
  87. 0 play/{computer_database_jpa → 2.0/computer_database_jpa_mysql}/public/stylesheets/bootstrap.min.css
  88. 0 play/{computer_database_cf_by_type → 2.0/computer_database_jpa_mysql}/public/stylesheets/main.css
  89. 0 play/{computer_database_jpa → 2.0/computer_database_jpa_mysql}/test/FunctionalTest.java
  90. 0 play/{ → 2.0}/computer_database_jpa_mysql/test/IntegrationTest.java
  91. 0 play/{ → 2.0}/computer_database_jpa_mysql/test/ModelTest.java
  92. 0 play/{ → 2.0}/computer_database_multi_dbs/README
  93. 0 ..._database_autoconfig_disabled → 2.0/computer_database_multi_dbs}/app/controllers/Application.java
  94. 0 ...{computer_database_autoconfig_disabled → 2.0/computer_database_multi_dbs}/app/models/Company.java
  95. 0 ...computer_database_autoconfig_disabled → 2.0/computer_database_multi_dbs}/app/models/Computer.java
  96. 0 .../{computer_database_cf_by_name → 2.0/computer_database_multi_dbs}/app/views/createForm.scala.html
  97. 0 play/{computer_database_cf_by_name → 2.0/computer_database_multi_dbs}/app/views/editForm.scala.html
  98. 0 ...omputer_database_autoconfig_disabled → 2.0/computer_database_multi_dbs}/app/views/list.scala.html
  99. 0 play/{computer_database_cf_by_type → 2.0/computer_database_multi_dbs}/app/views/main.scala.html
  100. 0 ...database_cf_by_type → 2.0/computer_database_multi_dbs}/app/views/twitterBootstrapInput.scala.html
  101. 0 play/{ → 2.0}/computer_database_multi_dbs/conf/application.conf
  102. 0 play/{computer_database_cf_by_type → 2.0/computer_database_multi_dbs}/conf/evolutions/default/1.sql
  103. 0 play/{computer_database_cf_by_name → 2.0/computer_database_multi_dbs}/conf/evolutions/default/2.sql
  104. 0 play/{computer_database_cf_by_type → 2.0/computer_database_multi_dbs}/conf/messages
  105. 0 play/{computer_database_cf_by_name → 2.0/computer_database_multi_dbs}/conf/routes
  106. 0 play/{ → 2.0}/computer_database_multi_dbs/pom.xml
  107. 0 play/{computer_database_autoconfig_disabled → 2.0/computer_database_multi_dbs}/project/Build.scala
  108. 0 play/{computer_database_scala → 2.0/computer_database_multi_dbs}/project/build.properties
  109. 0 play/{computer_database_scala → 2.0/computer_database_multi_dbs}/project/plugins.sbt
  110. 0 ...puter_database_cf_by_type → 2.0/computer_database_multi_dbs}/public/stylesheets/bootstrap.min.css
  111. 0 play/{computer_database_cf_by_name → 2.0/computer_database_multi_dbs}/public/stylesheets/main.css
  112. 0 play/{computer_database_cf_by_type → 2.0/computer_database_multi_dbs}/test/FunctionalTest.java
  113. 0 ...omputer_database_autoconfig_disabled → 2.0/computer_database_multi_dbs}/test/IntegrationTest.java
  114. 0 play/{computer_database_autoconfig_disabled → 2.0/computer_database_multi_dbs}/test/ModelTest.java
  115. 0 play/{ → 2.0}/computer_database_scala/README
  116. 0 play/{ → 2.0}/computer_database_scala/app/controllers/Application.scala
  117. 0 play/{ → 2.0}/computer_database_scala/app/models/Models.scala
  118. 0 play/{ → 2.0}/computer_database_scala/app/views/createForm.scala.html
  119. 0 play/{ → 2.0}/computer_database_scala/app/views/editForm.scala.html
  120. 0 play/{ → 2.0}/computer_database_scala/app/views/list.scala.html
  121. 0 play/{computer_database_cf_by_name → 2.0/computer_database_scala}/app/views/main.scala.html
  122. 0 ...ter_database_cf_by_name → 2.0/computer_database_scala}/app/views/twitterBootstrapInput.scala.html
  123. 0 play/{ → 2.0}/computer_database_scala/conf/application.conf
  124. 0 play/{computer_database_cf_by_name → 2.0/computer_database_scala}/conf/evolutions/default/1.sql
  125. 0 play/{ → 2.0}/computer_database_scala/conf/evolutions/default/2.sql
  126. 0 play/{computer_database_cf_by_name → 2.0/computer_database_scala}/conf/messages
  127. 0 play/{ → 2.0}/computer_database_scala/conf/routes
  128. 0 play/{ → 2.0}/computer_database_scala/pom.xml
  129. 0 play/{ → 2.0}/computer_database_scala/project/Build.scala
  130. 0 play/{computer_database_multi_dbs → 2.0/computer_database_scala}/project/build.properties
  131. 0 play/{computer_database_multi_dbs → 2.0/computer_database_scala}/project/plugins.sbt
  132. 0 ...{computer_database_cf_by_name → 2.0/computer_database_scala}/public/stylesheets/bootstrap.min.css
  133. 0 play/{ → 2.0}/computer_database_scala/public/stylesheets/main.css
  134. 0 play/{ → 2.0}/computer_database_scala/test/ApplicationSpec.scala
  135. 0 play/{ → 2.0}/computer_database_scala/test/IntegrationSpec.scala
  136. 0 play/{ → 2.0}/computer_database_scala/test/ModelSpec.scala
  137. 0 play/{ → 2.0}/todolist/README
  138. 0 play/{ → 2.0}/todolist/app/controllers/Application.java
  139. 0 play/{todolist_with_cfruntime → 2.0/todolist}/app/models/Task.java
  140. 0 play/{todolist_with_cfruntime → 2.0/todolist}/app/views/index.scala.html
  141. 0 play/{todolist_with_cfruntime → 2.0/todolist}/app/views/main.scala.html
  142. 0 play/{todolist_with_cfruntime → 2.0/todolist}/conf/application.conf
  143. 0 play/{ → 2.0}/todolist/conf/evolutions/default/1.sql
  144. 0 play/{ → 2.0}/todolist/conf/routes
  145. 0 play/{ → 2.0}/todolist/pom.xml
  146. 0 play/{ → 2.0}/todolist/project/Build.scala
  147. 0 play/{computer_database_jpa_mysql → 2.0/todolist}/project/build.properties
  148. 0 play/{computer_database_jpa_mysql → 2.0/todolist}/project/plugins.sbt
  149. 0 play/{todolist_with_cfruntime → 2.0/todolist}/public/images/favicon.png
  150. 0 play/{todolist_with_cfruntime → 2.0/todolist}/public/javascripts/jquery-1.7.1.min.js
  151. 0 play/{todolist_with_cfruntime → 2.0/todolist}/public/stylesheets/main.css
  152. 0 play/{ → 2.0}/zentasks_cf_by_name/README
  153. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/Global.java
  154. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/assets/javascripts/main.coffee
  155. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/assets/stylesheets/apps/_tasks.less
  156. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/assets/stylesheets/libs/_mate.less
  157. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/assets/stylesheets/libs/_reset.less
  158. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/assets/stylesheets/libs/_theme.less
  159. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/assets/stylesheets/login.less
  160. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/assets/stylesheets/main.less
  161. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/assets/stylesheets/main/_breadcrumb.less
  162. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/assets/stylesheets/main/_drawer.less
  163. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/assets/stylesheets/main/_header.less
  164. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/assets/stylesheets/main/_layout.less
  165. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/assets/stylesheets/main/_widgets.less
  166. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/controllers/Application.java
  167. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/controllers/Projects.java
  168. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/controllers/Secured.java
  169. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/controllers/Tasks.java
  170. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/models/Project.java
  171. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/models/Task.java
  172. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/models/User.java
  173. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/views/dashboard.scala.html
  174. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/views/login.scala.html
  175. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/views/main.scala.html
  176. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/views/projects/group.scala.html
  177. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/views/projects/item.scala.html
  178. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/views/tasks/folder.scala.html
  179. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/views/tasks/index.scala.html
  180. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/app/views/tasks/item.scala.html
  181. 0 play/{ → 2.0}/zentasks_cf_by_name/conf/application.conf
  182. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/conf/evolutions/default/1.sql
  183. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/conf/initial-data.yml
  184. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/conf/routes
  185. 0 play/{ → 2.0}/zentasks_cf_by_name/pom.xml
  186. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/project/Build.scala
  187. 0 play/{computer_database_jpa → 2.0/zentasks_cf_by_name}/project/build.properties
  188. 0 play/{computer_database_jpa → 2.0/zentasks_cf_by_name}/project/plugins.sbt
  189. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/public/images/arrow-left.png
  190. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/public/images/breadcrumb-1.png
  191. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/public/images/breadcrumb-2.png
  192. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/public/images/breadcrumb.png
  193. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/public/images/icons/addRemove.png
  194. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/public/images/icons/clock.png
  195. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/public/images/icons/delete.png
  196. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/public/images/icons/drawer.folder.png
  197. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/public/images/icons/folder.png
  198. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/public/images/icons/home.png
  199. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/public/images/icons/options.png
  200. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/public/images/icons/user.png
  201. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/public/images/icons/user2.png
  202. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/public/images/loading.gif
  203. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/public/images/pattern.png
  204. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/public/javascripts/backbone-min.js
  205. 0 play/{zentasks_cf_by_type → 2.0/zentasks_cf_by_name}/public/javascripts/underscore-min.js
  206. 0 play/{computer_database_jpa → 2.1/computer_database_jpa-2.1}/README
  207. +12 −10 play/{computer_database_jpa → 2.1/computer_database_jpa-2.1}/app/controllers/Application.java
  208. +4 −4 play/{computer_database_jpa → 2.1/computer_database_jpa-2.1}/app/models/Company.java
  209. +22 −22 play/{computer_database_jpa → 2.1/computer_database_jpa-2.1}/app/models/Computer.java
  210. +14 −14 ...ter_database_autoconfig_disabled → 2.1/computer_database_jpa-2.1}/app/views/createForm.scala.html
  211. +15 −15 ...puter_database_autoconfig_disabled → 2.1/computer_database_jpa-2.1}/app/views/editForm.scala.html
  212. +17 −15 play/{computer_database_jpa → 2.1/computer_database_jpa-2.1}/app/views/list.scala.html
  213. +5 −5 ...{computer_database_autoconfig_disabled → 2.1/computer_database_jpa-2.1}/app/views/main.scala.html
  214. +1 −1 ...e_autoconfig_disabled → 2.1/computer_database_jpa-2.1}/app/views/twitterBootstrapInput.scala.html
  215. +3 −3 play/{computer_database_jpa → 2.1/computer_database_jpa-2.1}/conf/META-INF/persistence.xml
  216. +14 −0 play/{computer_database_jpa → 2.1/computer_database_jpa-2.1}/conf/application.conf
  217. 0 play/{computer_database_jpa → 2.1/computer_database_jpa-2.1}/conf/db.conf
  218. +1 −0 ...puter_database_autoconfig_disabled → 2.1/computer_database_jpa-2.1}/conf/evolutions/default/1.sql
  219. +2 −2 ...puter_database_autoconfig_disabled → 2.1/computer_database_jpa-2.1}/conf/evolutions/default/2.sql
  220. +2 −0 play/{computer_database_autoconfig_disabled → 2.1/computer_database_jpa-2.1}/conf/messages
  221. +1 −0 play/{computer_database_autoconfig_disabled → 2.1/computer_database_jpa-2.1}/conf/routes
  222. +2 −3 play/{zentasks_cf_by_type → 2.1/computer_database_jpa-2.1}/pom.xml
  223. +7 −2 play/{computer_database_jpa → 2.1/computer_database_jpa-2.1}/project/Build.scala
  224. +1 −0 play/2.1/computer_database_jpa-2.1/project/build.properties
  225. +1 −1 play/{computer_database_cf_by_name → 2.1/computer_database_jpa-2.1}/project/plugins.sbt
  226. +1 −1 ...atabase_autoconfig_disabled → 2.1/computer_database_jpa-2.1}/public/stylesheets/bootstrap.min.css
  227. +3 −1 ...omputer_database_autoconfig_disabled → 2.1/computer_database_jpa-2.1}/public/stylesheets/main.css
  228. +14 −14 .../{computer_database_autoconfig_disabled → 2.1/computer_database_jpa-2.1}/test/FunctionalTest.java
  229. +17 −17 play/{computer_database_jpa → 2.1/computer_database_jpa-2.1}/test/IntegrationTest.java
  230. +3 −3 play/{computer_database_jpa → 2.1/computer_database_jpa-2.1}/test/ModelTest.java
  231. +15 −0 play/2.1/todolist_with_cfruntime-2.1/.gitignore
  232. +2 −1 play/{todolist_with_cfruntime → 2.1/todolist_with_cfruntime-2.1}/README
  233. +3 −4 play/{todolist_with_cfruntime → 2.1/todolist_with_cfruntime-2.1}/app/controllers/Application.java
  234. 0 play/{todolist → 2.1/todolist_with_cfruntime-2.1}/app/models/Task.java
  235. 0 play/{todolist → 2.1/todolist_with_cfruntime-2.1}/app/views/index.scala.html
  236. +1 −1 play/{todolist → 2.1/todolist_with_cfruntime-2.1}/app/views/main.scala.html
  237. +15 −3 play/{todolist → 2.1/todolist_with_cfruntime-2.1}/conf/application.conf
  238. 0 play/{todolist_with_cfruntime → 2.1/todolist_with_cfruntime-2.1}/conf/evolutions/default/1.sql
  239. 0 play/{todolist_with_cfruntime → 2.1/todolist_with_cfruntime-2.1}/conf/routes
  240. +2 −3 play/{computer_database_jpa → 2.1/todolist_with_cfruntime-2.1}/pom.xml
  241. +22 −0 play/2.1/todolist_with_cfruntime-2.1/project/Build.scala
  242. +1 −0 play/2.1/todolist_with_cfruntime-2.1/project/build.properties
  243. +1 −1 play/{computer_database_autoconfig_disabled → 2.1/todolist_with_cfruntime-2.1}/project/plugins.sbt
  244. BIN play/{todolist → 2.1/todolist_with_cfruntime-2.1}/public/images/favicon.png
  245. +4 −0 play/2.1/todolist_with_cfruntime-2.1/public/javascripts/jquery-1.9.0.min.js
  246. 0 play/{todolist → 2.1/todolist_with_cfruntime-2.1}/public/stylesheets/main.css
  247. +44 −0 play/2.1/todolist_with_cfruntime-2.1/test/ApplicationTest.java
  248. +28 −0 play/2.1/todolist_with_cfruntime-2.1/test/IntegrationTest.java
  249. +1 −1 play/{zentasks_cf_by_type → 2.1/zentasks_cf_by_type-2.1}/README
  250. +8 −8 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/Global.java
  251. +3 −2 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/assets/javascripts/main.coffee
  252. 0 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/assets/stylesheets/apps/_tasks.less
  253. 0 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/assets/stylesheets/libs/_mate.less
  254. +3 −0 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/assets/stylesheets/libs/_reset.less
  255. +1 −0 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/assets/stylesheets/libs/_theme.less
  256. +2 −1 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/assets/stylesheets/login.less
  257. +2 −1 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/assets/stylesheets/main.less
  258. +1 −0 .../{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/assets/stylesheets/main/_breadcrumb.less
  259. 0 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/assets/stylesheets/main/_drawer.less
  260. 0 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/assets/stylesheets/main/_header.less
  261. 0 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/assets/stylesheets/main/_layout.less
  262. +1 −0 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/assets/stylesheets/main/_widgets.less
  263. +23 −23 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/controllers/Application.java
  264. +13 −11 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/controllers/Projects.java
  265. +7 −7 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/controllers/Secured.java
  266. +12 −10 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/controllers/Tasks.java
  267. +19 −18 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/models/Project.java
  268. +18 −17 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/models/Task.java
  269. +10 −9 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/models/User.java
  270. +4 −3 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/views/dashboard.scala.html
  271. +13 −10 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/views/login.scala.html
  272. +1 −0 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/views/main.scala.html
  273. 0 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/views/projects/group.scala.html
  274. 0 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/views/projects/item.scala.html
  275. +1 −0 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/views/tasks/folder.scala.html
  276. +1 −0 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/views/tasks/index.scala.html
  277. +6 −6 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/app/views/tasks/item.scala.html
  278. +2 −0 play/{zentasks_cf_by_type → 2.1/zentasks_cf_by_type-2.1}/conf/application.conf
  279. +49 −48 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/conf/evolutions/default/1.sql
  280. +19 −18 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/conf/initial-data.yml
  281. +1 −0 play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/conf/routes
  282. +19 −0 play/2.1/zentasks_cf_by_type-2.1/pom.xml
  283. +22 −0 play/2.1/zentasks_cf_by_type-2.1/project/Build.scala
  284. +1 −0 play/2.1/zentasks_cf_by_type-2.1/project/build.properties
  285. +1 −1 play/{computer_database_cf_by_type → 2.1/zentasks_cf_by_type-2.1}/project/plugins.sbt
  286. BIN play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/public/images/arrow-left.png
  287. BIN play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/public/images/breadcrumb-1.png
  288. BIN play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/public/images/breadcrumb-2.png
  289. BIN play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/public/images/breadcrumb.png
  290. BIN play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/public/images/icons/addRemove.png
  291. BIN play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/public/images/icons/clock.png
  292. BIN play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/public/images/icons/delete.png
  293. BIN play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/public/images/icons/drawer.folder.png
  294. BIN play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/public/images/icons/folder.png
  295. BIN play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/public/images/icons/home.png
  296. BIN play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/public/images/icons/options.png
  297. BIN play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/public/images/icons/user.png
  298. BIN play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/public/images/icons/user2.png
  299. BIN play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/public/images/loading.gif
  300. BIN play/{zentasks_cf_by_name → 2.1/zentasks_cf_by_type-2.1}/public/images/pattern.png
Sorry, we could not display the entire diff because too many files (311) changed.
View
0 ...puter_database_autoconfig_disabled/README → ...puter_database_autoconfig_disabled/README
File renamed without changes.
View
0 ...ulti_dbs/app/controllers/Application.java → ...disabled/app/controllers/Application.java
File renamed without changes.
View
0 ...atabase_multi_dbs/app/models/Company.java → ...toconfig_disabled/app/models/Company.java
File renamed without changes.
View
0 ...tabase_multi_dbs/app/models/Computer.java → ...oconfig_disabled/app/models/Computer.java
File renamed without changes.
View
0 ...multi_dbs/app/views/createForm.scala.html → ..._disabled/app/views/createForm.scala.html
File renamed without changes.
View
0 ...e_multi_dbs/app/views/editForm.scala.html → ...ig_disabled/app/views/editForm.scala.html
File renamed without changes.
View
0 ...abase_multi_dbs/app/views/list.scala.html → ...config_disabled/app/views/list.scala.html
File renamed without changes.
View
0 ..._database_scala/app/views/main.scala.html → ...config_disabled/app/views/main.scala.html
File renamed without changes.
View
0 ...pp/views/twitterBootstrapInput.scala.html → ...pp/views/twitterBootstrapInput.scala.html
File renamed without changes.
View
0 ...autoconfig_disabled/conf/application.conf → ...autoconfig_disabled/conf/application.conf
File renamed without changes.
View
0 ...fig_disabled/conf/cloudfoundry.properties → ...fig_disabled/conf/cloudfoundry.properties
File renamed without changes.
View
0 ...abase_scala/conf/evolutions/default/1.sql → ...ig_disabled/conf/evolutions/default/1.sql
File renamed without changes.
View
0 ...e_multi_dbs/conf/evolutions/default/2.sql → ...ig_disabled/conf/evolutions/default/2.sql
File renamed without changes.
View
0 play/computer_database_scala/conf/messages → ...atabase_autoconfig_disabled/conf/messages
File renamed without changes.
View
0 play/computer_database_multi_dbs/conf/routes → ..._database_autoconfig_disabled/conf/routes
File renamed without changes.
View
2 ...uter_database_autoconfig_disabled/pom.xml → ...uter_database_autoconfig_disabled/pom.xml
@@ -12,7 +12,7 @@
<plugin>
<groupId>de.akquinet.innovation.play2</groupId>
<artifactId>play2-maven-plugin</artifactId>
- <version>1.0.1</version>
+ <version>1.2.1</version>
<extensions>true</extensions>
</plugin>
</plugins>
View
0 ...er_database_multi_dbs/project/Build.scala → ...e_autoconfig_disabled/project/Build.scala
File renamed without changes.
View
0 ...tasks_cf_by_type/project/build.properties → ...oconfig_disabled/project/build.properties
File renamed without changes.
View
0 play/zentasks_cf_by_type/project/plugins.sbt → ...e_autoconfig_disabled/project/plugins.sbt
File renamed without changes.
View
0 ...cala/public/stylesheets/bootstrap.min.css → ...bled/public/stylesheets/bootstrap.min.css
File renamed without changes.
View
0 ...ase_multi_dbs/public/stylesheets/main.css → ...nfig_disabled/public/stylesheets/main.css
File renamed without changes.
View
0 ...tabase_multi_dbs/test/FunctionalTest.java → ...oconfig_disabled/test/FunctionalTest.java
File renamed without changes.
View
0 ...abase_multi_dbs/test/IntegrationTest.java → ...config_disabled/test/IntegrationTest.java
File renamed without changes.
View
0 ...er_database_multi_dbs/test/ModelTest.java → ...e_autoconfig_disabled/test/ModelTest.java
File renamed without changes.
View
0 play/computer_database_cf_by_name/README → play/2.0/computer_database_cf_by_name/README
File renamed without changes.
View
0 ..._by_name/app/controllers/Application.java → ..._by_name/app/controllers/Application.java
File renamed without changes.
View
0 ...tabase_cf_by_type/app/models/Company.java → ...tabase_cf_by_name/app/models/Company.java
File renamed without changes.
View
0 ...abase_cf_by_type/app/models/Computer.java → ...abase_cf_by_name/app/models/Computer.java
File renamed without changes.
View
0 ...jpa_mysql/app/views/createForm.scala.html → ...f_by_name/app/views/createForm.scala.html
File renamed without changes.
View
0 ...e_jpa_mysql/app/views/editForm.scala.html → ..._cf_by_name/app/views/editForm.scala.html
File renamed without changes.
View
0 ...base_cf_by_type/app/views/list.scala.html → ...base_cf_by_name/app/views/list.scala.html
File renamed without changes.
View
0 ...abase_multi_dbs/app/views/main.scala.html → ...base_cf_by_name/app/views/main.scala.html
File renamed without changes.
View
0 ...pp/views/twitterBootstrapInput.scala.html → ...pp/views/twitterBootstrapInput.scala.html
File renamed without changes.
View
0 ...database_cf_by_name/conf/application.conf → ...database_cf_by_name/conf/application.conf
File renamed without changes.
View
0 ...e_multi_dbs/conf/evolutions/default/1.sql → ..._cf_by_name/conf/evolutions/default/1.sql
File renamed without changes.
View
0 ...atabase_jpa/conf/evolutions/default/2.sql → ..._cf_by_name/conf/evolutions/default/2.sql
File renamed without changes.
View
0 ...computer_database_multi_dbs/conf/messages → ...omputer_database_cf_by_name/conf/messages
File renamed without changes.
View
0 play/computer_database_jpa_mysql/conf/routes → .../computer_database_cf_by_name/conf/routes
File renamed without changes.
View
0 play/computer_database_cf_by_name/pom.xml → .../2.0/computer_database_cf_by_name/pom.xml
File renamed without changes.
View
0 ...r_database_cf_by_type/project/Build.scala → ...r_database_cf_by_name/project/Build.scala
File renamed without changes.
View
0 ...tasks_cf_by_name/project/build.properties → ...abase_cf_by_name/project/build.properties
File renamed without changes.
View
0 play/zentasks_cf_by_name/project/plugins.sbt → ...r_database_cf_by_name/project/plugins.sbt
File renamed without changes.
View
0 ..._dbs/public/stylesheets/bootstrap.min.css → ...name/public/stylesheets/bootstrap.min.css
File renamed without changes.
View
0 ...ase_jpa_mysql/public/stylesheets/main.css → ...se_cf_by_name/public/stylesheets/main.css
File renamed without changes.
View
0 play/computer_database_cf_by_type/README → play/2.0/computer_database_cf_by_type/README
File renamed without changes.
View
0 ..._by_type/app/controllers/Application.java → ..._by_type/app/controllers/Application.java
File renamed without changes.
View
0 ...tabase_cf_by_name/app/models/Company.java → ...tabase_cf_by_type/app/models/Company.java
File renamed without changes.
View
0 ...abase_cf_by_name/app/models/Computer.java → ...abase_cf_by_type/app/models/Computer.java
File renamed without changes.
View
0 ...abase_jpa/app/views/createForm.scala.html → ...f_by_type/app/views/createForm.scala.html
File renamed without changes.
View
0 ...atabase_jpa/app/views/editForm.scala.html → ..._cf_by_type/app/views/editForm.scala.html
File renamed without changes.
View
0 ...base_cf_by_name/app/views/list.scala.html → ...base_cf_by_type/app/views/list.scala.html
File renamed without changes.
View
0 ...abase_jpa_mysql/app/views/main.scala.html → ...base_cf_by_type/app/views/main.scala.html
File renamed without changes.
View
0 ...pp/views/twitterBootstrapInput.scala.html → ...pp/views/twitterBootstrapInput.scala.html
File renamed without changes.
View
0 ...database_cf_by_type/conf/application.conf → ...database_cf_by_type/conf/application.conf
File renamed without changes.
View
0 ...atabase_jpa/conf/evolutions/default/1.sql → ..._cf_by_type/conf/evolutions/default/1.sql
File renamed without changes.
View
0 ..._cf_by_type/conf/evolutions/default/2.sql → ..._cf_by_type/conf/evolutions/default/2.sql
File renamed without changes.
View
0 ...computer_database_jpa_mysql/conf/messages → ...omputer_database_cf_by_type/conf/messages
File renamed without changes.
View
0 play/computer_database_jpa/conf/routes → .../computer_database_cf_by_type/conf/routes
File renamed without changes.
View
0 play/computer_database_cf_by_type/pom.xml → .../2.0/computer_database_cf_by_type/pom.xml
File renamed without changes.
View
0 ...r_database_cf_by_name/project/Build.scala → ...r_database_cf_by_type/project/Build.scala
File renamed without changes.
View
0 ...t_with_cfruntime/project/build.properties → ...abase_cf_by_type/project/build.properties
File renamed without changes.
View
0 ...dolist_with_cfruntime/project/plugins.sbt → ...r_database_cf_by_type/project/plugins.sbt
File renamed without changes.
View
0 ...ysql/public/stylesheets/bootstrap.min.css → ...type/public/stylesheets/bootstrap.min.css
File renamed without changes.
View
0 ..._database_jpa/public/stylesheets/main.css → ...se_cf_by_type/public/stylesheets/main.css
File renamed without changes.
View
0 ...tabase_jpa_mysql/test/FunctionalTest.java → ...abase_cf_by_type/test/FunctionalTest.java
File renamed without changes.
View
0 ...base_cf_by_type/test/IntegrationTest.java → ...base_cf_by_type/test/IntegrationTest.java
File renamed without changes.
View
0 ...r_database_cf_by_type/test/ModelTest.java → ...r_database_cf_by_type/test/ModelTest.java
File renamed without changes.
View
0 play/computer_database_jpa_mysql/README → play/2.0/computer_database_jpa_mysql/README
File renamed without changes.
View
0 ...pa_mysql/app/controllers/Application.java → ...pa_mysql/app/controllers/Application.java
File renamed without changes.
View
0 ...atabase_jpa_mysql/app/models/Company.java → ...atabase_jpa_mysql/app/models/Company.java
File renamed without changes.
View
0 ...tabase_jpa_mysql/app/models/Computer.java → ...tabase_jpa_mysql/app/models/Computer.java
File renamed without changes.
View
0 ...f_by_type/app/views/createForm.scala.html → ...jpa_mysql/app/views/createForm.scala.html
File renamed without changes.
View
0 ..._cf_by_type/app/views/editForm.scala.html → ...e_jpa_mysql/app/views/editForm.scala.html
File renamed without changes.
View
0 ...abase_jpa_mysql/app/views/list.scala.html → ...abase_jpa_mysql/app/views/list.scala.html
File renamed without changes.
View
0 ...er_database_jpa/app/views/main.scala.html → ...abase_jpa_mysql/app/views/main.scala.html
File renamed without changes.
View
0 ...pp/views/twitterBootstrapInput.scala.html → ...pp/views/twitterBootstrapInput.scala.html
File renamed without changes.
View
0 ...e_jpa_mysql/conf/META-INF/persistence.xml → ...e_jpa_mysql/conf/META-INF/persistence.xml
File renamed without changes.
View
0 ..._database_jpa_mysql/conf/application.conf → ..._database_jpa_mysql/conf/application.conf
File renamed without changes.
View
0 ...e_jpa_mysql/conf/evolutions/default/1.sql → ...e_jpa_mysql/conf/evolutions/default/1.sql
File renamed without changes.
View
0 ...e_jpa_mysql/conf/evolutions/default/2.sql → ...e_jpa_mysql/conf/evolutions/default/2.sql
File renamed without changes.
View
0 play/computer_database_jpa/conf/messages → ...computer_database_jpa_mysql/conf/messages
File renamed without changes.
View
0 .../computer_database_cf_by_type/conf/routes → ...0/computer_database_jpa_mysql/conf/routes
File renamed without changes.
View
0 play/computer_database_jpa_mysql/pom.xml → play/2.0/computer_database_jpa_mysql/pom.xml
File renamed without changes.
View
0 ...er_database_jpa_mysql/project/Build.scala → ...er_database_jpa_mysql/project/Build.scala
File renamed without changes.
View
0 play/todolist/project/build.properties → ...tabase_jpa_mysql/project/build.properties
File renamed without changes.
View
0 play/todolist/project/plugins.sbt → ...er_database_jpa_mysql/project/plugins.sbt
File renamed without changes.
View
0 ..._jpa/public/stylesheets/bootstrap.min.css → ...ysql/public/stylesheets/bootstrap.min.css
File renamed without changes.
View
0 ...se_cf_by_type/public/stylesheets/main.css → ...ase_jpa_mysql/public/stylesheets/main.css
File renamed without changes.
View
0 ...ter_database_jpa/test/FunctionalTest.java → ...tabase_jpa_mysql/test/FunctionalTest.java
File renamed without changes.
View
0 ...abase_jpa_mysql/test/IntegrationTest.java → ...abase_jpa_mysql/test/IntegrationTest.java
File renamed without changes.
View
0 ...er_database_jpa_mysql/test/ModelTest.java → ...er_database_jpa_mysql/test/ModelTest.java
File renamed without changes.
View
0 play/computer_database_multi_dbs/README → play/2.0/computer_database_multi_dbs/README
File renamed without changes.
View
0 ...disabled/app/controllers/Application.java → ...ulti_dbs/app/controllers/Application.java
File renamed without changes.
View
0 ...toconfig_disabled/app/models/Company.java → ...atabase_multi_dbs/app/models/Company.java
File renamed without changes.
View
0 ...oconfig_disabled/app/models/Computer.java → ...tabase_multi_dbs/app/models/Computer.java
File renamed without changes.
View
0 ...f_by_name/app/views/createForm.scala.html → ...multi_dbs/app/views/createForm.scala.html
File renamed without changes.
View
0 ..._cf_by_name/app/views/editForm.scala.html → ...e_multi_dbs/app/views/editForm.scala.html
File renamed without changes.
View
0 ...config_disabled/app/views/list.scala.html → ...abase_multi_dbs/app/views/list.scala.html
File renamed without changes.
View
0 ...base_cf_by_type/app/views/main.scala.html → ...abase_multi_dbs/app/views/main.scala.html
File renamed without changes.
View
0 ...pp/views/twitterBootstrapInput.scala.html → ...pp/views/twitterBootstrapInput.scala.html
File renamed without changes.
View
0 ..._database_multi_dbs/conf/application.conf → ..._database_multi_dbs/conf/application.conf
File renamed without changes.
View
0 ..._cf_by_type/conf/evolutions/default/1.sql → ...e_multi_dbs/conf/evolutions/default/1.sql
File renamed without changes.
View
0 ..._cf_by_name/conf/evolutions/default/2.sql → ...e_multi_dbs/conf/evolutions/default/2.sql
File renamed without changes.
View
0 ...omputer_database_cf_by_type/conf/messages → ...computer_database_multi_dbs/conf/messages
File renamed without changes.
View
0 .../computer_database_cf_by_name/conf/routes → ...0/computer_database_multi_dbs/conf/routes
File renamed without changes.
View
0 play/computer_database_multi_dbs/pom.xml → play/2.0/computer_database_multi_dbs/pom.xml
File renamed without changes.
View
0 ...e_autoconfig_disabled/project/Build.scala → ...er_database_multi_dbs/project/Build.scala
File renamed without changes.
View
0 ...r_database_scala/project/build.properties → ...tabase_multi_dbs/project/build.properties
File renamed without changes.
View
0 ...mputer_database_scala/project/plugins.sbt → ...er_database_multi_dbs/project/plugins.sbt
File renamed without changes.
View
0 ...type/public/stylesheets/bootstrap.min.css → ..._dbs/public/stylesheets/bootstrap.min.css
File renamed without changes.
View
0 ...se_cf_by_name/public/stylesheets/main.css → ...ase_multi_dbs/public/stylesheets/main.css
File renamed without changes.
View
0 ...abase_cf_by_type/test/FunctionalTest.java → ...tabase_multi_dbs/test/FunctionalTest.java
File renamed without changes.
View
0 ...config_disabled/test/IntegrationTest.java → ...abase_multi_dbs/test/IntegrationTest.java
File renamed without changes.
View
0 ...e_autoconfig_disabled/test/ModelTest.java → ...er_database_multi_dbs/test/ModelTest.java
File renamed without changes.
View
0 play/computer_database_scala/README → play/2.0/computer_database_scala/README
File renamed without changes.
View
0 ...e_scala/app/controllers/Application.scala → ...e_scala/app/controllers/Application.scala
File renamed without changes.
View
0 ...er_database_scala/app/models/Models.scala → ...er_database_scala/app/models/Models.scala
File renamed without changes.
View
0 ...ase_scala/app/views/createForm.scala.html → ...ase_scala/app/views/createForm.scala.html
File renamed without changes.
View
0 ...abase_scala/app/views/editForm.scala.html → ...abase_scala/app/views/editForm.scala.html
File renamed without changes.
View
0 ..._database_scala/app/views/list.scala.html → ..._database_scala/app/views/list.scala.html
File renamed without changes.
View
0 ...base_cf_by_name/app/views/main.scala.html → ..._database_scala/app/views/main.scala.html
File renamed without changes.
View
0 ...pp/views/twitterBootstrapInput.scala.html → ...pp/views/twitterBootstrapInput.scala.html
File renamed without changes.
View
0 ...uter_database_scala/conf/application.conf → ...uter_database_scala/conf/application.conf
File renamed without changes.
View
0 ..._cf_by_name/conf/evolutions/default/1.sql → ...abase_scala/conf/evolutions/default/1.sql
File renamed without changes.
View
0 ...abase_scala/conf/evolutions/default/2.sql → ...abase_scala/conf/evolutions/default/2.sql
File renamed without changes.
View
0 ...omputer_database_cf_by_name/conf/messages → ...2.0/computer_database_scala/conf/messages
File renamed without changes.
View
0 play/computer_database_scala/conf/routes → play/2.0/computer_database_scala/conf/routes
File renamed without changes.
View
0 play/computer_database_scala/pom.xml → play/2.0/computer_database_scala/pom.xml
File renamed without changes.
View
0 ...mputer_database_scala/project/Build.scala → ...mputer_database_scala/project/Build.scala
File renamed without changes.
View
0 ...tabase_multi_dbs/project/build.properties → ...r_database_scala/project/build.properties
File renamed without changes.
View
0 ...er_database_multi_dbs/project/plugins.sbt → ...mputer_database_scala/project/plugins.sbt
File renamed without changes.
View
0 ...name/public/stylesheets/bootstrap.min.css → ...cala/public/stylesheets/bootstrap.min.css
File renamed without changes.
View
0 ...atabase_scala/public/stylesheets/main.css → ...atabase_scala/public/stylesheets/main.css
File renamed without changes.
View
0 ...database_scala/test/ApplicationSpec.scala → ...database_scala/test/ApplicationSpec.scala
File renamed without changes.
View
0 ...database_scala/test/IntegrationSpec.scala → ...database_scala/test/IntegrationSpec.scala
File renamed without changes.
View
0 ...puter_database_scala/test/ModelSpec.scala → ...puter_database_scala/test/ModelSpec.scala
File renamed without changes.
View
0 play/todolist/README → play/2.0/todolist/README
File renamed without changes.
View
0 ...todolist/app/controllers/Application.java → ...todolist/app/controllers/Application.java
File renamed without changes.
View
0 ...olist_with_cfruntime/app/models/Task.java → play/2.0/todolist/app/models/Task.java
File renamed without changes.
View
0 ...with_cfruntime/app/views/index.scala.html → play/2.0/todolist/app/views/index.scala.html
File renamed without changes.
View
0 ..._with_cfruntime/app/views/main.scala.html → play/2.0/todolist/app/views/main.scala.html
File renamed without changes.
View
0 ...list_with_cfruntime/conf/application.conf → play/2.0/todolist/conf/application.conf
File renamed without changes.
View
0 play/todolist/conf/evolutions/default/1.sql → ....0/todolist/conf/evolutions/default/1.sql
File renamed without changes.
View
0 play/todolist/conf/routes → play/2.0/todolist/conf/routes
File renamed without changes.
View
0 play/todolist/pom.xml → play/2.0/todolist/pom.xml
File renamed without changes.
View
0 play/todolist/project/Build.scala → play/2.0/todolist/project/Build.scala
File renamed without changes.
View
0 ...tabase_jpa_mysql/project/build.properties → play/2.0/todolist/project/build.properties
File renamed without changes.
View
0 ...er_database_jpa_mysql/project/plugins.sbt → play/2.0/todolist/project/plugins.sbt
File renamed without changes.
View
0 ..._with_cfruntime/public/images/favicon.png → play/2.0/todolist/public/images/favicon.png
File renamed without changes
View
0 ...me/public/javascripts/jquery-1.7.1.min.js → ...st/public/javascripts/jquery-1.7.1.min.js
File renamed without changes.
View
0 ...ith_cfruntime/public/stylesheets/main.css → .../2.0/todolist/public/stylesheets/main.css
File renamed without changes.
View
0 play/zentasks_cf_by_name/README → play/2.0/zentasks_cf_by_name/README
File renamed without changes.
View
0 play/zentasks_cf_by_type/app/Global.java → play/2.0/zentasks_cf_by_name/app/Global.java
File renamed without changes.
View
0 ...y_type/app/assets/javascripts/main.coffee → ...y_name/app/assets/javascripts/main.coffee
File renamed without changes.
View
0 ...e/app/assets/stylesheets/apps/_tasks.less → ...e/app/assets/stylesheets/apps/_tasks.less
File renamed without changes.
View
0 ...pe/app/assets/stylesheets/libs/_mate.less → ...me/app/assets/stylesheets/libs/_mate.less
File renamed without changes.
View
0 ...e/app/assets/stylesheets/libs/_reset.less → ...e/app/assets/stylesheets/libs/_reset.less
File renamed without changes.
View
0 ...e/app/assets/stylesheets/libs/_theme.less → ...e/app/assets/stylesheets/libs/_theme.less
File renamed without changes.
View
0 ...by_type/app/assets/stylesheets/login.less → ...by_name/app/assets/stylesheets/login.less
File renamed without changes.
View
0 ..._by_type/app/assets/stylesheets/main.less → ..._by_name/app/assets/stylesheets/main.less
File renamed without changes.
View
0 .../assets/stylesheets/main/_breadcrumb.less → .../assets/stylesheets/main/_breadcrumb.less
File renamed without changes.
View
0 .../app/assets/stylesheets/main/_drawer.less → .../app/assets/stylesheets/main/_drawer.less
File renamed without changes.
View
0 .../app/assets/stylesheets/main/_header.less → .../app/assets/stylesheets/main/_header.less
File renamed without changes.
View
0 .../app/assets/stylesheets/main/_layout.less → .../app/assets/stylesheets/main/_layout.less
File renamed without changes.
View
0 ...app/assets/stylesheets/main/_widgets.less → ...app/assets/stylesheets/main/_widgets.less
File renamed without changes.
View
0 ..._by_type/app/controllers/Application.java → ..._by_name/app/controllers/Application.java
File renamed without changes.
View
0 ..._cf_by_type/app/controllers/Projects.java → ..._cf_by_name/app/controllers/Projects.java
File renamed without changes.
View
0 ...s_cf_by_type/app/controllers/Secured.java → ...s_cf_by_name/app/controllers/Secured.java
File renamed without changes.
View
0 ...sks_cf_by_type/app/controllers/Tasks.java → ...sks_cf_by_name/app/controllers/Tasks.java
File renamed without changes.
View
0 ...ntasks_cf_by_type/app/models/Project.java → ...ntasks_cf_by_name/app/models/Project.java
File renamed without changes.
View
0 .../zentasks_cf_by_type/app/models/Task.java → .../zentasks_cf_by_name/app/models/Task.java
File renamed without changes.
View
0 .../zentasks_cf_by_type/app/models/User.java → .../zentasks_cf_by_name/app/models/User.java
File renamed without changes.
View
0 ...cf_by_type/app/views/dashboard.scala.html → ...cf_by_name/app/views/dashboard.scala.html
File renamed without changes.
View
0 ...sks_cf_by_type/app/views/login.scala.html → ...sks_cf_by_name/app/views/login.scala.html
File renamed without changes.
View
0 ...asks_cf_by_type/app/views/main.scala.html → ...asks_cf_by_name/app/views/main.scala.html
File renamed without changes.
View
0 ..._type/app/views/projects/group.scala.html → ..._name/app/views/projects/group.scala.html
File renamed without changes.
View
0 ...y_type/app/views/projects/item.scala.html → ...y_name/app/views/projects/item.scala.html
File renamed without changes.
View
0 ...by_type/app/views/tasks/folder.scala.html → ...by_name/app/views/tasks/folder.scala.html
File renamed without changes.
View
0 ..._by_type/app/views/tasks/index.scala.html → ..._by_name/app/views/tasks/index.scala.html
File renamed without changes.
View
0 ...f_by_type/app/views/tasks/item.scala.html → ...f_by_name/app/views/tasks/item.scala.html
File renamed without changes.
View
0 ...zentasks_cf_by_name/conf/application.conf → ...zentasks_cf_by_name/conf/application.conf
File renamed without changes.
View
0 ..._cf_by_type/conf/evolutions/default/1.sql → ..._cf_by_name/conf/evolutions/default/1.sql
File renamed without changes.
View
0 ...zentasks_cf_by_type/conf/initial-data.yml → ...zentasks_cf_by_name/conf/initial-data.yml
File renamed without changes.
View
0 play/zentasks_cf_by_type/conf/routes → play/2.0/zentasks_cf_by_name/conf/routes
File renamed without changes.
View
0 play/zentasks_cf_by_name/pom.xml → play/2.0/zentasks_cf_by_name/pom.xml
File renamed without changes.
View
0 play/zentasks_cf_by_type/project/Build.scala → ...0/zentasks_cf_by_name/project/Build.scala
File renamed without changes.
View
0 ...ter_database_jpa/project/build.properties → ...tasks_cf_by_name/project/build.properties
File renamed without changes.
View
0 ...computer_database_jpa/project/plugins.sbt → ...0/zentasks_cf_by_name/project/plugins.sbt
File renamed without changes.
View
0 ...s_cf_by_type/public/images/arrow-left.png → ...s_cf_by_name/public/images/arrow-left.png
File renamed without changes
View
0 ...cf_by_type/public/images/breadcrumb-1.png → ...cf_by_name/public/images/breadcrumb-1.png
File renamed without changes
View
0 ...cf_by_type/public/images/breadcrumb-2.png → ...cf_by_name/public/images/breadcrumb-2.png
File renamed without changes
View
0 ...s_cf_by_type/public/images/breadcrumb.png → ...s_cf_by_name/public/images/breadcrumb.png
File renamed without changes
View
0 ...by_type/public/images/icons/addRemove.png → ...by_name/public/images/icons/addRemove.png
File renamed without changes
View
0 ..._cf_by_type/public/images/icons/clock.png → ..._cf_by_name/public/images/icons/clock.png
File renamed without changes
View
0 ...cf_by_type/public/images/icons/delete.png → ...cf_by_name/public/images/icons/delete.png
File renamed without changes
View
0 ...ype/public/images/icons/drawer.folder.png → ...ame/public/images/icons/drawer.folder.png
File renamed without changes
View
0 ...cf_by_type/public/images/icons/folder.png → ...cf_by_name/public/images/icons/folder.png
File renamed without changes
View
0 ...s_cf_by_type/public/images/icons/home.png → ...s_cf_by_name/public/images/icons/home.png
File renamed without changes
View
0 ...f_by_type/public/images/icons/options.png → ...f_by_name/public/images/icons/options.png
File renamed without changes
View
0 ...s_cf_by_type/public/images/icons/user.png → ...s_cf_by_name/public/images/icons/user.png
File renamed without changes
View
0 ..._cf_by_type/public/images/icons/user2.png → ..._cf_by_name/public/images/icons/user2.png
File renamed without changes
View
0 ...asks_cf_by_type/public/images/loading.gif → ...asks_cf_by_name/public/images/loading.gif
File renamed without changes
View
0 ...asks_cf_by_type/public/images/pattern.png → ...asks_cf_by_name/public/images/pattern.png
File renamed without changes
View
0 ...y_type/public/javascripts/backbone-min.js → ...y_name/public/javascripts/backbone-min.js
File renamed without changes.
View
0 ...type/public/javascripts/underscore-min.js → ...name/public/javascripts/underscore-min.js
File renamed without changes.
View
0 play/computer_database_jpa/README → play/2.1/computer_database_jpa-2.1/README
File renamed without changes.
View
22 ...base_jpa/app/controllers/Application.java → ..._jpa-2.1/app/controllers/Application.java
@@ -5,6 +5,7 @@
import play.*;
import play.mvc.*;
import play.data.*;
+import static play.data.Form.*;
import play.db.jpa.*;
import views.html.*;
@@ -15,14 +16,14 @@
* Manage a database of computers
*/
public class Application extends Controller {
-
+
/**
* This result directly redirect to application home.
*/
public static Result GO_HOME = redirect(
routes.Application.list(0, "name", "asc", "")
);
-
+
/**
* Handle default path requests, redirect to computers list
*/
@@ -47,7 +48,7 @@ public static Result list(int page, String sortBy, String order, String filter)
)
);
}
-
+
/**
* Display the 'edit form' of a existing Computer.
*
@@ -62,9 +63,9 @@ public static Result edit(Long id) {
editForm.render(id, computerForm)
);
}
-
+
/**
- * Handle the 'edit form' submission
+ * Handle the 'edit form' submission
*
* @param id Id of the computer to edit
*/
@@ -78,7 +79,7 @@ public static Result update(Long id) {
flash("success", "Computer " + computerForm.get().name + " has been updated");
return GO_HOME;
}
-
+
/**
* Display the 'new computer form'.
*/
@@ -89,9 +90,9 @@ public static Result create() {
createForm.render(computerForm)
);
}
-
+
/**
- * Handle the 'new computer form' submission
+ * Handle the 'new computer form' submission
*/
@Transactional
public static Result save() {
@@ -103,7 +104,7 @@ public static Result save() {
flash("success", "Computer " + computerForm.get().name + " has been created");
return GO_HOME;
}
-
+
/**
* Handle computer deletion
*/
@@ -113,6 +114,7 @@ public static Result delete(Long id) {
flash("success", "Computer has been deleted");
return GO_HOME;
}
-
+
}
+
View
8 ...uter_database_jpa/app/models/Company.java → ..._database_jpa-2.1/app/models/Company.java
@@ -3,7 +3,6 @@
import java.util.*;
import javax.persistence.*;
-import play.db.ebean.*;
import play.data.format.*;
import play.data.validation.*;
@@ -12,15 +11,15 @@
/**
* Company entity managed by JPA
*/
-@Entity
+@Entity
public class Company {
@Id
public Long id;
-
+
@Constraints.Required
public String name;
-
+
public static Company findById(Long id) {
return JPA.em().find(Company.class, id);
}
@@ -35,3 +34,4 @@ public static Company findById(Long id) {
}
}
+
View
44 ...ter_database_jpa/app/models/Computer.java → ...database_jpa-2.1/app/models/Computer.java
@@ -3,7 +3,6 @@
import java.util.*;
import javax.persistence.*;
-import play.db.ebean.*;
import play.data.format.*;
import play.data.validation.*;
@@ -12,33 +11,33 @@
/**
* Computer entity managed by JPA
*/
-@Entity
+@Entity
@SequenceGenerator(name = "computer_seq", sequenceName = "computer_seq")
public class Computer {
@Id
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "computer_seq")
public Long id;
-
+
@Constraints.Required
public String name;
-
+
@Formats.DateTime(pattern="yyyy-MM-dd")
public Date introduced;
-
+
@Formats.DateTime(pattern="yyyy-MM-dd")
public Date discontinued;
-
+
@ManyToOne(cascade = CascadeType.MERGE)
public Company company;
-
+
/**
* Find a company by id.
*/
public static Computer findById(Long id) {
return JPA.em().find(Computer.class, id);
}
-
+
/**
* Update this computer.
*/
@@ -51,7 +50,7 @@ public void update(Long id) {
this.id = id;
JPA.em().merge(this);
}
-
+
/**
* Insert this new computer.
*/
@@ -64,14 +63,14 @@ public void save() {
this.id = id;
JPA.em().persist(this);
}
-
+
/**
* Delete this computer.
*/
public void delete() {
JPA.em().remove(this);
}
-
+
/**
* Return a page of computer
*
@@ -95,50 +94,51 @@ public static Page page(int page, int pageSize, String sortBy, String order, Str
.getResultList();
return new Page(data, total, page, pageSize);
}
-
+
/**
* Used to represent a computers page.
*/
public static class Page {
-
+
private final int pageSize;
private final long totalRowCount;
private final int pageIndex;
private final List<Computer> list;
-
+
public Page(List<Computer> data, long total, int page, int pageSize) {
this.list = data;
this.totalRowCount = total;
this.pageIndex = page;
this.pageSize = pageSize;
}
-
+
public long getTotalRowCount() {
return totalRowCount;
}
-
+
public int getPageIndex() {
return pageIndex;
}
-
+
public List<Computer> getList() {
return list;
}
-
+
public boolean hasPrev() {
return pageIndex > 1;
}
-
+
public boolean hasNext() {
return (totalRowCount/pageSize) >= pageIndex;
}
-
+
public String getDisplayXtoYofZ() {
int start = ((pageIndex - 1) * pageSize + 1);
int end = start + Math.min(pageSize, list.size()) - 1;
return start + " to " + end + " of " + totalRowCount;
}
-
+
}
-
+
}
+
View
28 ..._disabled/app/views/createForm.scala.html → ...e_jpa-2.1/app/views/createForm.scala.html
@@ -2,35 +2,35 @@
@import helper._
-@implicitFieldConstructor = @{ FieldConstructor(twitterBootstrapInput.render) }
+@implicitFieldConstructor = @{ FieldConstructor(twitterBootstrapInput.render) }
@main {
-
+
<h1>Add a computer</h1>
-
+
@form(routes.Application.save()) {
-
+
<fieldset>
-
+
@inputText(computerForm("name"), '_label -> "Computer name")
@inputText(computerForm("introduced"), '_label -> "Introduced date")
@inputText(computerForm("discontinued"), '_label -> "Discontinued date")
@select(
- computerForm("company.id"),
- options(Company.options),
+ computerForm("company.id"),
+ options(Company.options),
'_label -> "Company", '_default -> "-- Choose a company --",
'_showConstraints -> false
)
-
+
</fieldset>
-
+
<div class="actions">
- <input type="submit" value="Create this computer" class="btn primary"> or
- <a href="@routes.Application.list()" class="btn">Cancel</a>
+ <input type="submit" value="Create this computer" class="btn primary"> or
+ <a href="@routes.Application.list()" class="btn">Cancel</a>
</div>
-
+
}
-
-}
+
+}
View
30 ...ig_disabled/app/views/editForm.scala.html → ...ase_jpa-2.1/app/views/editForm.scala.html
@@ -2,38 +2,38 @@
@import helper._
-@implicitFieldConstructor = @{ FieldConstructor(twitterBootstrapInput.render) }
+@implicitFieldConstructor = @{ FieldConstructor(twitterBootstrapInput.render) }
@main {
-
+
<h1>Edit computer</h1>
-
+
@form(routes.Application.update(id)) {
-
+
<fieldset>
-
+
@inputText(computerForm("name"), '_label -> "Computer name")
@inputText(computerForm("introduced"), '_label -> "Introduced date")
@inputText(computerForm("discontinued"), '_label -> "Discontinued date")
-
+
@select(
- computerForm("company.id"),
- options(Company.options),
+ computerForm("company.id"),
+ options(Company.options),
'_label -> "Company", '_default -> "-- Choose a company --",
'_showConstraints -> false
)
-
+
</fieldset>
-
+
<div class="actions">
- <input type="submit" value="Save this computer" class="btn primary"> or
- <a href="@routes.Application.list()" class="btn">Cancel</a>
+ <input type="submit" value="Save this computer" class="btn primary"> or
+ <a href="@routes.Application.list()" class="btn">Cancel</a>
</div>
-
+
}
-
+
@form(routes.Application.delete(id), 'class -> "topRight") {
<input type="submit" value="Delete this computer" class="btn danger">
}
-
+
}
View
32 ...er_database_jpa/app/views/list.scala.html → ...atabase_jpa-2.1/app/views/list.scala.html
@@ -4,10 +4,10 @@
* Helper generating navigation links *
****************************************@
@link(newPage:Int, newSortBy:String) = @{
-
+
var sortBy = currentSortBy
var order = currentOrder
-
+
if(newSortBy != null) {
sortBy = newSortBy
if(currentSortBy == newSortBy) {
@@ -20,10 +20,10 @@
order = "asc"
}
}
-
+
// Generate the link
routes.Application.list(newPage, sortBy, order, currentFilter)
-
+
}
@**********************************
@@ -36,34 +36,34 @@
}
@main {
-
+
<h1 id="homeTitle">@Messages("computers.list.title", currentPage.getTotalRowCount)</h1>
@if(flash.containsKey("success")) {
<div class="alert-message warning">
<strong>Done!</strong> @flash.get("success")
</div>
- }
+ }
<div id="actions">
-
+
<form action="@link(0, "name")" method="GET">
<input type="search" id="searchbox" name="f" value="@currentFilter" placeholder="Filter by computer name...">
<input type="submit" id="searchsubmit" value="Filter by name" class="btn primary">
</form>
-
+
<a class="btn success" id="add" href="@routes.Application.create()">Add a new computer</a>
-
+
</div>
-
+
@if(currentPage.getTotalRowCount == 0) {
-
+
<div class="well">
<em>Nothing to display</em>
</div>
-
+
} else {
-
+
<table class="computers zebra-striped">
<thead>
<tr>
@@ -130,7 +130,9 @@ <h1 id="homeTitle">@Messages("computers.list.title", currentPage.getTotalRowCoun
}
</ul>
</div>
-
+
}
-
+
}
+
+
View
10 ...config_disabled/app/views/main.scala.html → ...atabase_jpa-2.1/app/views/main.scala.html
@@ -4,22 +4,22 @@
<html>
<head>
<title>Computers database</title>
- <link rel="stylesheet" type="text/css" media="screen" href="@routes.Assets.at("stylesheets/bootstrap.min.css")">
- <link rel="stylesheet" type="text/css" media="screen" href="@routes.Assets.at("stylesheets/main.css")">
+ <link rel="stylesheet" type="text/css" media="screen" href="@routes.Assets.at("stylesheets/bootstrap.min.css")">
+ <link rel="stylesheet" type="text/css" media="screen" href="@routes.Assets.at("stylesheets/main.css")">
</head>
<body>
-
+
<header class="topbar">
<h1 class="fill">
<a href="@routes.Application.index()">
Play 2.0 sample application &mdash; Computer database
</a>
</h1>
</header>
-
+
<section id="main">
@content
</section>
-
+
</body>
</html>
View
2 ...pp/views/twitterBootstrapInput.scala.html → ...pp/views/twitterBootstrapInput.scala.html
@@ -7,6 +7,6 @@
<label for="@elements.id">@elements.label</label>
<div class="input">
@elements.input
- <span class="help-inline">@elements.infos.mkString(", ")</span>
+ <span class="help-inline">@elements.infos.mkString(", ")</span>
</div>
</div>
View
6 ...atabase_jpa/conf/META-INF/persistence.xml → ...ase_jpa-2.1/conf/META-INF/persistence.xml
@@ -2,13 +2,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
version="2.0">
-
+
<persistence-unit name="defaultPersistenceUnit" transaction-type="RESOURCE_LOCAL">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
<non-jta-data-source>DefaultDS</non-jta-data-source>
<properties>
<property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
</properties>
</persistence-unit>
-
-</persistence>
+
+</persistence>
View
14 ...mputer_database_jpa/conf/application.conf → ...er_database_jpa-2.1/conf/application.conf
@@ -1,11 +1,21 @@
include "db.conf"
+
# Configuration
+
# Secret key
# ~~~~~
# The secret key is used to secure cryptographics functions.
# If you deploy your application to several instances be sure to use the same key!
application.secret="E27D^[_<Lpt0vjad]de;3/i;tx3gpRmG4Byof/3nahO/dIo9gbsMWut1w3xg[>9W"
+# Database configuration
+# ~~~~~
+# You can declare as many datasources as you want.
+# By convention, the default datasource is named `default`
+db.default.driver=org.h2.Driver
+db.default.url="jdbc:h2:mem:play"
+db.default.jndiName=DefaultDS
+
# JPA configuration
# ~~~~~
# You can declare as many Ebean servers as you want.
@@ -28,3 +38,7 @@ logger.play=INFO
# Logger provided to your application:
logger.application=DEBUG
+
+
+
+
View
0 play/computer_database_jpa/conf/db.conf → ....1/computer_database_jpa-2.1/conf/db.conf
File renamed without changes.
View
1 ...ig_disabled/conf/evolutions/default/1.sql → ...ase_jpa-2.1/conf/evolutions/default/1.sql
@@ -38,3 +38,4 @@ SET REFERENTIAL_INTEGRITY TRUE;
drop sequence if exists company_seq;
drop sequence if exists computer_seq;
+
View
4 ...ig_disabled/conf/evolutions/default/2.sql → ...ase_jpa-2.1/conf/evolutions/default/2.sql
@@ -20,7 +20,7 @@ insert into company (id,name) values ( 15,'Canon');
insert into company (id,name) values ( 16,'Nokia');
insert into company (id,name) values ( 17,'Sony');
insert into company (id,name) values ( 18,'OQO');
-insert into company (id,name) values ( 19,'NeXT');
+insert into company (id,name) values ( 19,'NeXT');
insert into company (id,name) values ( 20,'Atari');
insert into company (id,name) values ( 22,'Acorn computer');
insert into company (id,name) values ( 23,'Timex Sinclair');
@@ -32,7 +32,7 @@ insert into company (id,name) values ( 28,'Zemmix');
insert into company (id,name) values ( 29,'ACVS');
insert into company (id,name) values ( 30,'Sanyo');
insert into company (id,name) values ( 31,'Cray');
-insert into company (id,name) values ( 32,'Evans & Sutherland');
+insert into company (id,name) values ( 32,'Evans & Sutherland');
insert into company (id,name) values ( 33,'E.S.R. Inc.');
insert into company (id,name) values ( 34,'OMRON');
insert into company (id,name) values ( 35,'BBN Technologies');
View
2 ...atabase_autoconfig_disabled/conf/messages → ...1/computer_database_jpa-2.1/conf/messages
@@ -1,3 +1,5 @@
# Messages
computers.list.title={0,choice,0#No computers|1#One computer|1<{0,number,integer} computers} found
+
+
View
1 ..._database_autoconfig_disabled/conf/routes → ...2.1/computer_database_jpa-2.1/conf/routes
@@ -21,3 +21,4 @@ POST /computers/:id/delete controllers.Application.delete(id:Long)
# Map static resources from the /public folder to the /assets URL path
GET /assets/*file controllers.Assets.at(path="/public", file)
+
View
5 play/zentasks_cf_by_type/pom.xml → play/2.1/computer_database_jpa-2.1/pom.xml
@@ -3,16 +3,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.cloudfoundry.samples</groupId>
-<artifactId>zentasks-cf-by-type</artifactId>
+<artifactId>computer-database-jpa-2.1</artifactId>
<packaging>play2</packaging>
-<name>zentasks-cf-by-type</name>
+<name>computer-database-jpa-2.1</name>
<version>0.1.0.BUILD-SNAPSHOT</version>
<build>
<plugins>
<plugin>
<groupId>de.akquinet.innovation.play2</groupId>
<artifactId>play2-maven-plugin</artifactId>
- <version>1.0.1</version>
<extensions>true</extensions>
</plugin>
</plugins>
View
9 ...computer_database_jpa/project/Build.scala → ...uter_database_jpa-2.1/project/Build.scala
@@ -1,18 +1,23 @@
import sbt._
import Keys._
-import PlayProject._
+import play.Project._
object ApplicationBuild extends Build {
val appName = "computer-database-jpa"
val appVersion = "1.0"
+ val scalaVersion = "2.10"
val appDependencies = Seq(
+ javaCore,
+ javaJdbc,
+ javaJpa,
"org.hibernate" % "hibernate-entitymanager" % "3.6.9.Final"
)
- val main = PlayProject(appName, appVersion, appDependencies, mainLang = JAVA).settings(
+ val main = play.Project(appName, appVersion, appDependencies).settings(
ebeanEnabled := false
)
}
+
View
1 play/2.1/computer_database_jpa-2.1/project/build.properties
@@ -0,0 +1 @@
+sbt.version=0.12.2
View
2 ...r_database_cf_by_name/project/plugins.sbt → ...uter_database_jpa-2.1/project/plugins.sbt
@@ -5,4 +5,4 @@ logLevel := Level.Warn
resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
// Use the Play sbt plugin for Play projects
-addSbtPlugin("play" % "sbt-plugin" % Option(System.getProperty("play.version")).getOrElse("2.0"))
+addSbtPlugin("play" % "sbt-plugin" % Option(System.getProperty("play.version")).getOrElse("2.0"))
View
2 ...bled/public/stylesheets/bootstrap.min.css → ...-2.1/public/stylesheets/bootstrap.min.css
@@ -327,4 +327,4 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
.media-grid:after{clear:both;}
.media-grid li{display:inline;}
.media-grid a{float:left;padding:4px;margin:0 0 20px 20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);}.media-grid a img{display:block;}
-.media-grid a:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);}
+.media-grid a:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);}
View
4 ...nfig_disabled/public/stylesheets/main.css → ...abase_jpa-2.1/public/stylesheets/main.css
@@ -14,7 +14,7 @@ section#main {
padding: 5em 2em;
border-bottom: 1px solid #ccc;
min-height: 600px;
-}
+}
section#main .topRight {
position: absolute;
@@ -61,3 +61,5 @@ table.computers .header a {
#pagination ul .current a {
color: #666;
}
+
+
View
28 ...oconfig_disabled/test/FunctionalTest.java → ...database_jpa-2.1/test/FunctionalTest.java
</
@@ -22,7 +22,7 @@ public void run() {
}
});
}
-
+
@Test
public void listComputersOnTheFirstPage() {
running(fakeApplication(), new Runnable() {
@@ -34,7 +34,7 @@ public void run() {
}
});
}
-