Permalink
Browse files

Merge branch 'master' of github.com:DDB-/agilefant

Conflicts:
	web/static/js/dynamics/controller/StoryController.js
	web/static/js/dynamics/controller/StoryListController.js
  • Loading branch information...
2 parents cfe5a01 + deba076 commit 5250b7c5e0dfc5dee33fb7e8d05a5a3ecf52a9d4 @DDB- DDB- committed Feb 26, 2012
Showing with 4,717 additions and 980 deletions.
  1. +9 −0 .buildpath
  2. +99 −99 .classpath
  3. +3 −0 .settings/org.ebayopensource.vjet.eclipse.core.prefs
  4. +10 −5 .settings/org.eclipse.jdt.core.prefs
  5. +11 −10 .settings/org.eclipse.wst.common.component
  6. +3 −0 .settings/org.eclipse.wst.ws.service.policy.prefs
  7. +40 −0 .settings/org.springframework.ide.eclipse.core.prefs
  8. +32 −0 agilefant.properties
  9. +1 −2 build.properties
  10. +1 −1 conf/applicationContext-security.xml
  11. +7 −2 conf/applicationContext.xml
  12. +3 −2 conf/classes/log4j.properties
  13. +2 −2 conf/classes/messages.properties
  14. +7 −1 conf/classes/struts-ajax/story.xml
  15. +3 −4 conf/database-mysql5.properties
  16. +9 −1 conf/hibernate.cfg.xml
  17. +6 −6 conf/test/fi/hut/soberit/agilefant/db/BacklogHistoryEntryDAOTest-data.sql
  18. +3 −0 doc/sql/upgrader/205-206.sql
  19. +2 −0 doc/sql/upgrader/206-250.sql
  20. +3 −0 src/fi/hut/soberit/agilefant/business/BacklogBusiness.java
  21. +14 −3 src/fi/hut/soberit/agilefant/business/HourEntryBusiness.java
  22. +3 −0 src/fi/hut/soberit/agilefant/business/LabelBusiness.java
  23. +2 −0 src/fi/hut/soberit/agilefant/business/StoryBusiness.java
  24. +10 −0 src/fi/hut/soberit/agilefant/business/impl/BacklogBusinessImpl.java
  25. +1 −1 src/fi/hut/soberit/agilefant/business/impl/BacklogHistoryEntryBusinessImpl.java
  26. +78 −9 src/fi/hut/soberit/agilefant/business/impl/HourEntryBusinessImpl.java
  27. +188 −40 src/fi/hut/soberit/agilefant/business/impl/IterationBurndownBusinessImpl.java
  28. +6 −0 src/fi/hut/soberit/agilefant/business/impl/IterationBusinessImpl.java
  29. +18 −1 src/fi/hut/soberit/agilefant/business/impl/LabelBusinessImpl.java
  30. +27 −5 src/fi/hut/soberit/agilefant/business/impl/ProjectBurnupBusinessImpl.java
  31. +21 −0 src/fi/hut/soberit/agilefant/business/impl/ProjectBusinessImpl.java
  32. +17 −1 src/fi/hut/soberit/agilefant/business/impl/SettingBusinessImpl.java
  33. +41 −7 src/fi/hut/soberit/agilefant/business/impl/StoryBusinessImpl.java
  34. +19 −8 src/fi/hut/soberit/agilefant/business/impl/StoryRankBusinessImpl.java
  35. +8 −0 src/fi/hut/soberit/agilefant/db/HourEntryDAO.java
  36. +2 −0 src/fi/hut/soberit/agilefant/db/StoryDAO.java
  37. +6 −1 src/fi/hut/soberit/agilefant/db/StoryHierarchyDAO.java
  38. +1 −1 src/fi/hut/soberit/agilefant/db/hibernate/BacklogHistoryEntryDAOHibernate.java
  39. +46 −3 src/fi/hut/soberit/agilefant/db/hibernate/HourEntryDAOHibernate.java
  40. +14 −4 src/fi/hut/soberit/agilefant/db/hibernate/ProjectDAOHibernate.java
  41. +28 −1 src/fi/hut/soberit/agilefant/db/hibernate/StoryDAOHibernate.java
  42. +25 −0 src/fi/hut/soberit/agilefant/db/hibernate/StoryHierarchyDAOHibernate.java
  43. +11 −1 src/fi/hut/soberit/agilefant/model/BacklogHistoryEntry.java
  44. +10 −0 src/fi/hut/soberit/agilefant/model/HourEntry.java
  45. +11 −0 src/fi/hut/soberit/agilefant/model/Label.java
  46. +65 −1 src/fi/hut/soberit/agilefant/model/Story.java
  47. +7 −0 src/fi/hut/soberit/agilefant/model/StoryHourEntry.java
  48. +28 −1 src/fi/hut/soberit/agilefant/model/Task.java
  49. +7 −0 src/fi/hut/soberit/agilefant/model/TaskHourEntry.java
  50. +10 −0 src/fi/hut/soberit/agilefant/model/WhatsNextEntry.java
  51. +7 −14 src/fi/hut/soberit/agilefant/transfer/DailySpentEffort.java
  52. +29 −0 src/fi/hut/soberit/agilefant/transfer/IterationMetrics.java
  53. +54 −0 src/fi/hut/soberit/agilefant/transfer/ProjectMetrics.java
  54. +7 −3 src/fi/hut/soberit/agilefant/util/ProjectBurnupData.java
  55. +97 −0 src/fi/hut/soberit/agilefant/util/Triple.java
  56. +1 −0 src/fi/hut/soberit/agilefant/web/SettingAction.java
  57. +29 −7 src/fi/hut/soberit/agilefant/web/SpentEffortAction.java
  58. +12 −0 src/fi/hut/soberit/agilefant/web/StoryAction.java
  59. +1 −1 src/fi/hut/soberit/agilefant/web/filters/ResponseHeaderFilter.java
  60. +7 −0 src/fi/hut/soberit/agilefant/web/widgets/StoryWidget.java
  61. +3 −0 test/fi/hut/soberit/agilefant/business/BacklogHistoryEntryBusinessTest.java
  62. +36 −14 test/fi/hut/soberit/agilefant/business/HourEntryBusinessTest.java
  63. +151 −50 test/fi/hut/soberit/agilefant/business/IterationBurndownBusinessTest.java
  64. +8 −1 test/fi/hut/soberit/agilefant/business/IterationBusinessTest.java
  65. +13 −12 test/fi/hut/soberit/agilefant/business/ProjectBurnupBusinessTest.java
  66. +10 −0 test/fi/hut/soberit/agilefant/business/ProjectBusinessTest.java
  67. +136 −1 test/fi/hut/soberit/agilefant/business/StoryBusinessCreateStoryTest.java
  68. +3 −3 test/fi/hut/soberit/agilefant/web/SpentEffortActionTest.java
  69. +19 −0 web/META-INF/context.xml
  70. +32 −0 web/WEB-INF/agilefant.properties
  71. +21 −0 web/WEB-INF/database.properties
  72. +5 −0 web/WEB-INF/jsp/inc/iterationMetrics.jsp
  73. +3 −3 web/WEB-INF/jsp/inc/spentEffort.jsp
  74. +47 −17 web/WEB-INF/jsp/widgets/iterationMetricsWidget.jsp
  75. +35 −5 web/WEB-INF/jsp/widgets/projectMetricsWidget.jsp
  76. +32 −0 web/WEB-INF/jsp/widgets/storyWidget.jsp
  77. +1 −1 web/WEB-INF/tags/settingStoryTreeField.tag
  78. +1 −1 web/WEB-INF/tags/storyTreeField.tag
  79. +1 −1 web/WEB-INF/tags/storyTreeIntegrity/nodeContent.tag
  80. +2 −2 web/WEB-INF/web.xml
  81. +10 −0 web/index.html
  82. +1 −1 web/static/css/IE7styles.css
  83. +1 −1 web/static/css/IE8styles.css
  84. +32 −43 web/static/css/dynamictable.css
  85. +4 −0 web/static/css/timeline/event.css
  86. +19 −0 web/static/js/date.js
  87. +27 −4 web/static/js/dynamics/controller/CreateDialog.js
  88. +2 −1 web/static/js/dynamics/controller/IterationController.js
  89. +3 −0 web/static/js/dynamics/controller/PageController.js
  90. +15 −2 web/static/js/dynamics/controller/ProductController.js
  91. +542 −443 web/static/js/dynamics/controller/ProjectController.js
  92. +36 −29 web/static/js/dynamics/controller/StoryController.js
  93. +607 −0 web/static/js/dynamics/controller/StoryController.js~
  94. +91 −7 web/static/js/dynamics/controller/StoryInfoBubble.js
  95. +31 −7 web/static/js/dynamics/controller/StoryListController.js
  96. +433 −0 web/static/js/dynamics/controller/StoryListController.js~
  97. +2 −5 web/static/js/dynamics/controller/StoryTreeController.js
  98. +2 −2 web/static/js/dynamics/controller/TaskSplitDialog.js
  99. +2 −2 web/static/js/dynamics/controller/TasksWithoutStoryController.js
  100. +3 −4 web/static/js/dynamics/model/CommonModel.js
  101. +10 −1 web/static/js/dynamics/model/ModelFactory.js
  102. +2 −3 web/static/js/dynamics/model/ProjectModel.js
  103. +52 −6 web/static/js/dynamics/model/StoryModel.js
  104. +472 −0 web/static/js/dynamics/model/StoryModel.js~
  105. +11 −2 web/static/js/dynamics/view/Cell.js
  106. +94 −3 web/static/js/dynamics/view/MultiEditWidget.js
  107. +5 −0 web/static/js/dynamics/view/Row.js
  108. +1 −0 web/static/js/dynamics/view/SpentEffortWidget.js
  109. +2 −2 web/static/js/dynamics/view/StateFilterWidget.js
  110. +2 −2 web/static/js/dynamics/view/StoryFiltersView.js
  111. +56 −16 web/static/js/dynamics/view/TableCellEditors.js
  112. +4 −0 web/static/js/dynamics/view/TableConfiguration.js
  113. +10 −8 web/static/js/dynamics/view/UserSpentEffortWidget.js
  114. +26 −2 web/static/js/dynamics/view/decorators.js
  115. +308 −0 web/static/js/dynamics/view/decorators.js~
  116. +12 −16 web/static/js/dynamics/view/subviews/Button.js
  117. +4 −7 web/static/js/simile/extensions/portfolio-eventsource.js
  118. +2 −2 web/static/js/tests/dynamics/controller/StoryController.test.js
View
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<buildpath>
+ <buildpathentry kind="src" path="src"/>
+ <buildpathentry kind="src" path="test"/>
+ <buildpathentry kind="con" path="org.eclipse.dltk.mod.launching.INTERPRETER_CONTAINER"/>
+ <buildpathentry kind="con" path="org.ebayopensource.vjet.eclipse.core.SDK_CONTAINER/DEFUALT_SDK"/>
+ <buildpathentry kind="lib" path="lib/commons-validator-1.3.1.jar"/>
+ <buildpathentry kind="lib" path="lib/struts2-core-2.1.6.jar"/>
+</buildpath>
View
@@ -1,99 +1,99 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="test"/>
- <classpathentry exported="true" kind="lib" path="conf/test"/>
- <classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
- <classpathentry kind="lib" path="lib/commons-validator-1.3.1.jar"/>
- <classpathentry kind="lib" path="lib/commons-fileupload-1.2.1.jar"/>
- <classpathentry kind="lib" path="lib/commons-io-1.3.2.jar"/>
- <classpathentry kind="lib" path="lib/freemarker-2.3.13.jar"/>
- <classpathentry kind="lib" path="lib/ognl-2.6.11.jar"/>
- <classpathentry kind="lib" path="lib/struts2-core-2.1.6.jar"/>
- <classpathentry kind="lib" path="lib/xwork-2.1.2.jar"/>
- <classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
- <classpathentry kind="lib" path="lib/struts2-spring-plugin-2.1.6.jar"/>
- <classpathentry kind="lib" path="lib/commons-lang-2.3.jar"/>
- <classpathentry kind="lib" path="lib/build/struts2-junit-plugin-2.1.6.jar"/>
- <classpathentry kind="lib" path="lib/slf4j-log4j12-1.5.8.jar"/>
- <classpathentry kind="lib" path="lib/struts2jsonresult.jar"/>
- <classpathentry kind="lib" path="lib/build/jsdoctoolkit-ant-task-1.0.jar"/>
- <classpathentry kind="lib" path="lib/hibernate-jpa-2.0-api-1.0.0.Final.jar"/>
- <classpathentry kind="lib" path="lib/cglib-2.2.jar"/>
- <classpathentry kind="lib" path="lib/poi-3.6.jar"/>
- <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-logging.jar">
- <attributes>
- <attribute name="javadoc_location" value="http://jakarta.apache.org/commons/logging/apidocs/"/>
- </attributes>
- </classpathentry>
- <classpathentry exported="true" kind="lib" path="lib/javamail.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.14.jar">
- <attributes>
- <attribute name="javadoc_location" value="http://logging.apache.org/log4j/docs/api/"/>
- </attributes>
- </classpathentry>
- <classpathentry exported="true" kind="lib" path="lib/oscore.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/hibernate3.jar">
- <attributes>
- <attribute name="javadoc_location" value="http://www.hibernate.org/hib_docs/v3/api/"/>
- </attributes>
- </classpathentry>
- <classpathentry exported="true" kind="lib" path="lib/jstl.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/standard.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/build/jsp-api.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/build/servlet-api.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.2.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/spring.jar">
- <attributes>
- <attribute name="javadoc_location" value="http://www.springframework.org/docs/api/"/>
- </attributes>
- </classpathentry>
- <classpathentry exported="true" kind="lib" path="lib/commons-pool-1.3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/asm-attrs.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-beanutils.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/postgresql-8.1-407.jdbc3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/ehcache-1.2.0_03.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-codec-1.3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jcommon-1.0.6.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/oro-2.0.8.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/build/jdepend-2.9.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/mail.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-email-1.0.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/activation.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/stringtemplate.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/serializer.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/xalan.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/xercesImpl.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/xml-apis.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/spring-security-core-2.0.3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/spring-security-core-tiger-2.0.3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/flexjson.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.7-bin.jar"/>
- <classpathentry kind="lib" path="lib/joda-time-1.6.jar" sourcepath="lib-src/joda-time-1.6-sources.jar"/>
- <classpathentry kind="lib" path="lib/joda-time-hibernate-1.1.jar"/>
- <classpathentry kind="lib" path="lib/joda-time-jsptags-1.0.2.jar"/>
- <classpathentry kind="lib" path="lib/spring-test.jar"/>
- <classpathentry kind="lib" path="lib/build/h2-1.1.114.jar"/>
- <classpathentry kind="lib" path="lib/build/easymock-2.5.jar"/>
- <classpathentry kind="lib" path="lib/build/easymockclassextension-2.4.jar"/>
- <classpathentry kind="lib" path="lib/build/YUIAnt.jar"/>
- <classpathentry kind="lib" path="lib/build/yuicompressor-2.4.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.13.jar"/>
- <classpathentry kind="lib" path="lib/aspectjrt.jar"/>
- <classpathentry kind="lib" path="lib/aspectjweaver.jar"/>
- <classpathentry kind="lib" path="lib/common-annotations.jar"/>
- <classpathentry kind="lib" path="lib/commons-collections-3.1.jar"/>
- <classpathentry kind="lib" path="lib/javassist-3.9.0.GA.jar"/>
- <classpathentry kind="lib" path="lib/jta-1.1.jar"/>
- <classpathentry kind="lib" path="lib/slf4j-api-1.5.8.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/build/junit-4.4.jar"/>
- <classpathentry kind="lib" path="lib/gzipflt.jar"/>
- <classpathentry kind="lib" path="lib/hibernate-validator.jar"/>
- <classpathentry kind="lib" path="lib/jsr311-api-1.1.1.jar"/>
- <classpathentry kind="lib" path="lib/asm-3.1.jar"/>
- <classpathentry kind="lib" path="lib/jersey-core-1.3.jar"/>
- <classpathentry kind="lib" path="lib/jersey-server-1.3.jar"/>
- <classpathentry kind="lib" path="lib/jersey-spring-1.3.jar"/>
- <classpathentry kind="output" path="eclipse-classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="test"/>
+ <classpathentry exported="true" kind="lib" path="conf/test"/>
+ <classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
+ <classpathentry kind="lib" path="lib/commons-validator-1.3.1.jar"/>
+ <classpathentry kind="lib" path="lib/commons-fileupload-1.2.1.jar"/>
+ <classpathentry kind="lib" path="lib/commons-io-1.3.2.jar"/>
+ <classpathentry kind="lib" path="lib/freemarker-2.3.13.jar"/>
+ <classpathentry kind="lib" path="lib/ognl-2.6.11.jar"/>
+ <classpathentry kind="lib" path="lib/struts2-core-2.1.6.jar"/>
+ <classpathentry kind="lib" path="lib/xwork-2.1.2.jar"/>
+ <classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/struts2-spring-plugin-2.1.6.jar"/>
+ <classpathentry kind="lib" path="lib/commons-lang-2.3.jar"/>
+ <classpathentry kind="lib" path="lib/build/struts2-junit-plugin-2.1.6.jar"/>
+ <classpathentry kind="lib" path="lib/slf4j-log4j12-1.5.8.jar"/>
+ <classpathentry kind="lib" path="lib/struts2jsonresult.jar"/>
+ <classpathentry kind="lib" path="lib/build/jsdoctoolkit-ant-task-1.0.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate-jpa-2.0-api-1.0.0.Final.jar"/>
+ <classpathentry kind="lib" path="lib/cglib-2.2.jar"/>
+ <classpathentry kind="lib" path="lib/poi-3.6.jar"/>
+ <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-logging.jar">
+ <attributes>
+ <attribute name="javadoc_location" value="http://jakarta.apache.org/commons/logging/apidocs/"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry exported="true" kind="lib" path="lib/javamail.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.14.jar">
+ <attributes>
+ <attribute name="javadoc_location" value="http://logging.apache.org/log4j/docs/api/"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry exported="true" kind="lib" path="lib/oscore.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/hibernate3.jar">
+ <attributes>
+ <attribute name="javadoc_location" value="http://www.hibernate.org/hib_docs/v3/api/"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry exported="true" kind="lib" path="lib/jstl.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/standard.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/build/jsp-api.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/build/servlet-api.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.2.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/spring.jar">
+ <attributes>
+ <attribute name="javadoc_location" value="http://www.springframework.org/docs/api/"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry exported="true" kind="lib" path="lib/commons-pool-1.3.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/asm-attrs.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-beanutils.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/postgresql-8.1-407.jdbc3.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/ehcache-1.2.0_03.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-codec-1.3.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jcommon-1.0.6.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/oro-2.0.8.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/build/jdepend-2.9.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/mail.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-email-1.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/activation.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/stringtemplate.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/serializer.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/xalan.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/xercesImpl.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/xml-apis.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/spring-security-core-2.0.3.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/spring-security-core-tiger-2.0.3.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/flexjson.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.7-bin.jar"/>
+ <classpathentry kind="lib" path="lib/joda-time-1.6.jar" sourcepath="lib-src/joda-time-1.6-sources.jar"/>
+ <classpathentry kind="lib" path="lib/joda-time-hibernate-1.1.jar"/>
+ <classpathentry kind="lib" path="lib/joda-time-jsptags-1.0.2.jar"/>
+ <classpathentry kind="lib" path="lib/spring-test.jar" sourcepath="/home/david/.m2/repository/org/springframework/spring-test/2.5.6.SEC01/spring-test-2.5.6.SEC01-sources.jar"/>
+ <classpathentry kind="lib" path="lib/build/h2-1.1.114.jar"/>
+ <classpathentry kind="lib" path="lib/build/easymock-2.5.jar"/>
+ <classpathentry kind="lib" path="lib/build/easymockclassextension-2.4.jar"/>
+ <classpathentry kind="lib" path="lib/build/YUIAnt.jar"/>
+ <classpathentry kind="lib" path="lib/build/yuicompressor-2.4.2.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.13.jar"/>
+ <classpathentry kind="lib" path="lib/aspectjrt.jar"/>
+ <classpathentry kind="lib" path="lib/aspectjweaver.jar"/>
+ <classpathentry kind="lib" path="lib/common-annotations.jar"/>
+ <classpathentry kind="lib" path="lib/commons-collections-3.1.jar"/>
+ <classpathentry kind="lib" path="lib/javassist-3.9.0.GA.jar"/>
+ <classpathentry kind="lib" path="lib/jta-1.1.jar"/>
+ <classpathentry kind="lib" path="lib/slf4j-api-1.5.8.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/build/junit-4.4.jar"/>
+ <classpathentry kind="lib" path="lib/gzipflt.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate-validator.jar"/>
+ <classpathentry kind="lib" path="lib/jsr311-api-1.1.1.jar"/>
+ <classpathentry kind="lib" path="lib/asm-3.1.jar"/>
+ <classpathentry kind="lib" path="lib/jersey-core-1.3.jar"/>
+ <classpathentry kind="lib" path="lib/jersey-server-1.3.jar"/>
+ <classpathentry kind="lib" path="lib/jersey-spring-1.3.jar"/>
+ <classpathentry kind="output" path="eclipse-classes"/>
+</classpath>
@@ -0,0 +1,3 @@
+#Wed Feb 01 17:35:33 PST 2012
+eclipse.preferences.version=1
+initialized_project_from_v4classpath=true
@@ -1,18 +1,18 @@
-#Tue Nov 13 21:16:27 EET 2007
+#Mon Jan 16 16:53:40 PST 2012
*=(?)Code placement information (within a file), used by Eclipse, for developing purposes.
**=
*/=
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -86,7 +86,12 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=8
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
- <wb-module deploy-name="agilefant">
- <wb-resource deploy-path="/" source-path="/web"/>
- <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
- <wb-resource deploy-path="/WEB-INF/classes" source-path="/test"/>
- <property name="context-root" value="agilefant"/>
- <property name="java-output-path" value="build/classes"/>
- </wb-module>
-</project-modules>
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="agilefant">
+ <wb-resource deploy-path="/" source-path="/web"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+ <wb-resource deploy-path="/WEB-INF/" source-path="/conf"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/test"/>
+ <property name="context-root" value="agilefant"/>
+ <property name="java-output-path" value="build/classes"/>
+ </wb-module>
+</project-modules>
@@ -0,0 +1,3 @@
+#Sun Jan 15 01:49:57 PST 2012
+eclipse.preferences.version=1
+org.eclipse.wst.ws.service.policy.projectEnabled=false
Oops, something went wrong.

0 comments on commit 5250b7c

Please sign in to comment.