You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/04/23 15:36:13 UTC

[03/20] isis git commit: Merge branch 'master' of https://github.com/apache/isis

Merge branch 'master' of https://github.com/apache/isis


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b3791b17
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b3791b17
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b3791b17

Branch: refs/heads/master
Commit: b3791b17f9b825119dec4492fe69984b986929fc
Parents: 4ca2923 867188b
Author: Jörg Rade <jo...@kuehne-nagel.com>
Authored: Thu Apr 2 13:50:50 2015 +0200
Committer: Jörg Rade <jo...@kuehne-nagel.com>
Committed: Thu Apr 2 13:50:50 2015 +0200

----------------------------------------------------------------------
 component/viewer/scimpi/NOTICE                  |   7 -
 component/viewer/scimpi/dispatcher/pom.xml      |  92 --
 .../dispatcher/AbstractElementProcessor.java    |  55 --
 .../dispatcher/AbstractObjectProcessor.java     |  53 --
 .../isis/viewer/scimpi/dispatcher/Action.java   |  37 -
 .../viewer/scimpi/dispatcher/BlockContent.java  |  23 -
 .../scimpi/dispatcher/DispatchException.java    |  40 -
 .../viewer/scimpi/dispatcher/Dispatcher.java    | 484 -----------
 .../dispatcher/ElementContentProcessor.java     |  24 -
 .../scimpi/dispatcher/ElementProcessor.java     |  30 -
 .../viewer/scimpi/dispatcher/ErrorCollator.java | 148 ----
 .../scimpi/dispatcher/ForbiddenException.java   |  68 --
 .../isis/viewer/scimpi/dispatcher/Names.java    |  91 --
 .../scimpi/dispatcher/NotLoggedInException.java |  31 -
 .../scimpi/dispatcher/ResolveFieldUtil.java     |  71 --
 .../scimpi/dispatcher/ScimpiException.java      |  44 -
 .../dispatcher/ScimpiNotFoundException.java     |  41 -
 .../scimpi/dispatcher/TagOrderException.java    |  31 -
 .../viewer/scimpi/dispatcher/UserManager.java   |  91 --
 .../isis/viewer/scimpi/dispatcher/Util.java     | 105 ---
 .../scimpi/dispatcher/action/ActionAction.java  | 268 ------
 .../scimpi/dispatcher/action/Attributes.java    | 131 ---
 .../dispatcher/action/PropertyException.java    |  44 -
 .../action/RequiredPropertyException.java       |  43 -
 .../context/DefaultOidObjectMapping.java        | 511 -----------
 .../context/DefaultVersionMapping.java          |  40 -
 .../context/IndirectObjectMapping.java          | 204 -----
 .../scimpi/dispatcher/context/Mapping.java      | 205 -----
 .../dispatcher/context/ObjectMapping.java       |  42 -
 .../dispatcher/context/RequestContext.java      | 857 -------------------
 .../dispatcher/context/VersionMapping.java      |  30 -
 .../scimpi/dispatcher/debug/DebugAction.java    | 257 ------
 .../dispatcher/debug/DebugHtmlWriter.java       |  45 -
 .../dispatcher/debug/DebugUserAction.java       |  71 --
 .../scimpi/dispatcher/debug/DebugUsers.java     |  98 ---
 .../scimpi/dispatcher/debug/DebugUsersView.java |  50 --
 .../scimpi/dispatcher/debug/ErrorDetails.java   |  35 -
 .../scimpi/dispatcher/debug/ErrorMessage.java   |  35 -
 .../scimpi/dispatcher/debug/ErrorReference.java |  35 -
 .../scimpi/dispatcher/debug/LogAction.java      |  75 --
 .../scimpi/dispatcher/edit/EditAction.java      | 266 ------
 .../scimpi/dispatcher/edit/FieldEditState.java  |  57 --
 .../scimpi/dispatcher/edit/FormState.java       |  67 --
 .../scimpi/dispatcher/edit/RemoveAction.java    | 114 ---
 .../scimpi/dispatcher/logon/DomainSession.java  |  42 -
 .../scimpi/dispatcher/logon/LogonAction.java    | 175 ----
 .../scimpi/dispatcher/logon/LogoutAction.java   |  70 --
 .../scimpi/dispatcher/processor/Encoder.java    |  26 -
 .../dispatcher/processor/HtmlFileParser.java    | 205 -----
 .../scimpi/dispatcher/processor/PageWriter.java |  28 -
 .../dispatcher/processor/ProcessorLookup.java   | 256 ------
 .../scimpi/dispatcher/processor/Request.java    | 324 -------
 .../dispatcher/processor/SimpleEncoder.java     |  32 -
 .../processor/TagProcessingException.java       |  59 --
 .../scimpi/dispatcher/util/MethodsUtils.java    | 154 ----
 .../viewer/scimpi/dispatcher/view/HelpLink.java |  72 --
 .../viewer/scimpi/dispatcher/view/History.java  | 150 ----
 .../scimpi/dispatcher/view/HtmlSnippet.java     |  51 --
 .../viewer/scimpi/dispatcher/view/Snippet.java  |  27 -
 .../viewer/scimpi/dispatcher/view/SwfTag.java   |  90 --
 .../scimpi/dispatcher/view/VersionNumber.java   |  70 --
 .../dispatcher/view/action/ActionButton.java    | 237 -----
 .../dispatcher/view/action/ActionContent.java   |  77 --
 .../dispatcher/view/action/ActionForm.java      | 262 ------
 .../dispatcher/view/action/ActionLink.java      | 179 ----
 .../view/action/CreateFormParameter.java        |  43 -
 .../scimpi/dispatcher/view/action/Methods.java  | 192 -----
 .../dispatcher/view/action/Parameter.java       |  47 -
 .../dispatcher/view/action/RunAction.java       |  87 --
 .../scimpi/dispatcher/view/action/Services.java |  67 --
 .../dispatcher/view/collection/Collection.java  |  93 --
 .../scimpi/dispatcher/view/debug/Debug.java     | 479 -----------
 .../dispatcher/view/debug/DebugAccessCheck.java |  40 -
 .../view/debug/DebugCollectionView.java         | 110 ---
 .../dispatcher/view/debug/DebugObjectView.java  | 136 ---
 .../dispatcher/view/debug/DebuggerLink.java     |  53 --
 .../dispatcher/view/debug/Diagnostics.java      |  81 --
 .../scimpi/dispatcher/view/debug/Log.java       |  46 -
 .../scimpi/dispatcher/view/debug/LogLevel.java  |  55 --
 .../scimpi/dispatcher/view/debug/Members.java   | 109 ---
 .../scimpi/dispatcher/view/debug/ShowDebug.java |  41 -
 .../dispatcher/view/debug/Specification.java    | 119 ---
 .../dispatcher/view/debug/ThrowException.java   |  43 -
 .../view/display/AbstractFormView.java          | 142 ---
 .../view/display/AbstractTableView.java         | 149 ----
 .../dispatcher/view/display/AddMessage.java     |  44 -
 .../dispatcher/view/display/AddWarning.java     |  44 -
 .../scimpi/dispatcher/view/display/Errors.java  |  65 --
 .../dispatcher/view/display/Feedback.java       |  46 -
 .../dispatcher/view/display/FieldLabel.java     |  77 --
 .../dispatcher/view/display/FieldValue.java     | 118 ---
 .../dispatcher/view/display/GetField.java       | 103 ---
 .../dispatcher/view/display/IncludeObject.java  | 107 ---
 .../dispatcher/view/display/ListView.java       |  94 --
 .../dispatcher/view/display/LongFormView.java   |  84 --
 .../dispatcher/view/display/Messages.java       |  59 --
 .../dispatcher/view/display/SelectedObject.java |  55 --
 .../dispatcher/view/display/ShortFormView.java  |  36 -
 .../dispatcher/view/display/TableBlock.java     |  86 --
 .../dispatcher/view/display/TableBuilder.java   |  92 --
 .../dispatcher/view/display/TableCell.java      |  94 --
 .../view/display/TableContentWriter.java        |  39 -
 .../dispatcher/view/display/TableEmpty.java     |  53 --
 .../dispatcher/view/display/TableHeader.java    |  39 -
 .../dispatcher/view/display/TableRow.java       |  49 --
 .../dispatcher/view/display/TableView.java      | 329 -------
 .../scimpi/dispatcher/view/display/Title.java   |  68 --
 .../dispatcher/view/display/Warnings.java       |  58 --
 .../scimpi/dispatcher/view/edit/EditObject.java | 319 -------
 .../dispatcher/view/edit/FieldFactory.java      | 105 ---
 .../scimpi/dispatcher/view/edit/FormEntry.java  |  44 -
 .../scimpi/dispatcher/view/edit/FormField.java  |  44 -
 .../dispatcher/view/edit/FormFieldBlock.java    |  68 --
 .../dispatcher/view/edit/HiddenField.java       |  48 --
 .../dispatcher/view/edit/RadioListField.java    |  70 --
 .../scimpi/dispatcher/view/edit/Selector.java   | 158 ----
 .../dispatcher/view/field/ExcludeField.java     |  39 -
 .../dispatcher/view/field/IncludeField.java     |  39 -
 .../dispatcher/view/field/InclusionList.java    |  89 --
 .../scimpi/dispatcher/view/field/LinkField.java |  45 -
 .../view/field/LinkedFieldsBlock.java           |  47 -
 .../dispatcher/view/field/LinkedObject.java     |  58 --
 .../dispatcher/view/form/HiddenInputField.java  |  41 -
 .../dispatcher/view/form/HtmlFormBuilder.java   | 214 -----
 .../scimpi/dispatcher/view/form/InputField.java | 224 -----
 .../scimpi/dispatcher/view/logon/Logoff.java    |  38 -
 .../scimpi/dispatcher/view/logon/Logon.java     | 126 ---
 .../dispatcher/view/logon/RestrictAccess.java   |  41 -
 .../scimpi/dispatcher/view/logon/Secure.java    |  45 -
 .../scimpi/dispatcher/view/logon/User.java      |  77 --
 .../view/simple/AbstractConditionalBlock.java   | 565 ------------
 .../dispatcher/view/simple/AbstractLink.java    | 121 ---
 .../dispatcher/view/simple/BlockDefine.java     |  42 -
 .../scimpi/dispatcher/view/simple/BlockUse.java |  46 -
 .../scimpi/dispatcher/view/simple/Commit.java   |  45 -
 .../dispatcher/view/simple/ContentTag.java      |  36 -
 .../dispatcher/view/simple/CookieValue.java     |  46 -
 .../dispatcher/view/simple/DefaultValue.java    |  52 --
 .../scimpi/dispatcher/view/simple/EditLink.java |  71 --
 .../dispatcher/view/simple/EndSession.java      |  36 -
 .../scimpi/dispatcher/view/simple/Forward.java  |  37 -
 .../dispatcher/view/simple/GetCookie.java       |  39 -
 .../scimpi/dispatcher/view/simple/Import.java   |  37 -
 .../view/simple/InitializeFromCookie.java       |  80 --
 .../view/simple/InitializeFromResult.java       |  77 --
 .../dispatcher/view/simple/Localization.java    |  64 --
 .../scimpi/dispatcher/view/simple/Mark.java     |  43 -
 .../dispatcher/view/simple/NewActionLink.java   |  62 --
 .../dispatcher/view/simple/ObjectLink.java      |  68 --
 .../dispatcher/view/simple/PageTitle.java       |  35 -
 .../scimpi/dispatcher/view/simple/Redirect.java |  37 -
 .../dispatcher/view/simple/RemoveElement.java   | 140 ---
 .../scimpi/dispatcher/view/simple/ScopeTag.java |  51 --
 .../dispatcher/view/simple/SetCookie.java       |  53 --
 .../view/simple/SetCookieFromField.java         |  55 --
 .../view/simple/SetFieldFromCookie.java         |  52 --
 .../dispatcher/view/simple/SetLocalization.java |  61 --
 .../dispatcher/view/simple/SimpleButton.java    |  39 -
 .../dispatcher/view/simple/StartSession.java    |  36 -
 .../dispatcher/view/simple/TemplateTag.java     |  40 -
 .../scimpi/dispatcher/view/simple/Unless.java   |  41 -
 .../scimpi/dispatcher/view/simple/Variable.java |  64 --
 .../scimpi/dispatcher/view/simple/When.java     |  41 -
 .../dispatcher/view/value/ActionName.java       |  47 -
 .../dispatcher/view/value/CountElements.java    |  54 --
 .../dispatcher/view/value/ElementType.java      |  61 --
 .../scimpi/dispatcher/view/value/FieldName.java |  65 --
 .../dispatcher/view/value/ParameterName.java    |  62 --
 .../dispatcher/view/value/TitleString.java      |  68 --
 .../scimpi/dispatcher/view/value/Type.java      |  57 --
 component/viewer/scimpi/pom.xml                 | 131 ---
 component/viewer/scimpi/servlet/pom.xml         |  78 --
 .../scimpi/servlet/DispatchException.java       |  42 -
 .../scimpi/servlet/DispatcherServlet.java       |  89 --
 .../isis/viewer/scimpi/servlet/ImageLookup.java | 174 ----
 .../scimpi/servlet/ServletRequestContext.java   | 373 --------
 .../appended-resources/supplemental-models.xml  | 106 ---
 component/viewer/scimpi/tck/pom.xml             |  98 ---
 .../tck/src/main/resources/images/Default.png   | Bin 3016 -> 0 bytes
 .../main/webapp/ToDoItem/edit-selector.shtml    |  29 -
 .../src/main/webapp/ToDoItem/object-link.shtml  |  32 -
 .../src/main/webapp/ToDoItem/object-orig.shtml  |  31 -
 .../tck/src/main/webapp/ToDoItem/object.shtml   |  34 -
 .../tck/src/main/webapp/ToDoItem/object2.shtml  |  31 -
 .../tck/src/main/webapp/WEB-INF/isis.properties |  54 --
 .../src/main/webapp/WEB-INF/logging.properties  |  30 -
 .../src/main/webapp/WEB-INF/security_file.allow |  16 -
 .../main/webapp/WEB-INF/security_file.passwords |  20 -
 .../scimpi/tck/src/main/webapp/WEB-INF/web.xml  |  55 --
 .../scimpi/tck/src/main/webapp/debug.shtml      |  23 -
 .../tck/src/main/webapp/generic/action.shtml    |  27 -
 .../src/main/webapp/generic/collection.shtml    |  26 -
 .../tck/src/main/webapp/generic/edit.shtml      |  26 -
 .../tck/src/main/webapp/generic/object.shtml    |  28 -
 .../scimpi/tck/src/main/webapp/images/Claim.png | Bin 2708 -> 0 bytes
 .../tck/src/main/webapp/images/ClaimItem.png    | Bin 2316 -> 0 bytes
 .../tck/src/main/webapp/images/Employee.png     | Bin 1986 -> 0 bytes
 .../tck/src/main/webapp/images/banner-bg.png    | Bin 384 -> 0 bytes
 .../tck/src/main/webapp/images/banner.png       | Bin 18951 -> 0 bytes
 .../scimpi/tck/src/main/webapp/images/logo.png  | Bin 7183 -> 0 bytes
 .../scimpi/tck/src/main/webapp/index.shtml      |  25 -
 .../scimpi/tck/src/main/webapp/login.shtml      |  23 -
 .../scimpi/tck/src/main/webapp/style/screen.css | 394 ---------
 .../tck/src/main/webapp/style/template.shtml    |  47 -
 .../isis/applib/AbstractContainedObject.java    |  17 +
 .../isis/applib/ApplicationException.java       |   9 +
 .../isis/applib/DomainObjectContainer.java      |  67 +-
 .../isis/applib/NonRecoverableException.java    |  64 +-
 .../isis/applib/RecoverableException.java       |  64 +-
 .../apache/isis/applib/annotation/Action.java   |  21 +-
 .../fixtures/switchuser/SwitchUserService.java  |   5 +
 .../switchuser/SwitchUserServiceAware.java      |   9 +-
 .../applib/fixturescripts/FixtureScript.java    |  12 +-
 .../applib/fixturescripts/FixtureScripts.java   |  60 +-
 .../apache/isis/applib/services/HasLongId.java  |  25 -
 .../services/eventbus/AbstractDomainEvent.java  |  97 ++-
 .../eventbus/AbstractInteractionEvent.java      |   5 +-
 .../eventbus/EventBusImplementation.java        |  33 +
 .../services/eventbus/EventBusService.java      |  41 +-
 .../exceprecog/ExceptionRecognizerAbstract.java |  14 +
 .../ExceptionRecognizerComposite.java           |  53 +-
 .../exceprecog/TranslatableException.java       |  52 ++
 .../services/guice/GuiceBeanProvider.java       |   5 +-
 .../services/i18n/TranslatableString.java       |  10 +-
 .../services/linking/DeepLinkService.java       |   7 +
 .../isis/applib/services/sudo/SudoService.java  |  66 ++
 .../ExceptionRecognizerCompositeTest.java       |  29 +-
 .../ExceptionRecognizerTranslate.java           |  50 ++
 .../IntegrationTestAbstract.java                |  41 +-
 core/metamodel/pom.xml                          |   6 +-
 .../facetdecorator/FacetDecoratorSet.java       |   4 +-
 .../metamodel/facets/DomainEventHelper.java     | 103 ++-
 .../ActionDomainEventFacetAbstract.java         |  64 +-
 ...onInvocationFacetForDomainEventAbstract.java |  58 +-
 .../facets/all/i18n/NamedFacetTranslated.java   |   2 -
 .../all/i18n/TranslationFacetFactory.java       |   2 -
 ...ionAddToFacetForDomainEventFromAbstract.java |  68 +-
 .../CollectionDomainEventFacetAbstract.java     |  55 +-
 ...moveFromFacetForDomainEventFromAbstract.java |  63 +-
 .../facets/fallback/FallbackFacetFactory.java   |  31 +-
 .../facets/fallback/NamedFacetDefault.java      |  33 +
 .../facets/fallback/NamedFacetNone.java         |   6 +-
 .../members/disabled/DisabledFacetAbstract.java |   7 +
 .../layout/DisabledFacetFromProperties.java     |   3 +-
 .../members/order/MemberOrderFacetAbstract.java |  35 +-
 .../annotprop/MemberOrderFacetAnnotation.java   |   8 +-
 .../annotprop/MemberOrderFacetFactory.java      |  31 +-
 .../annotprop/MemberOrderFacetProperties.java   |  16 +-
 .../enums/EnumValueSemanticsProvider.java       |  10 +-
 .../DomainObjectAnnotationFacetFactory.java     |  10 +
 ...FacetForJdoPersistenceCapableAnnotation.java |  50 ++
 ...ropertyClearFacetForDomainEventAbstract.java |  54 +-
 .../PropertyDomainEventFacetAbstract.java       |  46 +-
 ...opertySetterFacetForDomainEventAbstract.java |  55 +-
 .../PropertyLayoutFacetFactory.java             |   4 +-
 .../metamodel/progmodel/ProgrammingModel.java   |   7 +-
 .../progmodel/ProgrammingModelAbstract.java     |  40 +-
 .../container/DomainObjectContainerDefault.java |  83 +-
 .../specloader/ObjectReflectorDefault.java      |  41 +-
 .../specimpl/ObjectMemberAbstract.java          |   8 +-
 .../specimpl/ObjectSpecificationAbstract.java   |   4 +-
 ...ersistenceCapableAnnotationFacetFactory.java |   5 +
 .../JdoPersistenceCapableFacet.java             |  13 +-
 .../JdoPersistenceCapableFacetAbstract.java     |  15 +-
 .../JdoPersistenceCapableFacetAnnotation.java   |   8 +-
 .../JdoPersistenceCapableFacetImpl.java         |   8 +-
 .../ordering/memberorder/DeweyOrderSetTest.java | 120 +--
 .../MemberOrderAnnotationFacetFactoryTest.java  |  42 +
 .../memberorder/MemberOrderComparatorTest.java  |  90 +-
 core/pom.xml                                    |  30 +-
 core/runtime/pom.xml                            |  13 +-
 .../runtime/fixtures/SwitchUserServiceImpl.java |  21 +-
 .../services/email/EmailServiceDefault.java     |  17 +-
 .../EventBusImplementationAbstract.java         |  81 ++
 .../eventbus/EventBusServiceDefault.java        | 121 ++-
 .../EventBusImplementationForAxonSimple.java    |  92 ++
 .../adapter/EventBusImplementationForGuava.java |  61 ++
 .../core/runtime/services/i18n/po/PoReader.java |  42 +-
 .../services/i18n/po/TranslationServicePo.java  |  28 +
 .../i18n/po/TranslationServicePoMenu.java       |  48 ++
 .../overrideuser/SudoServiceDefault.java        | 110 +++
 .../system/IsisSystemFixturesHookAbstract.java  |  49 +-
 .../IdentifierGeneratorForDataNucleus.java      |   8 +-
 .../system/transaction/IsisTransaction.java     | 171 ++--
 .../jdo/datanucleus/DataNucleusObjectStore.java |  29 +-
 ...ataNucleusPersistenceMechanismInstaller.java |   3 +-
 .../jdo/datanucleus/JDOStateManagerForIsis.java |   4 +-
 .../persistence/spi/JdoObjectIdSerializer.java  | 204 +++--
 .../service/eventbus/EventBusServiceJdo.java    |   6 +-
 core/security-shiro/pom.xml                     |   7 +-
 .../shiro/ShiroAuthenticatorOrAuthorizor.java   |   4 +
 .../scenarios/ScenarioExecution.java            |   4 +
 core/viewer-restfulobjects-applib/pom.xml       |   7 +
 .../restfulobjects/applib/util/JsonMapper.java  | 100 +--
 .../applib/JsonRepresentationTest_size.java     |   2 +-
 .../RepresentationServiceForRestfulObjects.java |   5 +-
 core/viewer-restfulobjects-server/pom.xml       |   2 +-
 .../DomainServiceResourceServerside.java        |  26 +-
 core/viewer-wicket/impl/pom.xml                 |   4 +-
 .../wicket/viewer/IsisWicketApplication.java    |   3 +-
 .../viewer/services/DeepLinkServiceWicket.java  |  11 +-
 .../services/GuiceBeanProviderWicket.java       |  27 +-
 .../viewer/services/LocaleProviderWicket.java   |   7 +-
 .../services/TranslationsResolverWicket.java    |   2 +-
 .../viewer/wicket/model/models/EntityModel.java |   2 +-
 core/viewer-wicket/pom.xml                      |   2 +-
 core/viewer-wicket/ui/pom.xml                   |   2 +-
 .../actionprompt/ActionPromptHeaderPanel.html   |   2 +-
 .../actionprompt/ActionPromptModalWindow.java   |  10 +
 ...llectionContentsAsAjaxTablePanelFactory.java |   3 +-
 .../CollectionContentsAsSummaryFactory.java     |   3 +-
 ...lectionContentsAsUnresolvedPanelFactory.java |   3 +-
 .../entity/EntityComponentFactoryAbstract.java  |   8 +-
 .../scalars/datepicker/DateTimeConfig.java      |  15 +-
 .../datepicker/TextFieldWithDatePicker.java     |   6 +-
 .../components/widgets/bootstrap/FormGroup.java |  21 +-
 .../ui/components/widgets/favicon/Favicon.java  |  43 +
 .../linkandlabel/ActionLinkFactoryAbstract.java |  40 -
 .../viewer/wicket/ui/errors/ExceptionModel.java |   9 +-
 .../wicket/ui/errors/StackTraceDetail.java      |  11 +-
 .../ui/pages/EmailVerificationUrlService.java   |  13 +-
 .../viewer/wicket/ui/pages/PageAbstract.html    |   1 +
 .../viewer/wicket/ui/pages/PageAbstract.java    |  17 +-
 .../viewer/wicket/ui/pages/about/AboutPage.java |   2 +-
 .../EmailVerificationUrlServiceDefault.java     |  18 +-
 .../ui/pages/actionprompt/ActionPromptPage.java |   4 +-
 .../wicket/ui/pages/bootstrap-overrides.css     |   4 +
 .../wicket/ui/pages/entity/EntityPage.html      |   4 +-
 .../wicket/ui/pages/entity/EntityPage.java      |  41 +-
 .../viewer/wicket/ui/pages/error/ErrorPage.java |   2 +-
 .../viewer/wicket/ui/pages/home/HomePage.java   |   2 +-
 .../ui/pages/jquery.isis.wicket.viewer.js       |   9 +-
 .../StandaloneCollectionPage.java               |   2 +-
 .../viewer/wicket/ui/pages/value/ValuePage.java |   2 +-
 .../ui/pages/voidreturn/VoidReturnPage.java     |   2 +-
 core/webserver/pom.xml                          |  15 +-
 .../apache/isis/core/webserver/WebServer.java   |  12 +-
 .../core/webserver/WebServerBootstrapper.java   |  21 +-
 .../dom/modules/simple/SimpleObject.java        |  10 +-
 .../dom/modules/simple/SimpleObjects.java       |   7 +
 .../modules/simple/SimpleObjectsTearDown.java   |   2 +-
 .../modules/simple/SimpleObjectIntegTest.java   |  16 +-
 .../modules/simple/SimpleObjectsIntegTest.java  |  15 +-
 example/application/simpleapp/webapp/pom.xml    |  27 +-
 .../src/main/webapp/WEB-INF/translations-en.po  | 213 +++++
 .../main/webapp/WEB-INF/translations-en_GB.po   | 155 ----
 .../src/main/webapp/WEB-INF/translations-es.po  | 208 +++++
 .../src/main/webapp/WEB-INF/translations-nl.po  | 208 +++++
 .../src/main/webapp/WEB-INF/translations.po     |  68 +-
 .../dom/modules/simple/SimpleObject.java        |  10 +-
 .../dom/modules/simple/SimpleObjects.java       |   7 +
 .../modules/simple/SimpleObjectsTearDown.java   |   2 +-
 .../modules/simple/SimpleObjectIntegTest.java   |  16 +-
 .../modules/simple/SimpleObjectsIntegTest.java  |  15 +-
 .../archetype-resources/webapp/pom.xml          |  27 +-
 .../src/main/webapp/WEB-INF/translations-en.po  | 213 +++++
 .../main/webapp/WEB-INF/translations-en_GB.po   | 155 ----
 .../src/main/webapp/WEB-INF/translations-es.po  | 208 +++++
 .../src/main/webapp/WEB-INF/translations-nl.po  | 208 +++++
 .../src/main/webapp/WEB-INF/translations.po     |  68 +-
 .../projects/basic/archetype.properties         |   2 +-
 mothballed/component/viewer/scimpi/NOTICE       |   7 +
 .../component/viewer/scimpi/dispatcher/pom.xml  |  92 ++
 .../dispatcher/AbstractElementProcessor.java    |  55 ++
 .../dispatcher/AbstractObjectProcessor.java     |  53 ++
 .../isis/viewer/scimpi/dispatcher/Action.java   |  37 +
 .../viewer/scimpi/dispatcher/BlockContent.java  |  23 +
 .../scimpi/dispatcher/DispatchException.java    |  40 +
 .../viewer/scimpi/dispatcher/Dispatcher.java    | 484 +++++++++++
 .../dispatcher/ElementContentProcessor.java     |  24 +
 .../scimpi/dispatcher/ElementProcessor.java     |  30 +
 .../viewer/scimpi/dispatcher/ErrorCollator.java | 148 ++++
 .../scimpi/dispatcher/ForbiddenException.java   |  68 ++
 .../isis/viewer/scimpi/dispatcher/Names.java    |  91 ++
 .../scimpi/dispatcher/NotLoggedInException.java |  31 +
 .../scimpi/dispatcher/ResolveFieldUtil.java     |  71 ++
 .../scimpi/dispatcher/ScimpiException.java      |  44 +
 .../dispatcher/ScimpiNotFoundException.java     |  41 +
 .../scimpi/dispatcher/TagOrderException.java    |  31 +
 .../viewer/scimpi/dispatcher/UserManager.java   |  91 ++
 .../isis/viewer/scimpi/dispatcher/Util.java     | 105 +++
 .../scimpi/dispatcher/action/ActionAction.java  | 268 ++++++
 .../scimpi/dispatcher/action/Attributes.java    | 131 +++
 .../dispatcher/action/PropertyException.java    |  44 +
 .../action/RequiredPropertyException.java       |  43 +
 .../context/DefaultOidObjectMapping.java        | 511 +++++++++++
 .../context/DefaultVersionMapping.java          |  40 +
 .../context/IndirectObjectMapping.java          | 204 +++++
 .../scimpi/dispatcher/context/Mapping.java      | 205 +++++
 .../dispatcher/context/ObjectMapping.java       |  42 +
 .../dispatcher/context/RequestContext.java      | 857 +++++++++++++++++++
 .../dispatcher/context/VersionMapping.java      |  30 +
 .../scimpi/dispatcher/debug/DebugAction.java    | 257 ++++++
 .../dispatcher/debug/DebugHtmlWriter.java       |  45 +
 .../dispatcher/debug/DebugUserAction.java       |  71 ++
 .../scimpi/dispatcher/debug/DebugUsers.java     |  98 +++
 .../scimpi/dispatcher/debug/DebugUsersView.java |  50 ++
 .../scimpi/dispatcher/debug/ErrorDetails.java   |  35 +
 .../scimpi/dispatcher/debug/ErrorMessage.java   |  35 +
 .../scimpi/dispatcher/debug/ErrorReference.java |  35 +
 .../scimpi/dispatcher/debug/LogAction.java      |  75 ++
 .../scimpi/dispatcher/edit/EditAction.java      | 266 ++++++
 .../scimpi/dispatcher/edit/FieldEditState.java  |  57 ++
 .../scimpi/dispatcher/edit/FormState.java       |  67 ++
 .../scimpi/dispatcher/edit/RemoveAction.java    | 114 +++
 .../scimpi/dispatcher/logon/DomainSession.java  |  42 +
 .../scimpi/dispatcher/logon/LogonAction.java    | 175 ++++
 .../scimpi/dispatcher/logon/LogoutAction.java   |  70 ++
 .../scimpi/dispatcher/processor/Encoder.java    |  26 +
 .../dispatcher/processor/HtmlFileParser.java    | 205 +++++
 .../scimpi/dispatcher/processor/PageWriter.java |  28 +
 .../dispatcher/processor/ProcessorLookup.java   | 256 ++++++
 .../scimpi/dispatcher/processor/Request.java    | 324 +++++++
 .../dispatcher/processor/SimpleEncoder.java     |  32 +
 .../processor/TagProcessingException.java       |  59 ++
 .../scimpi/dispatcher/util/MethodsUtils.java    | 154 ++++
 .../viewer/scimpi/dispatcher/view/HelpLink.java |  72 ++
 .../viewer/scimpi/dispatcher/view/History.java  | 150 ++++
 .../scimpi/dispatcher/view/HtmlSnippet.java     |  51 ++
 .../viewer/scimpi/dispatcher/view/Snippet.java  |  27 +
 .../viewer/scimpi/dispatcher/view/SwfTag.java   |  90 ++
 .../scimpi/dispatcher/view/VersionNumber.java   |  70 ++
 .../dispatcher/view/action/ActionButton.java    | 237 +++++
 .../dispatcher/view/action/ActionContent.java   |  77 ++
 .../dispatcher/view/action/ActionForm.java      | 262 ++++++
 .../dispatcher/view/action/ActionLink.java      | 179 ++++
 .../view/action/CreateFormParameter.java        |  43 +
 .../scimpi/dispatcher/view/action/Methods.java  | 192 +++++
 .../dispatcher/view/action/Parameter.java       |  47 +
 .../dispatcher/view/action/RunAction.java       |  87 ++
 .../scimpi/dispatcher/view/action/Services.java |  67 ++
 .../dispatcher/view/collection/Collection.java  |  93 ++
 .../scimpi/dispatcher/view/debug/Debug.java     | 479 +++++++++++
 .../dispatcher/view/debug/DebugAccessCheck.java |  40 +
 .../view/debug/DebugCollectionView.java         | 110 +++
 .../dispatcher/view/debug/DebugObjectView.java  | 136 +++
 .../dispatcher/view/debug/DebuggerLink.java     |  53 ++
 .../dispatcher/view/debug/Diagnostics.java      |  81 ++
 .../scimpi/dispatcher/view/debug/Log.java       |  46 +
 .../scimpi/dispatcher/view/debug/LogLevel.java  |  55 ++
 .../scimpi/dispatcher/view/debug/Members.java   | 109 +++
 .../scimpi/dispatcher/view/debug/ShowDebug.java |  41 +
 .../dispatcher/view/debug/Specification.java    | 119 +++
 .../dispatcher/view/debug/ThrowException.java   |  43 +
 .../view/display/AbstractFormView.java          | 142 +++
 .../view/display/AbstractTableView.java         | 149 ++++
 .../dispatcher/view/display/AddMessage.java     |  44 +
 .../dispatcher/view/display/AddWarning.java     |  44 +
 .../scimpi/dispatcher/view/display/Errors.java  |  65 ++
 .../dispatcher/view/display/Feedback.java       |  46 +
 .../dispatcher/view/display/FieldLabel.java     |  77 ++
 .../dispatcher/view/display/FieldValue.java     | 118 +++
 .../dispatcher/view/display/GetField.java       | 103 +++
 .../dispatcher/view/display/IncludeObject.java  | 107 +++
 .../dispatcher/view/display/ListView.java       |  94 ++
 .../dispatcher/view/display/LongFormView.java   |  84 ++
 .../dispatcher/view/display/Messages.java       |  59 ++
 .../dispatcher/view/display/SelectedObject.java |  55 ++
 .../dispatcher/view/display/ShortFormView.java  |  36 +
 .../dispatcher/view/display/TableBlock.java     |  86 ++
 .../dispatcher/view/display/TableBuilder.java   |  92 ++
 .../dispatcher/view/display/TableCell.java      |  94 ++
 .../view/display/TableContentWriter.java        |  39 +
 .../dispatcher/view/display/TableEmpty.java     |  53 ++
 .../dispatcher/view/display/TableHeader.java    |  39 +
 .../dispatcher/view/display/TableRow.java       |  49 ++
 .../dispatcher/view/display/TableView.java      | 329 +++++++
 .../scimpi/dispatcher/view/display/Title.java   |  68 ++
 .../dispatcher/view/display/Warnings.java       |  58 ++
 .../scimpi/dispatcher/view/edit/EditObject.java | 319 +++++++
 .../dispatcher/view/edit/FieldFactory.java      | 105 +++
 .../scimpi/dispatcher/view/edit/FormEntry.java  |  44 +
 .../scimpi/dispatcher/view/edit/FormField.java  |  44 +
 .../dispatcher/view/edit/FormFieldBlock.java    |  68 ++
 .../dispatcher/view/edit/HiddenField.java       |  48 ++
 .../dispatcher/view/edit/RadioListField.java    |  70 ++
 .../scimpi/dispatcher/view/edit/Selector.java   | 158 ++++
 .../dispatcher/view/field/ExcludeField.java     |  39 +
 .../dispatcher/view/field/IncludeField.java     |  39 +
 .../dispatcher/view/field/InclusionList.java    |  89 ++
 .../scimpi/dispatcher/view/field/LinkField.java |  45 +
 .../view/field/LinkedFieldsBlock.java           |  47 +
 .../dispatcher/view/field/LinkedObject.java     |  58 ++
 .../dispatcher/view/form/HiddenInputField.java  |  41 +
 .../dispatcher/view/form/HtmlFormBuilder.java   | 214 +++++
 .../scimpi/dispatcher/view/form/InputField.java | 224 +++++
 .../scimpi/dispatcher/view/logon/Logoff.java    |  38 +
 .../scimpi/dispatcher/view/logon/Logon.java     | 126 +++
 .../dispatcher/view/logon/RestrictAccess.java   |  41 +
 .../scimpi/dispatcher/view/logon/Secure.java    |  45 +
 .../scimpi/dispatcher/view/logon/User.java      |  77 ++
 .../view/simple/AbstractConditionalBlock.java   | 565 ++++++++++++
 .../dispatcher/view/simple/AbstractLink.java    | 121 +++
 .../dispatcher/view/simple/BlockDefine.java     |  42 +
 .../scimpi/dispatcher/view/simple/BlockUse.java |  46 +
 .../scimpi/dispatcher/view/simple/Commit.java   |  45 +
 .../dispatcher/view/simple/ContentTag.java      |  36 +
 .../dispatcher/view/simple/CookieValue.java     |  46 +
 .../dispatcher/view/simple/DefaultValue.java    |  52 ++
 .../scimpi/dispatcher/view/simple/EditLink.java |  71 ++
 .../dispatcher/view/simple/EndSession.java      |  36 +
 .../scimpi/dispatcher/view/simple/Forward.java  |  37 +
 .../dispatcher/view/simple/GetCookie.java       |  39 +
 .../scimpi/dispatcher/view/simple/Import.java   |  37 +
 .../view/simple/InitializeFromCookie.java       |  80 ++
 .../view/simple/InitializeFromResult.java       |  77 ++
 .../dispatcher/view/simple/Localization.java    |  64 ++
 .../scimpi/dispatcher/view/simple/Mark.java     |  43 +
 .../dispatcher/view/simple/NewActionLink.java   |  62 ++
 .../dispatcher/view/simple/ObjectLink.java      |  68 ++
 .../dispatcher/view/simple/PageTitle.java       |  35 +
 .../scimpi/dispatcher/view/simple/Redirect.java |  37 +
 .../dispatcher/view/simple/RemoveElement.java   | 140 +++
 .../scimpi/dispatcher/view/simple/ScopeTag.java |  51 ++
 .../dispatcher/view/simple/SetCookie.java       |  53 ++
 .../view/simple/SetCookieFromField.java         |  55 ++
 .../view/simple/SetFieldFromCookie.java         |  52 ++
 .../dispatcher/view/simple/SetLocalization.java |  61 ++
 .../dispatcher/view/simple/SimpleButton.java    |  39 +
 .../dispatcher/view/simple/StartSession.java    |  36 +
 .../dispatcher/view/simple/TemplateTag.java     |  40 +
 .../scimpi/dispatcher/view/simple/Unless.java   |  41 +
 .../scimpi/dispatcher/view/simple/Variable.java |  64 ++
 .../scimpi/dispatcher/view/simple/When.java     |  41 +
 .../dispatcher/view/value/ActionName.java       |  47 +
 .../dispatcher/view/value/CountElements.java    |  54 ++
 .../dispatcher/view/value/ElementType.java      |  61 ++
 .../scimpi/dispatcher/view/value/FieldName.java |  65 ++
 .../dispatcher/view/value/ParameterName.java    |  62 ++
 .../dispatcher/view/value/TitleString.java      |  68 ++
 .../scimpi/dispatcher/view/value/Type.java      |  57 ++
 mothballed/component/viewer/scimpi/pom.xml      | 131 +++
 .../component/viewer/scimpi/servlet/pom.xml     |  77 ++
 .../scimpi/servlet/DispatchException.java       |  42 +
 .../scimpi/servlet/DispatcherServlet.java       |  89 ++
 .../isis/viewer/scimpi/servlet/ImageLookup.java | 174 ++++
 .../scimpi/servlet/ServletRequestContext.java   | 373 ++++++++
 .../appended-resources/supplemental-models.xml  | 106 +++
 mothballed/component/viewer/scimpi/tck/pom.xml  |  98 +++
 .../tck/src/main/resources/images/Default.png   | Bin 0 -> 3016 bytes
 .../main/webapp/ToDoItem/edit-selector.shtml    |  29 +
 .../src/main/webapp/ToDoItem/object-link.shtml  |  32 +
 .../src/main/webapp/ToDoItem/object-orig.shtml  |  31 +
 .../tck/src/main/webapp/ToDoItem/object.shtml   |  34 +
 .../tck/src/main/webapp/ToDoItem/object2.shtml  |  31 +
 .../tck/src/main/webapp/WEB-INF/isis.properties |  54 ++
 .../src/main/webapp/WEB-INF/logging.properties  |  30 +
 .../src/main/webapp/WEB-INF/security_file.allow |  16 +
 .../main/webapp/WEB-INF/security_file.passwords |  20 +
 .../scimpi/tck/src/main/webapp/WEB-INF/web.xml  |  55 ++
 .../scimpi/tck/src/main/webapp/debug.shtml      |  23 +
 .../tck/src/main/webapp/generic/action.shtml    |  27 +
 .../src/main/webapp/generic/collection.shtml    |  26 +
 .../tck/src/main/webapp/generic/edit.shtml      |  26 +
 .../tck/src/main/webapp/generic/object.shtml    |  28 +
 .../scimpi/tck/src/main/webapp/images/Claim.png | Bin 0 -> 2708 bytes
 .../tck/src/main/webapp/images/ClaimItem.png    | Bin 0 -> 2316 bytes
 .../tck/src/main/webapp/images/Employee.png     | Bin 0 -> 1986 bytes
 .../tck/src/main/webapp/images/banner-bg.png    | Bin 0 -> 384 bytes
 .../tck/src/main/webapp/images/banner.png       | Bin 0 -> 18951 bytes
 .../scimpi/tck/src/main/webapp/images/logo.png  | Bin 0 -> 7183 bytes
 .../scimpi/tck/src/main/webapp/index.shtml      |  25 +
 .../scimpi/tck/src/main/webapp/login.shtml      |  23 +
 .../scimpi/tck/src/main/webapp/style/screen.css | 394 +++++++++
 .../tck/src/main/webapp/style/template.shtml    |  47 +
 pom.xml                                         |   2 -
 .../spi/JdoObjectIdSerializerTest.java          |  21 +-
 567 files changed, 22716 insertions(+), 19930 deletions(-)
----------------------------------------------------------------------