Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
adiherzog committed Sep 19, 2014
2 parents 868cce4 + a35d000 commit 23cc0c3086f6de1ab7b9d5a5ee2b2a4493921077
Showing with 47,544 additions and 2,279 deletions.
  1. +1 −0 .gitignore
  2. +6 −0 README.md
  3. +3 −1 Servers/Tomcat v7.0 Server at localhost-config/context.xml
  4. +16 −6 build.gradle
  5. +29 −0 helper-scripts/reset-server-for-e2e-tests.sh
  6. +1 −0 scenarioo-client/Gruntfile.js
  7. BIN scenarioo-client/app/images/collapsed.png
  8. BIN scenarioo-client/app/images/expanded.png
  9. BIN scenarioo-client/app/images/share.png
  10. +18 −4 scenarioo-client/app/index.html
  11. +24 −16 scenarioo-client/app/scripts/app.js
  12. +55 −36 scenarioo-client/app/scripts/controllers/main.js
  13. +70 −0 scenarioo-client/app/scripts/controllers/mainCustomTab.js
  14. +0 −62 scenarioo-client/app/scripts/controllers/mainGenericObjectsTab.js
  15. +23 −4 scenarioo-client/app/scripts/controllers/mainUseCasesTab.js
  16. +117 −0 scenarioo-client/app/scripts/controllers/manage/branchAliases.js
  17. +99 −0 scenarioo-client/app/scripts/controllers/manage/labelConfigurations.js
  18. +11 −1 scenarioo-client/app/scripts/controllers/manage/manage.js
  19. +37 −0 scenarioo-client/app/scripts/controllers/manage/objectReferenceTree.js
  20. +26 −2 scenarioo-client/app/scripts/controllers/navigation.js
  21. +181 −0 scenarioo-client/app/scripts/controllers/referenceTree.js
  22. +58 −56 scenarioo-client/app/scripts/controllers/scenario.js
  23. +207 −114 scenarioo-client/app/scripts/controllers/step.js
  24. +24 −5 scenarioo-client/app/scripts/controllers/usecase.js
  25. +53 −92 scenarioo-client/app/scripts/directives/breadcrumbs.js
  26. +6 −1 scenarioo-client/app/scripts/directives/collapsablePanel.js
  27. +50 −0 scenarioo-client/app/scripts/directives/debounce.js
  28. +249 −0 scenarioo-client/app/scripts/directives/filterableTableTree.js
  29. +2 −2 scenarioo-client/app/scripts/directives/{showHideDetailsButton.js → metaDataButton.js}
  30. +9 −7 scenarioo-client/app/scripts/directives/{showHideDetails.js → metaDataPanel.js}
  31. +1 −1 scenarioo-client/app/scripts/directives/metaDataTree.js
  32. +0 −1 scenarioo-client/app/scripts/directives/navigatorTable.js
  33. +19 −4 scenarioo-client/app/scripts/directives/tree.js
  34. +0 −2 scenarioo-client/app/scripts/filters/treeDataCreator.js
  35. +2 −0 scenarioo-client/app/scripts/services/applicationInfoPopup.js
  36. +1 −1 scenarioo-client/app/scripts/services/branchesAndBuilds.js
  37. +166 −0 scenarioo-client/app/scripts/services/breadcrumbsService.js
  38. +39 −0 scenarioo-client/app/scripts/services/pageAndStepService.js
  39. +218 −125 scenarioo-client/app/scripts/services/restServices.js
  40. +68 −0 scenarioo-client/app/scripts/services/sharePageService.js
  41. +68 −0 scenarioo-client/app/scripts/services/shareStepPopup.js
  42. +87 −0 scenarioo-client/app/scripts/services/treeNodeService.js
  43. +45 −2 scenarioo-client/app/styles/scenarioo.less
  44. +5 −3 scenarioo-client/app/template/breadcrumbs.html
  45. +38 −0 scenarioo-client/app/template/treeview.html
  46. +2 −0 scenarioo-client/app/views/applicationInfoPopup.html
  47. +2 −2 scenarioo-client/app/views/collapsablePanel.html
  48. +11 −56 scenarioo-client/app/views/main.html
  49. +46 −0 scenarioo-client/app/views/mainCustomTab.html
  50. +40 −25 scenarioo-client/app/views/mainUseCasesTab.html
  51. +69 −0 scenarioo-client/app/views/manage/branchAliases.html
  52. +55 −39 scenarioo-client/app/views/manage/buildImportDetails.html
  53. +17 −0 scenarioo-client/app/views/manage/buildsList.html
  54. +16 −0 scenarioo-client/app/views/manage/config.html
  55. +49 −0 scenarioo-client/app/views/manage/labelConfigurations.html
  56. +1 −0 scenarioo-client/app/views/manage/manage.html
  57. +7 −0 scenarioo-client/app/views/metaDataButton.html
  58. 0 scenarioo-client/app/views/{showHideDetails.html → metaDataPanel.html}
  59. +5 −3 scenarioo-client/app/{template/build.html → views/metaDataTree.html}
  60. +0 −5 scenarioo-client/app/views/metadata.html
  61. +17 −5 scenarioo-client/app/views/navigation.html
  62. +91 −0 scenarioo-client/app/views/referenceTree.html
  63. +25 −14 scenarioo-client/app/views/scenario.html
  64. +43 −0 scenarioo-client/app/views/shareStepPopup.html
  65. +0 −9 scenarioo-client/app/views/showHideDetailsButton.html
  66. +61 −11 scenarioo-client/app/views/step.html
  67. +48 −32 scenarioo-client/app/views/usecase.html
  68. +10 −7 scenarioo-client/bower.json
  69. +1 −1 scenarioo-client/protractor-e2e-scenarioo.conf.js
  70. +138 −41 scenarioo-client/test/mock/testData.js
  71. +21 −3 scenarioo-client/test/protractorE2E/specs/{home_spec.js → a_home_spec.js}
  72. +51 −0 scenarioo-client/test/protractorE2E/specs/breadcrumbs_spec.js
  73. +39 −0 scenarioo-client/test/protractorE2E/specs/k_branchalias_spec.js
  74. +32 −0 scenarioo-client/test/protractorE2E/specs/label_configuration_spec.js
  75. +43 −0 scenarioo-client/test/protractorE2E/specs/manage_spec.js
  76. +79 −0 scenarioo-client/test/protractorE2E/specs/object_details_spec.js
  77. +46 −0 scenarioo-client/test/protractorE2E/specs/page_variants_spec.js
  78. +3 −2 scenarioo-client/test/protractorE2E/specs/scenario_spec.js
  79. +94 −5 scenarioo-client/test/protractorE2E/specs/step_spec.js
  80. +50 −48 scenarioo-client/test/protractorE2E/util/util.js
  81. +29 −0 scenarioo-client/test/protractorE2E/webPages/baseWebPage.js
  82. +107 −0 scenarioo-client/test/protractorE2E/webPages/branchAliasesPage.js
  83. +36 −0 scenarioo-client/test/protractorE2E/webPages/breadcrumpsPage.js
  84. +27 −4 scenarioo-client/test/protractorE2E/webPages/homePage.js
  85. +9 −2 scenarioo-client/test/protractorE2E/webPages/index.js
  86. +68 −0 scenarioo-client/test/protractorE2E/webPages/labelConfigurationsPage.js
  87. +92 −0 scenarioo-client/test/protractorE2E/webPages/objectDetailsPage.js
  88. +114 −17 scenarioo-client/test/protractorE2E/webPages/stepPage.js
  89. +1 −1 scenarioo-client/test/protractorE2E/webPages/usecasePage.js
  90. +26 −10 scenarioo-client/test/spec/controllers/main.js
  91. +4 −3 scenarioo-client/test/spec/controllers/scenario.js
  92. +182 −30 scenarioo-client/test/spec/controllers/step.js
  93. +9 −5 scenarioo-client/test/spec/controllers/usecase.js
  94. +13 −9 scenarioo-client/test/spec/directives/breadcrumbs.js
  95. +68 −0 scenarioo-client/test/spec/services/breadcrumbsService.js
  96. +19 −4 scenarioo-client/test/spec/services/restServices.js
  97. +61 −0 scenarioo-client/test/spec/services/sharePageService.js
  98. +26 −38 ...ation-example/src/test/java/org/scenarioo/uitest/dummy/application/DummyApplicationSimulator.java
  99. +1 −0 ...eneration-example/src/test/java/org/scenarioo/uitest/dummy/application/DummySimulationConfig.java
  100. +11 −11 ...xample/src/test/java/org/scenarioo/uitest/dummy/application/DummySimulationConfigModuleValue.java
  101. +67 −0 ...test/java/org/scenarioo/uitest/dummy/application/issues/DummyApplicationsIssueTrackingSystem.java
  102. +63 −0 ...docu-generation-example/src/test/java/org/scenarioo/uitest/dummy/application/issues/WorkItem.java
  103. +58 −0 ...neration-example/src/test/java/org/scenarioo/uitest/dummy/application/issues/WorkItemBuilder.java
  104. +15 −7 ...e/src/test/java/org/scenarioo/uitest/dummy/application/steps/DummyApplicationStepDataFactory.java
  105. +7 −3 ...arioo-docu-generation-example/src/test/java/org/scenarioo/uitest/dummy/toolkit/UITestToolkit.java
  106. +46 −0 ...ioo-docu-generation-example/src/test/java/org/scenarioo/uitest/example/infrastructure/Labels.java
  107. +53 −20 ...on-example/src/test/java/org/scenarioo/uitest/example/infrastructure/ScenarioDocuWritingRule.java
  108. +14 −7 ...n-example/src/test/java/org/scenarioo/uitest/example/infrastructure/UITestToolkitAbstraction.java
  109. +11 −5 ...ion-example/src/test/java/org/scenarioo/uitest/example/infrastructure/UseCaseDocuWritingRule.java
  110. +109 −0 ...eration-example/src/test/java/org/scenarioo/uitest/example/issues/IssuesTrackingAccessHelper.java
  111. +22 −0 scenarioo-docu-generation-example/src/test/java/org/scenarioo/uitest/example/issues/UserStories.java
  112. +12 −2 ...-docu-generation-example/src/test/java/org/scenarioo/uitest/example/testcases/FindPageUITest.java
  113. +59 −0 ...generation-example/src/test/java/org/scenarioo/uitest/example/testcases/SwitchLanguageUITest.java
  114. +4 −0 ...tion-example/src/test/java/org/scenarioo/uitest/example/testcases/TechnicalCornerCasesUITest.java
  115. +1 −1 .../resources/example/documentation/scenarioDocuExample/example-branch/example-build-old-1/build.xml
  116. +1 −1 .../resources/example/documentation/scenarioDocuExample/example-branch/example-build-old-2/build.xml
  117. +1 −1 .../resources/example/documentation/scenarioDocuExample/example-branch/example-build-old-3/build.xml
  118. +1 −1 .../resources/example/documentation/scenarioDocuExample/example-branch/example-build-old-4/build.xml
  119. +1 −1 .../resources/example/documentation/scenarioDocuExample/example-branch/example-build-old-5/build.xml
  120. +3 −0 ...ation/scenarioDocuExample/example-branch/example-build/Find+Page/find_page_no_result/scenario.xml
  121. BIN ...cenarioDocuExample/example-branch/example-build/Find+Page/find_page_no_result/screenshots/000.png
  122. BIN ...cenarioDocuExample/example-branch/example-build/Find+Page/find_page_no_result/screenshots/001.png
  123. BIN ...cenarioDocuExample/example-branch/example-build/Find+Page/find_page_no_result/screenshots/002.png
  124. +9 −7 ...tion/scenarioDocuExample/example-branch/example-build/Find+Page/find_page_no_result/steps/000.xml
  125. +8 −3 ...tion/scenarioDocuExample/example-branch/example-build/Find+Page/find_page_no_result/steps/001.xml
  126. +9 −1 ...tion/scenarioDocuExample/example-branch/example-build/Find+Page/find_page_no_result/steps/002.xml
  127. +3 −0 ...ple-branch/example-build/Find+Page/find_page_with_text_on_page_from_multiple_results/scenario.xml
  128. BIN ...nch/example-build/Find+Page/find_page_with_text_on_page_from_multiple_results/screenshots/000.png
  129. BIN ...nch/example-build/Find+Page/find_page_with_text_on_page_from_multiple_results/screenshots/001.png
  130. BIN ...nch/example-build/Find+Page/find_page_with_text_on_page_from_multiple_results/screenshots/002.png
  131. BIN ...nch/example-build/Find+Page/find_page_with_text_on_page_from_multiple_results/screenshots/003.png
  132. BIN ...nch/example-build/Find+Page/find_page_with_text_on_page_from_multiple_results/screenshots/004.png
  133. +9 −7 ...le-branch/example-build/Find+Page/find_page_with_text_on_page_from_multiple_results/steps/000.xml
  134. +8 −3 ...le-branch/example-build/Find+Page/find_page_with_text_on_page_from_multiple_results/steps/001.xml
  135. +9 −1 ...le-branch/example-build/Find+Page/find_page_with_text_on_page_from_multiple_results/steps/002.xml
  136. +9 −1 ...le-branch/example-build/Find+Page/find_page_with_text_on_page_from_multiple_results/steps/003.xml
  137. +9 −1 ...le-branch/example-build/Find+Page/find_page_with_text_on_page_from_multiple_results/steps/004.xml
  138. +3 −0 ...nch/example-build/Find+Page/find_page_with_title_ambiguous_navigate_to_other_meaning/scenario.xml
  139. BIN ...mple-build/Find+Page/find_page_with_title_ambiguous_navigate_to_other_meaning/screenshots/000.png
  140. BIN ...mple-build/Find+Page/find_page_with_title_ambiguous_navigate_to_other_meaning/screenshots/001.png
  141. BIN ...mple-build/Find+Page/find_page_with_title_ambiguous_navigate_to_other_meaning/screenshots/002.png
  142. BIN ...mple-build/Find+Page/find_page_with_title_ambiguous_navigate_to_other_meaning/screenshots/003.png
  143. BIN ...mple-build/Find+Page/find_page_with_title_ambiguous_navigate_to_other_meaning/screenshots/004.png
  144. BIN ...mple-build/Find+Page/find_page_with_title_ambiguous_navigate_to_other_meaning/screenshots/005.png
  145. BIN ...mple-build/Find+Page/find_page_with_title_ambiguous_navigate_to_other_meaning/screenshots/006.png
  146. +9 −7 ...ch/example-build/Find+Page/find_page_with_title_ambiguous_navigate_to_other_meaning/steps/000.xml
  147. +8 −3 ...ch/example-build/Find+Page/find_page_with_title_ambiguous_navigate_to_other_meaning/steps/001.xml
  148. +9 −1 ...ch/example-build/Find+Page/find_page_with_title_ambiguous_navigate_to_other_meaning/steps/002.xml
  149. +9 −1 ...ch/example-build/Find+Page/find_page_with_title_ambiguous_navigate_to_other_meaning/steps/003.xml
  150. +9 −1 ...ch/example-build/Find+Page/find_page_with_title_ambiguous_navigate_to_other_meaning/steps/004.xml
  151. +9 −1 ...ch/example-build/Find+Page/find_page_with_title_ambiguous_navigate_to_other_meaning/steps/005.xml
  152. +9 −1 ...ch/example-build/Find+Page/find_page_with_title_ambiguous_navigate_to_other_meaning/steps/006.xml
  153. +3 −0 ...enarioDocuExample/example-branch/example-build/Find+Page/find_page_with_title_direct/scenario.xml
  154. BIN ...ocuExample/example-branch/example-build/Find+Page/find_page_with_title_direct/screenshots/000.png
  155. BIN ...ocuExample/example-branch/example-build/Find+Page/find_page_with_title_direct/screenshots/001.png
  156. BIN ...ocuExample/example-branch/example-build/Find+Page/find_page_with_title_direct/screenshots/002.png
  157. +9 −7 ...narioDocuExample/example-branch/example-build/Find+Page/find_page_with_title_direct/steps/000.xml
  158. +8 −3 ...narioDocuExample/example-branch/example-build/Find+Page/find_page_with_title_direct/steps/001.xml
  159. +9 −1 ...narioDocuExample/example-branch/example-build/Find+Page/find_page_with_title_direct/steps/002.xml
  160. +3 −0 ...rces/example/documentation/scenarioDocuExample/example-branch/example-build/Find+Page/usecase.xml
  161. +35 −0 ...-branch/example-build/Switch+Language/search_article_in_german_and_switch_to_spanish/scenario.xml
  162. BIN .../example-build/Switch+Language/search_article_in_german_and_switch_to_spanish/screenshots/000.png
  163. BIN .../example-build/Switch+Language/search_article_in_german_and_switch_to_spanish/screenshots/001.png
  164. BIN .../example-build/Switch+Language/search_article_in_german_and_switch_to_spanish/screenshots/002.png
  165. BIN .../example-build/Switch+Language/search_article_in_german_and_switch_to_spanish/screenshots/003.png
  166. BIN .../example-build/Switch+Language/search_article_in_german_and_switch_to_spanish/screenshots/004.png
  167. +7,061 −0 ...branch/example-build/Switch+Language/search_article_in_german_and_switch_to_spanish/steps/000.xml
  168. +6,964 −0 ...branch/example-build/Switch+Language/search_article_in_german_and_switch_to_spanish/steps/001.xml
  169. +6,964 −0 ...branch/example-build/Switch+Language/search_article_in_german_and_switch_to_spanish/steps/002.xml
  170. +6,964 −0 ...branch/example-build/Switch+Language/search_article_in_german_and_switch_to_spanish/steps/003.xml
  171. +6,964 −0 ...branch/example-build/Switch+Language/search_article_in_german_and_switch_to_spanish/steps/004.xml
  172. +14 −0 ...xample/documentation/scenarioDocuExample/example-branch/example-build/Switch+Language/usecase.xml
  173. +3 −0 ...le-branch/example-build/Technical+Corner+Cases/dummy_scenario_with_no_page_names_set/scenario.xml
  174. BIN ...ch/example-build/Technical+Corner+Cases/dummy_scenario_with_no_page_names_set/screenshots/000.png
  175. BIN ...ch/example-build/Technical+Corner+Cases/dummy_scenario_with_no_page_names_set/screenshots/001.png
  176. BIN ...ch/example-build/Technical+Corner+Cases/dummy_scenario_with_no_page_names_set/screenshots/002.png
  177. BIN ...ch/example-build/Technical+Corner+Cases/dummy_scenario_with_no_page_names_set/screenshots/003.png
  178. BIN ...ch/example-build/Technical+Corner+Cases/dummy_scenario_with_no_page_names_set/screenshots/004.png
  179. +9 −7 ...e-branch/example-build/Technical+Corner+Cases/dummy_scenario_with_no_page_names_set/steps/000.xml
  180. +9 −7 ...e-branch/example-build/Technical+Corner+Cases/dummy_scenario_with_no_page_names_set/steps/001.xml
  181. +8 −3 ...e-branch/example-build/Technical+Corner+Cases/dummy_scenario_with_no_page_names_set/steps/002.xml
  182. +8 −3 ...e-branch/example-build/Technical+Corner+Cases/dummy_scenario_with_no_page_names_set/steps/003.xml
  183. +9 −1 ...e-branch/example-build/Technical+Corner+Cases/dummy_scenario_with_no_page_names_set/steps/004.xml
  184. +1 −0 ...ple/example-branch/example-build/Technical+Corner+Cases/dummy_scenario_with_no_steps/scenario.xml
  185. +3 −0 ...hnical+Corner+Cases/dummy_scenario_with_one_step_and_one_page_with_no_other_variants/scenario.xml
  186. BIN ...Corner+Cases/dummy_scenario_with_one_step_and_one_page_with_no_other_variants/screenshots/000.png
  187. +9 −7 ...nical+Corner+Cases/dummy_scenario_with_one_step_and_one_page_with_no_other_variants/steps/000.xml
  188. +3 −0 ...documentation/scenarioDocuExample/example-branch/example-build/Technical+Corner+Cases/usecase.xml
  189. +1 −1 ...c/test/resources/example/documentation/scenarioDocuExample/example-branch/example-build/build.xml
  190. BIN ...docu-generation-example/src/test/resources/example/screenshots/screenshot_pageAngularJSGerman.png
  191. BIN ...ocu-generation-example/src/test/resources/example/screenshots/screenshot_pageAngularJSSpanish.png
  192. BIN ...ample/src/test/resources/example/screenshots/screenshot_startPageSelectedGermanTypedAngularJS.png
  193. +9 −7 scenarioo-server/build.gradle
  194. +6 −2 scenarioo-server/src/main/java/org/scenarioo/business/aggregator/ObjectReferenceTreeBuilder.java
  195. +91 −0 scenarioo-server/src/main/java/org/scenarioo/business/aggregator/ObjectReferenceWithLabels.java
  196. +129 −97 scenarioo-server/src/main/java/org/scenarioo/business/aggregator/ObjectRepository.java
  197. +45 −0 scenarioo-server/src/main/java/org/scenarioo/business/aggregator/PageNameSanitizer.java
  198. +70 −80 scenarioo-server/src/main/java/org/scenarioo/business/aggregator/ScenarioDocuAggregator.java
  199. +141 −58 scenarioo-server/src/main/java/org/scenarioo/business/aggregator/StepsAndPagesAggregator.java
  200. +95 −0 ...server/src/main/java/org/scenarioo/business/aggregator/customTabs/CustomObjectTabTreeBuilder.java
  201. +44 −0 ...server/src/main/java/org/scenarioo/business/aggregator/customTabs/CustomObjectTabsAggregator.java
  202. +87 −0 ...server/src/main/java/org/scenarioo/business/aggregator/customTabs/ObjectReferenceTreeBuilder.java
  203. +87 −25 scenarioo-server/src/main/java/org/scenarioo/business/builds/AvailableBuildsList.java
  204. +9 −5 scenarioo-server/src/main/java/org/scenarioo/business/builds/BuildImportLogAppender.java
  205. +28 −18 scenarioo-server/src/main/java/org/scenarioo/business/builds/BuildImporter.java
  206. +124 −0 scenarioo-server/src/main/java/org/scenarioo/business/builds/BuildLink.java
  207. +7 −4 scenarioo-server/src/main/java/org/scenarioo/business/builds/BuildSorter.java
  208. +60 −27 scenarioo-server/src/main/java/org/scenarioo/business/builds/ScenarioDocuBuildsManager.java
  209. +76 −0 ...er/src/main/java/org/scenarioo/business/lastSuccessfulScenarios/LastSuccessfulScenariosBuild.java
  210. +373 −0 ...main/java/org/scenarioo/business/lastSuccessfulScenarios/LastSuccessfulScenariosBuildUpdater.java
  211. +66 −0 scenarioo-server/src/main/java/org/scenarioo/dao/aggregates/AggregatedDataReader.java
  212. +49 −0 scenarioo-server/src/main/java/org/scenarioo/dao/aggregates/LastSuccessfulScenariosIndexDAO.java
  213. +203 −75 scenarioo-server/src/main/java/org/scenarioo/dao/aggregates/ScenarioDocuAggregationDAO.java
  214. +63 −41 scenarioo-server/src/main/java/org/scenarioo/dao/aggregates/ScenarioDocuAggregationFiles.java
  215. +59 −0 scenarioo-server/src/main/java/org/scenarioo/dao/basic/FileSystemOperationsDao.java
  216. +0 −173 scenarioo-server/src/main/java/org/scenarioo/dao/configuration/ConfigurationDAO.java
  217. +11 −0 scenarioo-server/src/main/java/org/scenarioo/dao/configuration/ConfigurationDao.java
  218. +115 −0 scenarioo-server/src/main/java/org/scenarioo/dao/configuration/ConfigurationDaoImpl.java
  219. +31 −0 scenarioo-server/src/main/java/org/scenarioo/dao/configuration/ConfigurationDaoInMemory.java
  220. +37 −0 scenarioo-server/src/main/java/org/scenarioo/model/configuration/BranchAlias.java
  221. +68 −12 scenarioo-server/src/main/java/org/scenarioo/model/configuration/Configuration.java
  222. +33 −0 scenarioo-server/src/main/java/org/scenarioo/model/configuration/CustomObjectDetailColumn.java
  223. +57 −0 scenarioo-server/src/main/java/org/scenarioo/model/configuration/CustomObjectTab.java
  224. +62 −0 scenarioo-server/src/main/java/org/scenarioo/model/configuration/LabelConfiguration.java
  225. +22 −12 scenarioo-server/src/main/java/org/scenarioo/model/docu/aggregates/branches/BranchBuilds.java
  226. +0 −78 scenarioo-server/src/main/java/org/scenarioo/model/docu/aggregates/branches/BuildIdentifier.java
  227. +1 −0 scenarioo-server/src/main/java/org/scenarioo/model/docu/aggregates/branches/BuildImportSummary.java
  228. +34 −0 scenarioo-server/src/main/java/org/scenarioo/model/docu/aggregates/objects/CustomObjectTabTree.java
  229. +12 −0 scenarioo-server/src/main/java/org/scenarioo/model/docu/aggregates/scenarios/PageSteps.java
  230. +77 −13 scenarioo-server/src/main/java/org/scenarioo/model/docu/aggregates/scenarios/ScenarioPageSteps.java
  231. +32 −0 scenarioo-server/src/main/java/org/scenarioo/model/docu/aggregates/scenarios/ScenarioStatistics.java
  232. +69 −0 scenarioo-server/src/main/java/org/scenarioo/model/docu/aggregates/steps/NeighborStep.java
  233. +32 −27 scenarioo-server/src/main/java/org/scenarioo/model/docu/aggregates/steps/StepLink.java
  234. +114 −49 scenarioo-server/src/main/java/org/scenarioo/model/docu/aggregates/steps/StepNavigation.java
  235. +36 −0 scenarioo-server/src/main/java/org/scenarioo/model/docu/aggregates/steps/StepStatistics.java
  236. +29 −0 scenarioo-server/src/main/java/org/scenarioo/model/docu/aggregates/usecases/ScenarioSummary.java
  237. +12 −13 scenarioo-server/src/main/java/org/scenarioo/model/docu/aggregates/usecases/UseCaseScenarios.java
  238. +12 −1 scenarioo-server/src/main/java/org/scenarioo/model/docu/aggregates/usecases/UseCaseSummary.java
  239. +21 −0 ...rioo-server/src/main/java/org/scenarioo/model/lastSuccessfulScenarios/LastSuccessfulScenario.java
  240. +100 −0 ...erver/src/main/java/org/scenarioo/model/lastSuccessfulScenarios/LastSuccessfulScenariosIndex.java
  241. +55 −0 ...src/main/java/org/scenarioo/model/lastSuccessfulScenarios/UseCaseWithLastSuccessfulScenarios.java
  242. +71 −0 scenarioo-server/src/main/java/org/scenarioo/repository/ConfigurationRepository.java
  243. +41 −0 scenarioo-server/src/main/java/org/scenarioo/repository/RepositoryLocator.java
  244. +0 −53 scenarioo-server/src/main/java/org/scenarioo/rest/ScreenshotResource.java
  245. +0 −30 scenarioo-server/src/main/java/org/scenarioo/rest/SearchResource.java
  246. +0 −60 scenarioo-server/src/main/java/org/scenarioo/rest/StepResource.java
  247. +0 −29 scenarioo-server/src/main/java/org/scenarioo/rest/VersionResource.java
  248. +20 −7 scenarioo-server/src/main/java/org/scenarioo/rest/application/ApplicationVersion.java
  249. +13 −9 scenarioo-server/src/main/java/org/scenarioo/rest/application/ApplicationVersionHolder.java
  250. +27 −30 scenarioo-server/src/main/java/org/scenarioo/rest/application/ScenariooWebApplication.java
  251. +31 −0 scenarioo-server/src/main/java/org/scenarioo/rest/application/VersionResource.java
  252. +15 −7 scenarioo-server/src/main/java/org/scenarioo/rest/base/AbstractBuildContentResource.java
  253. +66 −0 scenarioo-server/src/main/java/org/scenarioo/rest/base/BuildIdentifier.java
  254. +74 −0 scenarioo-server/src/main/java/org/scenarioo/rest/base/ScenarioIdentifier.java
  255. +179 −0 scenarioo-server/src/main/java/org/scenarioo/rest/base/StepIdentifier.java
  256. +1 −1 ...oo-server/src/main/java/org/scenarioo/rest/{ → base}/context/ScenarioDocuJAXBContextResolver.java
  257. +1 −1 scenarioo-server/src/main/java/org/scenarioo/rest/{ → base}/exceptions/ExceptionHandler.java
  258. +1 −1 scenarioo-server/src/main/java/org/scenarioo/rest/{ → builds}/BranchBuildsResource.java
  259. +18 −9 scenarioo-server/src/main/java/org/scenarioo/rest/{ → builds}/BuildsImporterResource.java
  260. +56 −0 scenarioo-server/src/main/java/org/scenarioo/rest/configuration/BranchAliasesResource.java
  261. +8 −5 scenarioo-server/src/main/java/org/scenarioo/rest/{ → configuration}/ConfigurationResource.java
  262. +103 −0 scenarioo-server/src/main/java/org/scenarioo/rest/configuration/LabelConfigurationsResource.java
  263. +27 −0 scenarioo-server/src/main/java/org/scenarioo/rest/objectRepository/CustomTabsResource.java
  264. +14 −9 scenarioo-server/src/main/java/org/scenarioo/rest/{ → objectRepository}/GenericObjectsResource.java
  265. +30 −13 scenarioo-server/src/main/java/org/scenarioo/rest/{ → scenario}/ScenariosResource.java
  266. +33 −0 scenarioo-server/src/main/java/org/scenarioo/rest/scenario/dto/PageSummary.java
  267. +15 −23 ...rioo/{model/docu/aggregates/steps/StepWithNavigation.java → rest/scenario/dto/PageWithSteps.java}
  268. +57 −0 scenarioo-server/src/main/java/org/scenarioo/rest/scenario/dto/ScenarioDetails.java
  269. +70 −0 scenarioo-server/src/main/java/org/scenarioo/rest/scenario/mapper/ScenarioDetailsMapper.java
  270. +101 −0 scenarioo-server/src/main/java/org/scenarioo/rest/step/ScreenshotResource.java
  271. +93 −0 scenarioo-server/src/main/java/org/scenarioo/rest/step/StepResource.java
  272. +116 −0 scenarioo-server/src/main/java/org/scenarioo/rest/step/dto/StepDetails.java
  273. +72 −0 scenarioo-server/src/main/java/org/scenarioo/rest/step/logic/FallbackImageMarker.java
  274. +21 −0 scenarioo-server/src/main/java/org/scenarioo/rest/step/logic/LabelsQueryParamParser.java
  275. +65 −0 scenarioo-server/src/main/java/org/scenarioo/rest/step/logic/LoadScenarioResult.java
  276. +76 −0 scenarioo-server/src/main/java/org/scenarioo/rest/step/logic/ResolveStepIndexResult.java
  277. +179 −0 scenarioo-server/src/main/java/org/scenarioo/rest/step/logic/ScenarioLoader.java
  278. +94 −0 scenarioo-server/src/main/java/org/scenarioo/rest/step/logic/ScreenshotResponseFactory.java
  279. +119 −0 scenarioo-server/src/main/java/org/scenarioo/rest/step/logic/StepCandidate.java
  280. +143 −0 scenarioo-server/src/main/java/org/scenarioo/rest/step/logic/StepIndexResolver.java
  281. +64 −0 scenarioo-server/src/main/java/org/scenarioo/rest/step/logic/StepLoader.java
  282. +87 −0 scenarioo-server/src/main/java/org/scenarioo/rest/step/logic/StepLoaderResult.java
  283. +81 −0 scenarioo-server/src/main/java/org/scenarioo/rest/step/logic/StepResponseFactory.java
  284. +19 −15 scenarioo-server/src/main/java/org/scenarioo/rest/{ → usecase}/UseCasesResource.java
  285. +27 −0 scenarioo-server/src/main/java/org/scenarioo/utils/UrlEncoding.java
  286. +55 −19 scenarioo-server/src/main/resources/config-for-demo/config.xml
  287. +20 −1 scenarioo-server/src/main/resources/config.xml
  288. +83 −0 scenarioo-server/src/test/java/org/scenarioo/business/aggregator/PageNameSanitizerTest.java
  289. +11 −18 scenarioo-server/src/test/java/org/scenarioo/business/builds/AvailableBuildsListTest.java
  290. +4 −4 scenarioo-server/src/test/java/org/scenarioo/business/builds/BuildSorterTest.java
  291. +935 −0 ...rc/test/java/org/scenarioo/business/lastSuccessfulScenarios/LastSuccessfulScenariosBuildTest.java
  292. +105 −0 scenarioo-server/src/test/java/org/scenarioo/dao/basic/FileSystemOperationsDaoTest.java
  293. +56 −0 scenarioo-server/src/test/java/org/scenarioo/dao/configuration/ConfigurationDaoTest.java
  294. +126 −0 ...ioo-server/src/test/java/org/scenarioo/model/docu/aggregates/scenarios/ScenarioPageStepsTest.java
  295. +39 −0 scenarioo-server/src/test/java/org/scenarioo/rest/base/StepIdentifierTest.java
  296. +120 −0 scenarioo-server/src/test/java/org/scenarioo/rest/step/logic/DummyAggregatedDataReader.java
  297. +73 −0 scenarioo-server/src/test/java/org/scenarioo/rest/step/logic/LabelsQueryParamParserTest.java
  298. +157 −0 scenarioo-server/src/test/java/org/scenarioo/rest/step/logic/ScenarioLoaderTest.java
  299. +194 −0 scenarioo-server/src/test/java/org/scenarioo/rest/step/logic/StepIndexResolverTest.java
  300. +251 −0 scenarioo-server/src/test/java/org/scenarioo/rest/step/logic/StepTestData.java
View
@@ -1,3 +1,4 @@
classes/
bin/
*~
target/
View
@@ -1,3 +1,9 @@
Demo-Smoketest: [![Demo Smoketest Status](http://54.88.202.24:8081/job/smoketest/badge/icon)](http://54.88.202.24:8081/job/smoketest)
CI Master: [![Master CI Status](http://54.88.202.24:8081/job/scenarioo-master/badge/icon)](http://54.88.202.24:8081/job/scenarioo-master)
CI Master: [![Develop CI Status](http://54.88.202.24:8081/job/scenarioo-develop/badge/icon)](http://54.88.202.24:8081/job/scenarioo-develop)
Scenarioo
==========
@@ -16,7 +16,9 @@
limitations under the License.
--><!-- The contents of this file will be loaded for each web application -->
<Context>
<Context>
<Parameter name="configurationDirectory" value="/home/ngUSD/.scenarioo" override="true" description="Test to check this context.xml file is being read."/>
<!-- Default set of monitored resources -->
<WatchedResource>WEB-INF/web.xml</WatchedResource>
View
@@ -24,12 +24,20 @@ buildscript {
allprojects {
group = 'org.scenarioo'
version = getVersionName()
tasks.withType(JavaCompile) {
sourceCompatibility = "1.6"
targetCompatibility = "1.6"
}
}
configurations.all {
resolutionStrategy.cacheDynamicVersionsFor 10, 'minutes'
}
configure([project(":scenarioo-server"), project(":scenarioo-docu-generation-example")]) {
apply plugin: 'eclipse'
apply plugin: 'java'
configurations {
compileOnly
}
@@ -40,9 +48,11 @@ configure([project(":scenarioo-server"), project(":scenarioo-docu-generation-exa
}
mavenCentral()
}
ext.scenariooApiVersion = '2.0.0'
dependencies {
compile 'org.scenarioo:scenarioo-java:1.0.+'
compile 'org.scenarioo:scenarioo-java:' + ext.scenariooApiVersion
compile 'org.apache.commons:commons-lang3:3.0.1'
compile 'commons-io:commons-io:1.3.2'
compile 'commons-codec:commons-codec:1.2'
@@ -52,12 +62,12 @@ configure([project(":scenarioo-server"), project(":scenarioo-docu-generation-exa
//Include compileOnly for compilation
sourceSets.main.compileClasspath += configurations.compileOnly
// optional: if using 'eclipse' plugin
eclipse {
classpath {
plusConfigurations += configurations.compileOnly
plusConfigurations += configurations.compileOnly
}
}
}
@@ -0,0 +1,29 @@
#!/bin/sh
#
# This script ensures to reset your configuration of your scenarioo server
# to the correct config that you should use for demo and e2e test purposes.
#
# Copy this script somwhere, and change the pathes to match your environment.
#
# Then for running e2e tests you should always do the following:
# 1. (optional, but to be bullet proof) do a clean build of scenarioo-docu-generation-example project to remove old outdated test data
# 2. run JUnit tests of scenarioo-docu-generation-example to recreate demo data
# 3. run this script to configure your server properly with the newest version of the configuration
# 4. restart your Java backend server
#
# directory where you have the source code checked out (inside this directory the script expects the projects scenarioo-server and scenarioo-docu-generation-example)
source_code_directory=~/Code/scenarioo
source_code_directory_with_escaped_slashes=~\/Code\/scenarioo
# server config directory where your server is configured to read the config.xml from:
server_config_directory=~/.scenarioo
# the script code (no need to change!)
echo "Please check the directories are configured correctly ..."
echo "Source code directory: $source_code_directory"
echo "Server config directory: $server_config_directory"
cp -f "$source_code_directory/scenarioo-server/src/main/resources/config-for-demo/config.xml" "$server_config_directory/config.xml"
sed -i.bak "s/<testDocumentationDirPath>.*<\/testDocumentationDirPath>/<testDocumentationDirPath>$source_code_directory_with_escaped_slashes\/scenarioo-docu-generation-example\/build\/scenarioDocuExample<\/testDocumentationDirPath>/g" $server_config_directory/config.xml
@@ -168,6 +168,7 @@ module.exports = function (grunt) {
configFile: 'node_modules/protractor/referenceConf.js', // Default config file
keepAlive: false, // If false, the grunt process stops when the test fails.
noColor: false, // If true, protractor will not use colors in its output.
debug: false,
args: {
// Arguments passed to the command
}
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
@@ -40,6 +40,7 @@
<script type="text/javascript">
document.createElement("sc-breadcrumb");
document.createElement("sc-tree");
document.createElement("sc-filterableTableTree");
document.createElement("tabset");
document.createElement("tab");
document.createElement("ng-include");
@@ -58,8 +59,7 @@
<script src="components/json3/lib/json3.min.js"></script>
<![endif]-->
<div ng-include="'views/navigation.html'" ng-controller="NavigationCtrl">
</div>
<div ng-include="'views/navigation.html'" ng-controller="NavigationCtrl"></div>
<div class="sc-container">
<div ng-view></div>
@@ -75,6 +75,8 @@
<script src="components/angular-i18n/angular-locale_en-us.js"></script>
<script src="components/angular-i18n/angular-locale_de-de.js"></script>
<script src="components/angular-i18n/angular-locale_de-ch.js"></script>
<script src="components/jquery/dist/jquery.min.js"></script>
<!-- build:js scripts/js-beautify.js -->
<!--<script src="third-party/js-beautify/js/lib/beautify-html.js"></script>-->
@@ -90,18 +92,26 @@
<script src="scripts/services/config.js"></script>
<script src="scripts/services/restServices.js"></script>
<script src="scripts/services/selectedBranchAndBuild.js"></script>
<script src="scripts/services/applicationInfoPopup.js"></script>
<script src="scripts/services/pageAndStepService.js"></script>
<script src="scripts/services/treeNodeService.js"></script>
<script src="scripts/services/sharePageService.js"></script>
<script src="scripts/services/breadcrumbsService.js"></script>
<script src="scripts/directives/breadcrumbs.js"></script>
<script src="scripts/directives/sortableColumn.js"></script>
<script src="scripts/directives/tree.js"></script>
<script src="scripts/directives/filterableTableTree.js"></script>
<script src="scripts/directives/staticInclude.js"></script>
<script src="scripts/directives/navigatorTable.js"></script>
<script src="scripts/directives/showHideDetailsButton.js"></script>
<script src="scripts/directives/showHideDetails.js"></script>
<script src="scripts/directives/debounce.js"></script>
<script src="scripts/directives/metaDataButton.js"></script>
<script src="scripts/directives/metaDataPanel.js"></script>
<script src="scripts/directives/metaDataTree.js"></script>
<script src="scripts/directives/collapsablePanel.js"></script>
<script src="scripts/controllers/navigation.js"></script>
<script src="scripts/controllers/main.js"></script>
<script src="scripts/controllers/mainUseCasesTab.js"></script>
<script src="scripts/controllers/mainCustomTab.js"></script>
<script src="scripts/controllers/usecase.js"></script>
<script src="scripts/controllers/scenario.js"></script>
<script src="scripts/controllers/step.js"></script>
@@ -110,6 +120,9 @@
<script src="scripts/controllers/manage/buildImportDetails.js"></script>
<script src="scripts/controllers/manage/configEditor.js"></script>
<script src="scripts/controllers/title.js"></script>
<script src="scripts/controllers/manage/branchAliases.js"></script>
<script src="scripts/controllers/manage/labelConfigurations.js"></script>
<script src="scripts/controllers/referenceTree.js"></script>
<script src="scripts/filters/humanReadable.js"></script>
<script src="scripts/filters/filterArray.js"></script>
<script src="scripts/filters/treeDataCreator.js"></script>
@@ -118,6 +131,7 @@
<script src="scripts/filters/metadataTreeListCreator.js"></script>
<script src="scripts/filters/dateTime.js"></script>
<script src="scripts/services/applicationInfoPopup.js"></script>
<script src="scripts/services/shareStepPopup.js"></script>
<!-- endbuild -->
</body>
@@ -18,51 +18,62 @@
'use strict';
angular.module('scenarioo.filters', []);
angular.module('scenarioo.directives', ['scenarioo.filters', 'ngRoute', 'twigs.globalHotkeys']);
angular.module('scenarioo.directives', ['scenarioo.filters', 'ngRoute', 'twigs.globalHotkeys', 'ui.bootstrap.tpls']);
angular.module('scenarioo.services', [ 'ngResource', 'ngRoute', 'scenarioo.config', 'LocalStorageModule']);
angular.module('scenarioo.controllers', ['scenarioo.services', 'scenarioo.directives']);
angular.module('scenarioo', [
'scenarioo.controllers',
'ui.bootstrap'
]).config(function ($routeProvider) {
angular.module('scenarioo', ['scenarioo.controllers','ui.bootstrap'])
.config(function ($routeProvider) {
/**
* breadcrumbId: id of the breadcrumb elements to use for this page as defined in breadcrumbsService.js
*/
$routeProvider
.when('/', {
templateUrl: 'views/main.html',
controller: 'MainCtrl',
breadcrumb: '<i class="icon-home"></i> Home'
breadcrumbId: 'main'
})
.when('/manage', {
templateUrl: 'views/manage/manage.html',
controller: 'ManageCtrl',
breadcrumb: '<i class="icon-cogs"></i> Manage'
breadcrumbId: 'manage'
})
.when('/usecase/:useCaseName', {
templateUrl: 'views/usecase.html',
controller: 'UseCaseCtrl',
useCaseName: '@useCaseName',
breadcrumb: '<strong>Use Case:</strong> $param'
breadcrumbId: 'usecase'
})
.when('/scenario/:useCaseName/:scenarioName', {
templateUrl: 'views/scenario.html',
controller: 'ScenarioCtrl',
useCaseName: '@useCaseName',
scenarioName: '@scenarioName',
breadcrumb: '<strong>Scenario:</strong> $param'
breadcrumbId: 'scenario'
})
.when('/step/:useCaseName/:scenarioName/:pageName/:pageIndex/:stepIndex', {
.when('/object/:objectType/:objectName', {
templateUrl: 'views/referenceTree.html',
controller: 'ReferenceTreeCtrl',
objectType: '@objectType',
objectName: '@objectName',
breadcrumbId: 'object'
})
.when('/step/:useCaseName/:scenarioName/:pageName/:pageOccurrence/:stepInPageOccurrence', {
templateUrl: 'views/step.html',
controller: 'StepCtrl',
useCaseName: '@useCaseName',
scenarioName: '@scenarioName',
pageName: '@pageName',
pageIndex: '@pageIndex',
stepIndex: '@stepIndex',
breadcrumb: '<strong>Step:</strong> $title'
pageOccurrence: '@pageOccurrence',
stepInPageOccurrence: '@stepInPageOccurrence',
breadcrumbId: 'step'
})
.otherwise({
redirectTo: '/'
});
}).run(function ($rootScope, Config, GlobalHotkeysService, $location) {
GlobalHotkeysService.registerGlobalHotkey('m', function () {
@@ -79,6 +90,3 @@ angular.module('scenarioo', [
Config.load();
});
@@ -17,7 +17,44 @@
'use strict';
angular.module('scenarioo.controllers').controller('MainCtrl', function ($scope, $location, SelectedBranchAndBuild, BranchesAndBuilds) {
/**
* The main controller is responsible to control the main tabs (some are static deifned, most are dynamically defined through custom tabs in configuration).
*
* The content of the tab is managed in different views and controller that are lazyly loaded through this controller and view (using include URL resolution lazyly).
*/
angular.module('scenarioo.controllers').controller('MainCtrl', function ($scope, $location, SelectedBranchAndBuild, Config, BranchesAndBuilds) {
function defineInitialStaticTabs() {
$scope.tabs = [
{
tabId: 'usecases',
title: 'Use Cases',
contentViewUrl: 'views/mainUseCasesTab.html',
active: true
}
];
}
function defineCustomTabsFromConfig(config) {
angular.forEach(config.customObjectTabs, function (customTab) {
$scope.tabs[$scope.tabs.length] = {
tabId: customTab.id,
title: customTab.tabTitle,
column: customTab.customObjectDetailColumns,
contentViewUrl: 'views/mainCustomTab.html',
active: false
};
});
}
// Load configuration and trigger definition of tabs from config.
$scope.$on(Config.CONFIG_LOADED_EVENT, function () {
var config = Config.getRawConfigDataCopy();
defineInitialStaticTabs();
defineCustomTabsFromConfig(config);
$scope.selectTabFromUrl();
});
Config.load();
function loadBuilds() {
BranchesAndBuilds.getBranchesAndBuilds().then(function onSuccess(branchesAndBuilds) {
@@ -26,46 +63,31 @@ angular.module('scenarioo.controllers').controller('MainCtrl', function ($scope,
console.log(error);
});
}
SelectedBranchAndBuild.callOnSelectionChange(loadBuilds);
$scope.tabs = [
{
tabId: 'usecases',
title: 'Use Cases',
contentViewUrl: 'views/mainUseCasesTab.html',
active: true
}
];
$scope.getLazyTabContentViewUrl = function (tab) {
/**
* Only return the URL for the tab content view as soon as the is is active, such that the content only gets lazyly loaded.
*/
$scope.getLazyTabContentViewUrl = function (tabId) {
// Only return the tab src as soon as tab is active
if (tab.active) {
return tab.contentViewUrl;
}
else {
return null;
}
var url = null;
angular.forEach($scope.tabs, function (tab) {
if (tab.tabId === tabId && tab.active === true) {
url = tab.contentViewUrl;
}
});
return url;
};
$scope.genericObjectTabs = [
{index: '0', label: 'Object Descriptions', objectTypes: [
{index: 0, label: 'Business Operations', objectType: 'businessOperation'},
{index: 1, label: 'Services', objectType: 'service', columns: [
{key: 'realName', label: 'Real Name'},
{key: 'eaiName', label: 'Integration Name (EAI)'}
]},
{index: 2, label: 'UI Actions', objectType: 'action'} ,
{index: 3, label: 'HTTP Requests', objectType: 'httpAction'}
]}
//,{index: '1', label:'Simulation Configs', objectType: 'httpAction'}
];
$scope.setSelectedTabInUrl = function (tabId) {
$location.search('tab', tabId);
angular.forEach($scope.tabs, function (tab) {
if (tab.tabId === tabId && tab.active === true && $location.search().tab !== tab.tabId) {
// this ugly weird expression seems to be needed to ensure that the url is not manipulated too early (before tab is activated) and not to often (if already in url)
$location.search('tab', tab.tabId);
}
});
};
$scope.selectTabFromUrl = function () {
var params = $location.search();
var selectedTabId = 'undefined';
@@ -79,7 +101,4 @@ angular.module('scenarioo.controllers').controller('MainCtrl', function ($scope,
}
};
$scope.selectTabFromUrl();
});
Oops, something went wrong.

0 comments on commit 23cc0c3

Please sign in to comment.