ISIS-1296: merging in 1.11.1-RC1 branch, fixing conflict
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8812424a Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8812424a Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8812424a Branch: refs/heads/ISIS-993 Commit: 8812424a472b4e679417566f4aaeae907184caa1 Parents: 78bd18e 006f98a Author: Dan Haywood <d...@haywood-associates.co.uk> Authored: Sun Jan 17 15:06:26 2016 +0000 Committer: Dan Haywood <d...@haywood-associates.co.uk> Committed: Sun Jan 17 15:06:26 2016 +0000 ---------------------------------------------------------------------- .../isis/core/metamodel/facets/Annotations.java | 2 +- .../container/DomainObjectContainerDefault.java | 2 +- core/pom.xml | 25 ++++++++++++++- .../unittestsupport/soap/SoapEndpointSpec.java | 3 +- .../java/domainapp/dom/simple/SimpleObject.java | 4 +-- .../webapp/ide/eclipse/launch/.gitignore | 8 +---- .../ide/eclipse/launch/SimpleApp-JREBEL.launch | 31 +++++++++++++++++++ .../launch/SimpleApp-PROTOTYPE-jrebel.launch | 31 ------------------- .../SimpleApp-PROTOTYPE-no-fixtures.launch | 23 -------------- ...OTOTYPE-with-fixtures-bypass-security.launch | 20 ++++++++++++ .../SimpleApp-PROTOTYPE-with-fixtures.launch | 2 +- .../eclipse/launch/SimpleApp-PROTOTYPE.launch | 20 ++++++++++++ .../launch/SimpleApp-SERVER-no-fixtures.launch | 23 -------------- .../ide/eclipse/launch/SimpleApp-SERVER.launch | 20 ++++++++++++ ..._PROTOTYPE_with_fixtures-bypass-security.xml | 28 +++++++++++++++++ .../SimpleApp_PROTOTYPE_with_fixtures.xml | 28 +++++++++++++++++ .../ide/intellij/launch/SimpleApp_SERVER.xml | 28 +++++++++++++++++ .../launch/SimpleApp__enhance_only_.xml | 2 +- .../src/main/jettyconsole/isis-banner.pdn | Bin 69658 -> 64162 bytes .../src/main/jettyconsole/isis-banner.png | Bin 30776 -> 27310 bytes example/archetype/simpleapp/pom.xml | 2 +- .../java/domainapp/dom/simple/SimpleObject.java | 4 +-- .../main/resources/archetype-resources/pom.xml | 2 +- .../webapp/ide/eclipse/launch/.gitignore | 8 +---- ...OTOTYPE-with-fixtures-bypass-security.launch | 22 +++++++++++++ .../SimpleApp-PROTOTYPE-with-fixtures.launch | 22 +++++++++++++ .../eclipse/launch/SimpleApp-PROTOTYPE.launch | 22 +++++++++++++ .../ide/eclipse/launch/SimpleApp-SERVER.launch | 22 +++++++++++++ ..._PROTOTYPE_with_fixtures-bypass-security.xml | 31 +++++++++++++++++++ .../SimpleApp_PROTOTYPE_with_fixtures.xml | 31 +++++++++++++++++++ .../ide/intellij/launch/SimpleApp_SERVER.xml | 31 +++++++++++++++++++ .../launch/SimpleApp__enhance_only_.xml | 2 +- .../src/main/jettyconsole/isis-banner.pdn | Bin 69658 -> 64162 bytes .../src/main/jettyconsole/isis-banner.png | Bin 30776 -> 27310 bytes .../projects/basic/archetype.properties | 2 +- 35 files changed, 395 insertions(+), 106 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/8812424a/core/pom.xml ----------------------------------------------------------------------
