Merge branch 'ISIS-903'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3b1d857d Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3b1d857d Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3b1d857d Branch: refs/heads/master Commit: 3b1d857d5a322418710cd8eb4b04ef0dd09987f8 Parents: faf70c0 ab90620 Author: Dan Haywood <[email protected]> Authored: Wed Feb 18 14:10:52 2015 +0000 Committer: Dan Haywood <[email protected]> Committed: Wed Feb 18 14:10:52 2015 +0000 ---------------------------------------------------------------------- .../wicket/AuthenticatedWebSessionForIsis.java | 18 +- .../viewer/services/LocaleProviderWicket.java | 55 ++++ .../services/TranslationsResolverWicket.java | 93 +++++++ .../TranslationsResolverWicketTest.java | 37 +++ .../apache/isis/applib/events/AccessEvent.java | 5 +- .../isis/applib/events/ActionArgumentEvent.java | 5 +- .../applib/events/ActionInvocationEvent.java | 5 +- .../applib/events/ActionUsabilityEvent.java | 5 +- .../applib/events/ActionVisibilityEvent.java | 5 +- .../applib/events/CollectionAccessEvent.java | 5 +- .../applib/events/CollectionAddToEvent.java | 5 +- .../applib/events/CollectionMethodEvent.java | 6 +- .../events/CollectionRemoveFromEvent.java | 5 +- .../applib/events/CollectionUsabilityEvent.java | 5 +- .../events/CollectionVisibilityEvent.java | 5 +- .../isis/applib/events/InteractionEvent.java | 5 +- .../isis/applib/events/ObjectTitleEvent.java | 5 +- .../isis/applib/events/ObjectValidityEvent.java | 5 +- .../applib/events/ObjectVisibilityEvent.java | 5 +- .../isis/applib/events/ParseValueEvent.java | 5 +- .../isis/applib/events/PropertyAccessEvent.java | 5 +- .../isis/applib/events/PropertyModifyEvent.java | 5 +- .../applib/events/PropertyUsabilityEvent.java | 5 +- .../applib/events/PropertyVisibilityEvent.java | 5 +- .../isis/applib/events/ProposedHolderEvent.java | 5 +- .../isis/applib/events/UsabilityEvent.java | 5 +- .../isis/applib/events/ValidityEvent.java | 5 +- .../isis/applib/events/VisibilityEvent.java | 5 +- .../applib/fixturescripts/FixtureScript.java | 29 ++- .../actinvoc/ActionInvocationContext.java | 4 +- .../applib/services/i18n/LocaleProvider.java | 28 ++ .../services/i18n/TranslatableString.java | 259 +++++++++++++++++++ .../services/i18n/TranslationService.java | 80 ++++++ .../services/i18n/TranslationsResolver.java | 29 +++ .../services/i18n/TranslatableStringTest.java | 135 ++++++++++ .../integtestsupport/IsisSystemForTest.java | 50 +++- .../metamodel/facets/MethodFinderUtils.java | 15 ++ .../facets/SingleStringValueFacetAbstract.java | 6 +- .../method/ActionValidationFacetViaMethod.java | 18 +- .../ActionValidationFacetViaMethodFactory.java | 33 ++- .../all/i18n/DescribedAsFacetTranslated.java | 75 ++++++ .../facets/all/i18n/NamedFacetTranslated.java | 81 ++++++ .../facets/all/i18n/PluralFacetTranslated.java | 48 ++++ .../all/i18n/TranslationFacetFactory.java | 145 +++++++++++ ...nAddToRemoveFromAndValidateFacetFactory.java | 59 ++++- .../CollectionValidateAddToFacetViaMethod.java | 18 +- ...lectionValidateRemoveFromFacetViaMethod.java | 18 +- .../cssclassfa/CssClassFaFacetAbstract.java | 16 +- .../method/DisableForContextFacetViaMethod.java | 21 +- .../DisableForContextFacetViaMethodFactory.java | 29 ++- .../method/DisabledObjectFacetViaMethod.java | 25 +- .../DisabledObjectFacetViaMethodFactory.java | 35 ++- .../object/plural/PluralFacetAbstract.java | 7 +- .../plural/inferred/PluralFacetInferred.java | 2 +- .../methods/TitleFacetViaMethodsFactory.java | 28 +- .../title/methods/TitleFacetViaTitleMethod.java | 20 +- .../method/ValidateObjectFacetMethod.java | 18 +- .../ValidateObjectFacetMethodFactory.java | 24 +- .../PropertyAutoCompleteFacetMethodFactory.java | 2 +- .../PropertyChoicesFacetViaMethodFactory.java | 2 +- .../method/PropertyValidateFacetViaMethod.java | 18 +- .../PropertyValidateFacetViaMethodFactory.java | 34 ++- .../services/ServicesInjectorDefault.java | 36 +-- .../specloader/ObjectReflectorDefault.java | 28 +- .../dflt/ObjectSpecificationDefault.java | 29 ++- .../dflt/ProgrammingModelFacetsJava5.java | 13 +- .../actions/ActionMethodsFacetFactoryTest.java | 22 ++ .../ActionLayoutAnnotationFacetFactoryTest.java | 4 +- .../CollectionFieldMethodsFacetFactoryTest.java | 24 ++ .../cssclassfa/CssClassFaFacetAbstractTest.java | 6 +- .../ObjectDisabledMethodFacetFactoryTest.java | 20 +- .../ident/title/TitleFacetViaMethodTest.java | 10 +- .../title/TitleFacetViaMethodsFactoryTest.java | 22 +- .../ObjectValidMethodFacetFactoryTest.java | 20 ++ .../PropertyMethodsFacetFactoryTest.java | 24 ++ ...otationFacetFactoryTest_refineMetaModel.java | 12 +- .../persistence/adapter/PojoAdapter.java | 6 +- .../runtime/services/ServicesInstaller.java | 3 +- .../core/runtime/services/i18n/po/Block.java | 114 ++++++++ .../services/i18n/po/ContextAndMsgId.java | 98 +++++++ .../runtime/services/i18n/po/PoAbstract.java | 45 ++++ .../core/runtime/services/i18n/po/PoReader.java | 210 +++++++++++++++ .../core/runtime/services/i18n/po/PoWriter.java | 138 ++++++++++ .../services/i18n/po/TranslationServicePo.java | 162 ++++++++++++ .../i18n/po/TranslationServicePoMenu.java | 118 +++++++++ .../core/webapp/IsisWebAppBootstrapper.java | 6 +- .../IsisConfigurationForJdoIntegTests.java | 2 + .../runtime/services/i18n/po/PoReaderTest.java | 212 +++++++++++++++ ...rapperFactoryAbstractTest_wrappedObject.java | 4 +- .../src/main/java/dom/simple/SimpleObject.java | 49 +++- .../java/dom/simple/SimpleObject.layout.json | 52 ++-- .../simple/SimpleObjectsFixturesService.java | 18 +- .../simple/objects/SimpleObjectAbstract.java | 36 --- .../simple/objects/SimpleObjectCreate.java | 70 +++++ .../simple/objects/SimpleObjectForBar.java | 31 --- .../simple/objects/SimpleObjectForBaz.java | 31 --- .../simple/objects/SimpleObjectForFoo.java | 31 --- .../simple/scenario/RecreateSimpleObjects.java | 91 +++++++ .../simple/scenario/SimpleObjectsFixture.java | 45 ---- .../application/simpleapp/integtests/.gitignore | 1 + .../simpleapp/integtests/logging.properties | 8 + .../integration/SimpleAppSystemInitializer.java | 9 +- .../integration/glue/BootstrappingGlue.java | 11 - .../integration/glue/CatalogOfFixturesGlue.java | 19 +- .../glue/InMemoryDBForSimpleApp.java | 40 --- .../glue/simple/SimpleObjectGlue.java | 46 ---- .../SimpleObjectSpec_listAllAndCreate.feature | 11 - .../tests/smoke/SimpleObjectIntegTest.java | 132 ++++++++++ .../tests/smoke/SimpleObjectTest.java | 82 ------ .../tests/smoke/SimpleObjectsIntegTest.java | 146 +++++++++++ .../tests/smoke/SimpleObjectsTest.java | 148 ----------- .../src/main/webapp/WEB-INF/isis.properties | 30 ++- .../src/main/webapp/WEB-INF/logging.properties | 8 +- .../src/main/webapp/WEB-INF/translations.po | 144 +++++++++++ 114 files changed, 3630 insertions(+), 782 deletions(-) ----------------------------------------------------------------------
