Permalink
Browse files

cleanup

  • Loading branch information...
burtbeckwith committed Feb 16, 2013
1 parent 9ef74ee commit 2fab0ebed6e3b672352ba28576e50b29632a04b0
Showing with 1,149 additions and 1,196 deletions.
  1. +5 −32 GoblinGrailsPlugin.groovy
  2. +1 −1 INSTALL.md
  3. +6 −6 README.md
  4. +26 −26 grails-app/conf/BootStrap.groovy
  5. +26 −37 grails-app/conf/BuildConfig.groovy
  6. +1 −1 grails-app/conf/de/dewarim/goblin/filters/UserFilters.groovy
  7. +2 −3 grails-app/conf/spring/resources.groovy
  8. +30 −20 grails-app/controllers/de/dewarim/goblin/AcademyController.groovy
  9. +2 −2 grails-app/controllers/de/dewarim/goblin/BaseController.groovy
  10. +1 −1 grails-app/controllers/de/dewarim/goblin/CaptchaController.groovy
  11. +24 −24 grails-app/controllers/de/dewarim/goblin/FightController.groovy
  12. +23 −26 grails-app/controllers/de/dewarim/goblin/GuildController.groovy
  13. +12 −14 grails-app/controllers/de/dewarim/goblin/HelpController.groovy
  14. +44 −40 grails-app/controllers/de/dewarim/goblin/ItemController.groovy
  15. +28 −28 grails-app/controllers/de/dewarim/goblin/MeleeController.groovy
  16. +24 −23 grails-app/controllers/de/dewarim/goblin/PlayerCharacterController.groovy
  17. +3 −5 grails-app/controllers/de/dewarim/goblin/PostOfficeController.groovy
  18. +32 −27 grails-app/controllers/de/dewarim/goblin/ProductionController.groovy
  19. +45 −33 grails-app/controllers/de/dewarim/goblin/QuestController.groovy
  20. +9 −9 grails-app/controllers/de/dewarim/goblin/RoleController.groovy
  21. +16 −25 grails-app/controllers/de/dewarim/goblin/ShopController.groovy
  22. +9 −8 grails-app/controllers/de/dewarim/goblin/TownController.groovy
  23. +11 −12 grails-app/controllers/de/dewarim/goblin/UserController.groovy
  24. +4 −2 grails-app/controllers/de/dewarim/goblin/admin/AcademyAdminController.groovy
  25. +0 −1 grails-app/controllers/de/dewarim/goblin/admin/AdminController.groovy
  26. +4 −2 grails-app/controllers/de/dewarim/goblin/admin/ArtistAdminController.groovy
  27. +4 −2 grails-app/controllers/de/dewarim/goblin/admin/CategoryAdminController.groovy
  28. +4 −4 grails-app/controllers/de/dewarim/goblin/admin/CombatAttributeAdminController.groovy
  29. +6 −5 grails-app/controllers/de/dewarim/goblin/admin/ComponentAdminController.groovy
  30. +4 −2 grails-app/controllers/de/dewarim/goblin/admin/ConfigAdminController.groovy
  31. +4 −2 grails-app/controllers/de/dewarim/goblin/admin/DiceAdminController.groovy
  32. +4 −2 grails-app/controllers/de/dewarim/goblin/admin/EncounterAdminController.groovy
  33. +4 −4 grails-app/controllers/de/dewarim/goblin/admin/EquipmentSlotTypeAdminController.groovy
  34. +4 −2 grails-app/controllers/de/dewarim/goblin/admin/FactionAdminController.groovy
  35. +4 −2 grails-app/controllers/de/dewarim/goblin/admin/FeatureAdminController.groovy
  36. +4 −2 grails-app/controllers/de/dewarim/goblin/admin/GuildAdminController.groovy
  37. +6 −4 grails-app/controllers/de/dewarim/goblin/admin/ImageAdminController.groovy
  38. +6 −4 grails-app/controllers/de/dewarim/goblin/admin/ItemAdminController.groovy
  39. +4 −2 grails-app/controllers/de/dewarim/goblin/admin/ItemFeatureAdminController.groovy
  40. +4 −2 grails-app/controllers/de/dewarim/goblin/admin/LicenseAdminController.groovy
  41. +4 −2 grails-app/controllers/de/dewarim/goblin/admin/MobAdminController.groovy
  42. +4 −2 grails-app/controllers/de/dewarim/goblin/admin/ProductAdminController.groovy
  43. +4 −2 grails-app/controllers/de/dewarim/goblin/admin/ProductCategoryAdminController.groovy
  44. +4 −2 grails-app/controllers/de/dewarim/goblin/admin/QuestAdminController.groovy
  45. +4 −2 grails-app/controllers/de/dewarim/goblin/admin/QuestGiverAdminController.groovy
  46. +4 −2 grails-app/controllers/de/dewarim/goblin/admin/QuestStepAdminController.groovy
  47. +4 −4 grails-app/controllers/de/dewarim/goblin/admin/RepMessageAdminController.groovy
  48. +4 −2 grails-app/controllers/de/dewarim/goblin/admin/RmmAdminController.groovy
  49. +4 −2 grails-app/controllers/de/dewarim/goblin/admin/ShopAdminController.groovy
  50. +6 −4 grails-app/controllers/de/dewarim/goblin/admin/ShopOwnerAdminController.groovy
  51. +3 −2 grails-app/controllers/de/dewarim/goblin/admin/SkillRequirementAdminController.groovy
  52. +4 −2 grails-app/controllers/de/dewarim/goblin/admin/TownAdminController.groovy
  53. +29 −45 grails-app/controllers/de/dewarim/goblin/cron/CronController.groovy
  54. +13 −9 grails-app/controllers/de/dewarim/goblin/landing/PortalController.groovy
  55. +2 −4 grails-app/controllers/de/dewarim/goblin/landing/ScoreController.groovy
  56. +2 −7 grails-app/controllers/de/dewarim/goblin/social/AddressBookController.groovy
  57. +11 −9 grails-app/controllers/de/dewarim/goblin/social/ChatterBoxController.groovy
  58. +61 −49 grails-app/controllers/de/dewarim/goblin/social/GoblinOrderController.groovy
  59. +30 −23 grails-app/controllers/de/dewarim/goblin/social/MailBoxController.groovy
  60. +4 −4 grails-app/domain/de/dewarim/goblin/Artist.groovy
  61. +8 −8 grails-app/domain/de/dewarim/goblin/Category.groovy
  62. +15 −18 grails-app/domain/de/dewarim/goblin/Creature.groovy
  63. +2 −2 grails-app/domain/de/dewarim/goblin/CreatureAttribute.groovy
  64. +7 −7 grails-app/domain/de/dewarim/goblin/Dice.groovy
  65. +7 −7 grails-app/domain/de/dewarim/goblin/EquipmentSlot.groovy
  66. +4 −6 grails-app/domain/de/dewarim/goblin/EquipmentSlotType.groovy
  67. +7 −7 grails-app/domain/de/dewarim/goblin/Feature.groovy
  68. +4 −4 grails-app/domain/de/dewarim/goblin/GlobalConfigEntry.groovy
  69. +2 −2 grails-app/domain/de/dewarim/goblin/GoblinScript.groovy
  70. +2 −2 grails-app/domain/de/dewarim/goblin/Help.groovy
  71. +4 −4 grails-app/domain/de/dewarim/goblin/HighScore.groovy
  72. +4 −4 grails-app/domain/de/dewarim/goblin/Image.groovy
  73. +2 −2 grails-app/domain/de/dewarim/goblin/License.groovy
  74. +3 −3 grails-app/domain/de/dewarim/goblin/RequiredSlot.groovy
  75. +2 −2 grails-app/domain/de/dewarim/goblin/Role.groovy
  76. +3 −4 grails-app/domain/de/dewarim/goblin/UserAccount.groovy
  77. +3 −3 grails-app/domain/de/dewarim/goblin/UserProperty.groovy
  78. +1 −1 grails-app/domain/de/dewarim/goblin/UserRole.groovy
  79. +8 −11 grails-app/domain/de/dewarim/goblin/combat/Combat.groovy
  80. +2 −2 grails-app/domain/de/dewarim/goblin/combat/CombatAttributeType.groovy
  81. +2 −2 grails-app/domain/de/dewarim/goblin/combat/CombatMessage.groovy
  82. +2 −2 grails-app/domain/de/dewarim/goblin/combat/CombatMessageArg.groovy
  83. +3 −3 grails-app/domain/de/dewarim/goblin/combat/Melee.groovy
  84. +5 −5 grails-app/domain/de/dewarim/goblin/combat/MeleeAction.groovy
  85. +3 −3 grails-app/domain/de/dewarim/goblin/combat/MeleeFighter.groovy
  86. +3 −3 grails-app/domain/de/dewarim/goblin/combat/WeaponAttribute.groovy
  87. +3 −5 grails-app/domain/de/dewarim/goblin/guild/Guild.groovy
  88. +4 −4 grails-app/domain/de/dewarim/goblin/guild/GuildMember.groovy
  89. +4 −4 grails-app/domain/de/dewarim/goblin/item/Item.groovy
  90. +3 −3 grails-app/domain/de/dewarim/goblin/item/ItemAttribute.groovy
  91. +5 −5 grails-app/domain/de/dewarim/goblin/item/ItemAttributeCondition.groovy
  92. +2 −2 grails-app/domain/de/dewarim/goblin/item/ItemCategory.groovy
  93. +3 −3 grails-app/domain/de/dewarim/goblin/item/ItemType.groovy
  94. +2 −2 grails-app/domain/de/dewarim/goblin/item/ItemTypeFeature.groovy
  95. +4 −4 grails-app/domain/de/dewarim/goblin/mob/EncounterMob.groovy
  96. +3 −6 grails-app/domain/de/dewarim/goblin/mob/Mob.groovy
  97. +5 −5 grails-app/domain/de/dewarim/goblin/mob/MobImage.groovy
  98. +4 −4 grails-app/domain/de/dewarim/goblin/mob/MobTemplate.groovy
  99. +2 −3 grails-app/domain/de/dewarim/goblin/pc/GoblinOrder.groovy
  100. +2 −2 grails-app/domain/de/dewarim/goblin/pc/OrderApplication.groovy
  101. +32 −33 grails-app/domain/de/dewarim/goblin/pc/PlayerCharacter.groovy
  102. +2 −2 grails-app/domain/de/dewarim/goblin/pc/PlayerMessage.groovy
  103. +3 −3 grails-app/domain/de/dewarim/goblin/pc/crafting/Component.groovy
  104. +2 −2 grails-app/domain/de/dewarim/goblin/pc/crafting/PlayerProduct.groovy
  105. +6 −6 grails-app/domain/de/dewarim/goblin/pc/crafting/Product.groovy
  106. +2 −2 grails-app/domain/de/dewarim/goblin/pc/crafting/ProductCategory.groovy
  107. +4 −5 grails-app/domain/de/dewarim/goblin/pc/crafting/ProductionJob.groovy
  108. +2 −2 grails-app/domain/de/dewarim/goblin/pc/crafting/ProductionResource.groovy
  109. +2 −2 grails-app/domain/de/dewarim/goblin/pc/crafting/SkillRequirement.groovy
  110. +3 −3 grails-app/domain/de/dewarim/goblin/pc/skill/CombatSkill.groovy
  111. +2 −2 grails-app/domain/de/dewarim/goblin/pc/skill/CreatureSkill.groovy
  112. +1 −1 grails-app/domain/de/dewarim/goblin/pc/skill/GeneralSkill.groovy
  113. +3 −3 grails-app/domain/de/dewarim/goblin/pc/skill/LearningQueueElement.groovy
  114. +2 −3 grails-app/domain/de/dewarim/goblin/pc/skill/ProductionSkill.groovy
  115. +3 −3 grails-app/domain/de/dewarim/goblin/pc/skill/Skill.groovy
  116. +3 −7 grails-app/domain/de/dewarim/goblin/pc/skill/SkillSet.groovy
  117. +5 −5 grails-app/domain/de/dewarim/goblin/quest/Encounter.groovy
  118. +4 −4 grails-app/domain/de/dewarim/goblin/quest/Quest.groovy
  119. +2 −2 grails-app/domain/de/dewarim/goblin/quest/QuestGiver.groovy
  120. +1 −1 grails-app/domain/de/dewarim/goblin/quest/QuestRequirement.groovy
  121. +16 −17 grails-app/domain/de/dewarim/goblin/quest/QuestStep.groovy
  122. +5 −6 grails-app/domain/de/dewarim/goblin/quest/QuestTemplate.groovy
  123. +4 −4 grails-app/domain/de/dewarim/goblin/quest/StepChild.groovy
  124. +4 −4 grails-app/domain/de/dewarim/goblin/reputation/Faction.groovy
  125. +2 −2 grails-app/domain/de/dewarim/goblin/reputation/Reputation.groovy
  126. +2 −2 grails-app/domain/de/dewarim/goblin/reputation/ReputationMessage.groovy
  127. +3 −3 grails-app/domain/de/dewarim/goblin/reputation/ReputationMessageMap.groovy
  128. +6 −6 grails-app/domain/de/dewarim/goblin/shop/Shop.groovy
  129. +2 −2 grails-app/domain/de/dewarim/goblin/shop/ShopCategory.groovy
  130. +8 −10 grails-app/domain/de/dewarim/goblin/shop/ShopOwner.groovy
  131. +2 −2 grails-app/domain/de/dewarim/goblin/social/AddressBook.groovy
  132. +2 −3 grails-app/domain/de/dewarim/goblin/social/ChatMessage.groovy
  133. +2 −3 grails-app/domain/de/dewarim/goblin/social/ChatterBox.groovy
  134. +2 −4 grails-app/domain/de/dewarim/goblin/social/Mail.groovy
  135. +2 −2 grails-app/domain/de/dewarim/goblin/social/MailBox.groovy
  136. +2 −2 grails-app/domain/de/dewarim/goblin/social/MailBoxType.groovy
  137. +10 −10 grails-app/domain/de/dewarim/goblin/ticks/Tick.groovy
  138. +3 −6 grails-app/domain/de/dewarim/goblin/town/Academy.groovy
  139. +2 −2 grails-app/domain/de/dewarim/goblin/town/AcademyLevel.groovy
  140. +9 −9 grails-app/domain/de/dewarim/goblin/town/AcademySkillSet.groovy
  141. +3 −3 grails-app/domain/de/dewarim/goblin/town/GuildAcademy.groovy
  142. +5 −5 grails-app/domain/de/dewarim/goblin/town/Town.groovy
  143. +3 −3 grails-app/routes/de/dewarim/goblin/routes/GoblinRouteBuilder.groovy
  144. +7 −9 grails-app/services/de/dewarim/goblin/AcademyService.groovy
  145. +2 −2 grails-app/services/de/dewarim/goblin/CategoryService.groovy
  146. +5 −9 grails-app/services/de/dewarim/goblin/ConfigService.groovy
  147. +5 −6 grails-app/services/de/dewarim/goblin/EmailerService.groovy
  148. +8 −11 grails-app/services/de/dewarim/goblin/FeatureService.groovy
  149. +2 −4 grails-app/services/de/dewarim/goblin/FightService.groovy
  150. +2 −4 grails-app/services/de/dewarim/goblin/GlobalConfigService.groovy
  151. +1 −1 grails-app/services/de/dewarim/goblin/GuildMemberService.groovy
  152. +1 −1 grails-app/services/de/dewarim/goblin/InputValidationService.groovy
  153. +7 −7 grails-app/services/de/dewarim/goblin/MeleeService.groovy
  154. +17 −17 grails-app/services/de/dewarim/goblin/MyMailService.groovy
  155. +0 −2 grails-app/services/de/dewarim/goblin/PlayerMessageService.groovy
  156. +14 −23 grails-app/services/de/dewarim/goblin/ProductionService.groovy
  157. +5 −5 grails-app/services/de/dewarim/goblin/QuestService.groovy
  158. +1 −1 grails-app/services/de/dewarim/goblin/RmmService.groovy
  159. +9 −12 grails-app/services/de/dewarim/goblin/SkillService.groovy
  160. +7 −8 grails-app/services/de/dewarim/goblin/TreasureService.groovy
  161. +7 −7 grails-app/services/de/dewarim/goblin/item/ItemService.groovy
  162. +1 −1 grails-app/services/de/dewarim/goblin/ticks/TickService.groovy
  163. +1 −1 src/groovy/de/dewarim/goblin/camel/LearningDelayer.groovy
  164. +1 −1 src/groovy/de/dewarim/goblin/exception/MonsterDeadException.groovy
  165. +1 −1 src/groovy/de/dewarim/goblin/exception/PlayerDeadException.groovy
  166. +1 −1 src/groovy/de/dewarim/goblin/exception/SimultaneousDeathException.groovy
  167. +7 −8 src/groovy/de/dewarim/goblin/item/script/HealSelf_1W6.groovy
  168. +4 −4 src/groovy/de/dewarim/goblin/quest/script/DeliverItem.groovy
  169. +5 −7 src/groovy/de/dewarim/goblin/quest/script/GetReward.groovy
  170. +5 −7 src/groovy/de/dewarim/goblin/quest/script/PickupItem.groovy
  171. +3 −4 src/groovy/de/dewarim/goblin/ticks/ITickListener.groovy
  172. +3 −4 src/groovy/de/dewarim/goblin/ticks/TickCommand.groovy
  173. +2 −3 src/groovy/de/dewarim/goblin/ticks/TickCommandType.groovy
  174. +2 −2 src/groovy/de/dewarim/goblin/ticks/TickMaster.groovy
  175. +1 −2 src/groovy/de/dewarim/goblin/ticks/TickResult.groovy
  176. +1 −1 src/groovy/de/dewarim/goblin/ticks/TickRunner.groovy
  177. +1 −1 src/groovy/de/dewarim/goblin/ticks/TickTestBean.groovy
  178. +2 −2 src/java/de/dewarim/goblin/ICombatScript.java
  179. +0 −1 src/java/de/dewarim/goblin/IEncounterScript.java
  180. +1 −1 src/java/de/dewarim/goblin/IProductionScript.java
  181. +8 −9 test/integration/de/dewarim/goblin/ticks/TickServiceSpec.groovy
  182. +1 −1 test/webtest/de/dewarim/goblin/production/ProductionWebTests.groovy
  183. +10 −10 web-app/status.txt
View
@@ -2,14 +2,15 @@ class GoblinGrailsPlugin {
def version = "0.3.2"
def grailsVersion = "2.0 > *"
- def dependsOn = [:]
def pluginExcludes = [
- "grails-app/views/error.gsp"
+ "docs/**",
+ "grails-app/views/error.gsp",
+ "src/docs/**",
+ "src/templates/**",
+ "web-app/images/**"
]
def title = "Little Goblin Plugin"
- def author = "Ingo Wiarda"
- def authorEmail = "ingo_wiarda@dewarim.de"
def description = "Little Goblin is a browser game framework written in Grails."
def documentation = "http://littlegoblin.de"
@@ -20,32 +21,4 @@ class GoblinGrailsPlugin {
def issueManagement = [system: "Github", url: "https://github.com/dewarim/LittleGoblin/issues"]
def scm = [url: "https://github.com/dewarim/LittleGoblin"]
-
- def doWithWebDescriptor = { xml ->
-
- }
-
- def doWithSpring = {
-
- }
-
- def doWithDynamicMethods = { ctx ->
-
- }
-
- def doWithApplicationContext = { applicationContext ->
-
- }
-
- def onChange = { event ->
-
- }
-
- def onConfigChange = { event ->
-
- }
-
- def onShutdown = { event ->
-
- }
}
View
@@ -21,7 +21,7 @@ On Ubuntu, use: sudo apt-get install tomcat7
* Create a database "goblin" with user "goblin" and password "goblin" (for testing)
-* Download a database driver for MySQL if needed
+* Download a database driver for MySQL if needed
[http://dev.mysql.com/downloads/connector/j/5.1.html]
Put the mysql driver .jar-file into Tomcat's "lib" directory
(Postgres JDBC driver is included in the war file)
View
@@ -8,15 +8,15 @@ game environment as seen on the test server on http://schedim.de
## Getting started
For instructions to install the binary version, see: [INSTALL.md](INSTALL.md)
-
+
* Checkout the source code from Github:
-
+
git clone git@github.com:dewarim/LittleGoblin.git
-
+
* Edit goblin-config.example.groovy according to your database settings and serverURL
-
-* Start the application with
-
+
+* Start the application with
+
grails run-app
* Visit http://localhost:8080/goblin after the startup phase has completed.
@@ -72,23 +72,23 @@ class BootStrap {
def academyService
def grailsApplication
def tickService
-
+
// def camelContext
// def brokerService
def init = { servletContext ->
// currently disabled
// brokerService.start()
-// camelContext.addComponent("activemq", ActiveMQComponent.activeMQComponent("vm://localhost?broker.persistent=false"));
+// camelContext.addComponent("activemq", ActiveMQComponent.activeMQComponent("vm://localhost?broker.persistent=false"))
// ((CamelContext) camelContext).addRoutes (new GoblinRouteBuilder())
// camelContext.start()
-// ProducerTemplate template = camelContext.createProducerTemplate();
+// ProducerTemplate template = camelContext.createProducerTemplate()
// template.sendBody('activemq:learning', 'boo')
if (!UserAccount.list().isEmpty()) {
return
}
-
+
log.debug("LITTLE_GOBLIN_HOME: ${System.env.LITTLE_GOBLIN_HOME}")
log.debug("Facebook.config: ${grailsApplication.config.facebook}")
@@ -97,10 +97,10 @@ class BootStrap {
Role adminRole = new Role(description: 'Administrator', name: 'ROLE_ADMIN')
adminRole.save(flush: true, failOnError: true)
Role userRole = new Role(description: "User", name: 'ROLE_USER')
- userRole.save(flush: true, failOnError: true);
+ userRole.save(flush: true, failOnError: true)
log.debug("create admin user")
- UserAccount admin = new UserAccount(username: 'admin', userRealName: 'Admin', enabled: true);
+ UserAccount admin = new UserAccount(username: 'admin', userRealName: 'Admin', enabled: true)
admin.passwd = 'admin' // for local testing
admin.save(flush: true, failOnError: true)
UserRole adminAdminRole = new UserRole(user: admin, role: adminRole)
@@ -133,7 +133,7 @@ class BootStrap {
if (MobTemplate.list().size() == 0) {
initMobTemplates()
}
-
+
initTicks()
initCategories()
initItems(gob)
@@ -158,14 +158,14 @@ class BootStrap {
def tickListeners = ['skillService', 'productionService', 'meleeService']
if (Environment.current == Environment.TEST){
tickListeners.add('listenerTestBean')
- }
+ }
tickListeners.each{name ->
def tick = new Tick(name: "tick.service.$name", beanName:name)
tick.save()
}
tickService.initialize()
}
-
+
void initScripts(){
log.debug("create scripts")
def scripts = ['script.pickupItem': PickupItem.class, 'script.deliverItem': DeliverItem.class,
@@ -377,26 +377,26 @@ class BootStrap {
EquipmentSlotType body = EquipmentSlotType.findByName('slot.body')
ItemType cloth = new ItemType(name: 'armor.cloth', baseValue: 4)
cloth.save()
- RequiredSlot rs = new RequiredSlot(body, cloth);
+ RequiredSlot rs = new RequiredSlot(body, cloth)
rs.save()
EquipmentSlotType head = EquipmentSlotType.findByName('slot.head')
ItemType cap = new ItemType(name: 'armor.leather_cap', baseValue: 4)
cap.save()
- rs = new RequiredSlot(head, cap);
+ rs = new RequiredSlot(head, cap)
rs.save()
EquipmentSlotType hand = EquipmentSlotType.findByName('slot.hand')
ItemType shield = new ItemType(name: 'item.armor.shield', availability: 500, baseValue: 20)
shield.save()
rs = new RequiredSlot(hand, shield)
rs.save()
-
+
def armory = [cloth, cap, shield]
armory.each {armor ->
ItemCategory armorCat = new ItemCategory(armor, 'armor')
- armorCat.save()
+ armorCat.save()
}
}
@@ -420,19 +420,19 @@ class BootStrap {
redShroom.save()
ItemCategory mushroomCat = new ItemCategory(redShroom, 'mushroom')
mushroomCat.save()
-
+
ItemType blackShroom = new ItemType(name: 'item.mushroom.black', availability: 0, baseValue: 2)
blackShroom.save()
ItemCategory bsCat = new ItemCategory(blackShroom, 'mushroom')
bsCat.save()
// init items for products:
def ore = new ItemType(name: 'item.iron.ore', availability: 900, baseValue: 10, stackable: true)
- ore.save();
+ ore.save()
ItemCategory oreCat = new ItemCategory(ore, 'metal')
oreCat.save()
def iron = new ItemType(name: 'item.iron.bar', availability: 900, baseValue: 40, stackable: true)
- iron.save();
+ iron.save()
ItemCategory ironCat = new ItemCategory(iron, 'metal')
ironCat.save()
@@ -458,7 +458,7 @@ class BootStrap {
WeaponAttribute fire = new WeaponAttribute(damageModifier: 2.0, combatAttributeType: catFire)
fireWhip.addToCombatAttributes(fire)
fireWhip.save()
- RequiredSlot rs = new RequiredSlot(hand, fireWhip);
+ RequiredSlot rs = new RequiredSlot(hand, fireWhip)
rs.save()
CombatAttributeType catNormal = CombatAttributeType.findByName('attribute.normal')
@@ -469,7 +469,7 @@ class BootStrap {
baseValue: 5, combatDice: die)
shortSword.addToCombatAttributes(normalDamage)
shortSword.save()
- RequiredSlot rsSword = new RequiredSlot(hand, shortSword);
+ RequiredSlot rsSword = new RequiredSlot(hand, shortSword)
rsSword.save()
die = new Dice(sides: 6, amount: 2)
@@ -478,9 +478,9 @@ class BootStrap {
baseValue: 30, combatDice: die)
longSword.addToCombatAttributes(normalDamage)
longSword.save()
- RequiredSlot rsLongSword = new RequiredSlot(hand, longSword);
+ RequiredSlot rsLongSword = new RequiredSlot(hand, longSword)
rsLongSword.save()
- RequiredSlot rsLongSword2 = new RequiredSlot(hand, longSword);
+ RequiredSlot rsLongSword2 = new RequiredSlot(hand, longSword)
rsLongSword2.save()
die = new Dice(sides: 5, amount: 2, bonus: 2)
@@ -489,9 +489,9 @@ class BootStrap {
baseValue: 23, combatDice: die)
longStaff.addToCombatAttributes(normalDamage)
longStaff.save()
- RequiredSlot rsLongStaff = new RequiredSlot(hand, longStaff);
+ RequiredSlot rsLongStaff = new RequiredSlot(hand, longStaff)
rsLongStaff.save()
- RequiredSlot rsLongStaff2 = new RequiredSlot(hand, longStaff);
+ RequiredSlot rsLongStaff2 = new RequiredSlot(hand, longStaff)
rsLongSword2.save()
die = new Dice(sides: 1, amount: 1, bonus: 6)
@@ -502,7 +502,7 @@ class BootStrap {
def death = new WeaponAttribute(damageModifier: 2.0, combatAttributeType: catDeath)
toothpick.addToCombatAttributes death
toothpick.save()
- RequiredSlot rsPick = new RequiredSlot(hand, toothpick);
+ RequiredSlot rsPick = new RequiredSlot(hand, toothpick)
rsPick.save()
die = new Dice(sides: 4, amount: 1)
@@ -513,7 +513,7 @@ class BootStrap {
torch.addToCombatAttributes(torchFire)
torch.save()
RequiredSlot rsTorch = new RequiredSlot(hand, torch)
- rsTorch.save()
+ rsTorch.save()
def weapons = [fireWhip, shortSword, longSword, longStaff, toothpick, torch]
weapons.each {weapon ->
@@ -1070,7 +1070,7 @@ class BootStrap {
]
settings.each {k, v ->
- GlobalConfigEntry entry = new GlobalConfigEntry(name: k, entryValue: v);
+ GlobalConfigEntry entry = new GlobalConfigEntry(name: k, entryValue: v)
entry.save()
}
}
@@ -1089,4 +1089,4 @@ class BootStrap {
Help academyHelp = new Help(messageId: 'help.skillSets')
academyHelp.save()
}
-}
+}
@@ -1,65 +1,54 @@
grails.servlet.version = "3.0"
-grails.project.class.dir = "target/classes"
-grails.project.test.class.dir = "target/test-classes"
-grails.project.test.reports.dir = "target/test-reports"
-//grails.project.war.file = "target/${appName}-${appVersion}.war"
+grails.project.work.dir = "target"
grails.project.target.level = 1.7
grails.project.source.level = 1.7
grails.project.war.file = "target/${appName}.war"
grails.project.dependency.resolution = {
- // inherit Grails' default dependencies
+
inherits( "global" ) {
- // uncomment to disable ehcache
- // excludes 'ehcache'
- excludes "xercesImpl", "xmlParserAPIs", "xml-apis", 'groovy';
+ excludes "xercesImpl", "xmlParserAPIs", "xml-apis", 'groovy'
}
- log "warn" // log level of Ivy resolver, either 'error', 'warn', 'info', 'debug' or 'verbose'
+ log "warn"
+
repositories {
- mavenLocal()
- grailsRepo "http://grails.org/plugins"
grailsCentral()
- grailsPlugins()
- grailsHome()
-
- // snapshots-repos needed or webtest won't run:
-// mavenRepo 'http://webtest.canoo.com/webtest/
-// mavenRepo 'http://htmlunit.sourceforge.net/m2-repo-snapshots'
-
- // uncomment the below to enable remote dependency resolution
- // from public Maven repositories
-// mavenLocal()
+ mavenLocal()
mavenCentral()
-// mavenRepo "http://snapshots.repository.codehaus.org"
-// mavenRepo "http://repository.codehaus.org"
-// mavenRepo "http://download.java.net/maven/2/"
- //mavenRepo "http://repository.jboss.com/maven2/"
}
- dependencies {
- // specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes eg.
- // runtime 'mysql:mysql-connector-java:5.1.5'
- runtime 'postgresql:postgresql:9.1-901.jdbc4'
+ dependencies {
+ runtime 'postgresql:postgresql:9.1-901.jdbc4', {
+ export = false
+ }
compile 'javax.mail:mail:1.4.5'
compile 'javax.activation:activation:1.1.1'
compile("org.codehaus.groovy.modules.http-builder:http-builder:0.5.2"){
excludes "groovy"
}
compile 'org.codehaus.gpars:gpars:1.0.0'
- test "org.spockframework:spock-grails-support:0.7-groovy-2.0"
+ test "org.spockframework:spock-grails-support:0.7-groovy-2.0", {
+ export = false
+ }
}
-
- plugins{
+
+ plugins{
// compile ":mail:1.0"
- runtime ":hibernate:$grailsVersion"
- build ":tomcat:$grailsVersion"
- compile ":release:2.2.0"
+ runtime ":hibernate:$grailsVersion", {
+ export = false
+ }
+ build ":tomcat:$grailsVersion", {
+ export = false
+ }
+ build ':release:2.2.0', ':rest-client-builder:1.0.3', {
+ export = false
+ }
runtime ":jquery:1.8.3"
runtime ":resources:1.1.6"
- compile ':spring-security-core:1.2.7.3'
+ compile ':spring-security-core:1.2.7.3'
compile ":webxml:1.4.1"
test(":spock:0.7") {
exclude "spock-grails-support"
+ export = false
}
}
-
}
@@ -19,7 +19,7 @@ class UserFilters {
}
public static boolean isAjax(request) {
- return "XMLHttpRequest".equals(request.getHeader("X-Requested-With"));
+ return "XMLHttpRequest".equals(request.getHeader("X-Requested-With"))
}
@@ -35,7 +35,6 @@ beans = {
// }
// learningDelayer(de.dewarim.goblin.camel.LearningDelayer)
-
+
listenerTestBean(TickTestBean)
-
-}
+}
Oops, something went wrong.

0 comments on commit 2fab0eb

Please sign in to comment.