You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ke...@apache.org on 2013/03/02 19:43:13 UTC

[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/isis

Updated Branches:
  refs/heads/master 728303303 -> caf18bb84


Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/isis


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

Branch: refs/heads/master
Commit: caf18bb844ca731ed336de2bd000395d49b2efa7
Parents: b652f27 7283033
Author: Kevin Meyer <ke...@apache.org>
Authored: Sat Mar 2 19:42:20 2013 +0100
Committer: Kevin Meyer <ke...@apache.org>
Committed: Sat Mar 2 19:42:20 2013 +0100

----------------------------------------------------------------------
 README.md                                          |   55 +++
 .../jdo/datanucleus/DataNucleusObjectStore.java    |   44 ++-
 .../persistence/FrameworkSynchronizer.java         |    2 +-
 .../sql/common/SqlIntegrationTestCommonBase.java   |   11 +
 .../sql/common/SqlIntegrationTestData.java         |   28 ++-
 .../isis/objectstore/sql/PolymorphismTest.java     |   19 +-
 .../integration/wicket/WebRequestCycleForIsis.java |   82 ++++-
 .../viewer/wicket/model/models/EntityModel.java    |   17 +-
 .../wicket/ui/components/actions/ActionPanel.java  |  149 +++++---
 .../entity/properties/EntityPropertiesForm.java    |  283 ++++++++++-----
 .../viewer/wicket/ui/errors/JGrowlBehaviour.java   |   46 +++
 .../isis/viewer/wicket/ui/errors/JGrowlUtil.java   |   38 ++
 .../viewer/wicket/ui/errors/StackTraceDetail.java  |   51 +++
 .../wicket/ui/errors/StackTraceListView.java       |   27 ++
 .../isis/viewer/wicket/ui/pages/PageAbstract.java  |   37 +--
 .../viewer/wicket/ui/pages/error/ErrorPage.css     |   83 -----
 .../viewer/wicket/ui/pages/error/ErrorPage.html    |   21 +-
 .../viewer/wicket/ui/pages/error/ErrorPage.java    |  106 +-----
 .../wicket/ui/pages/error/ExceptionModel.java      |   92 +++++
 .../ui/pages/error/ExceptionStackTracePanel.css    |  103 ++++++
 .../ui/pages/error/ExceptionStackTracePanel.html   |   58 +++
 .../ui/pages/error/ExceptionStackTracePanel.java   |   83 +++++
 .../ui/panels/AjaxButtonWithPreSubmitHook.java     |   29 --
 .../wicket/ui/panels/ButtonWithPreSubmitHook.java  |   29 --
 .../ui/panels/ButtonWithPreValidateHook.java       |   29 ++
 .../isis/viewer/wicket/ui/panels/FormAbstract.java |   23 +-
 .../ui/panels/IFormSubmitterWithPreSubmitHook.java |   23 --
 .../panels/IFormSubmitterWithPreValidateHook.java  |   23 ++
 .../apache/isis/applib/DomainObjectContainer.java  |   12 +-
 .../integtestsupport/IsisSystemWithFixtures.java   |    1 +
 .../IsisSystemWithFixturesTest_basicTest.java      |    2 +
 .../core/commons/exceptions/IsisException.java     |   68 +----
 .../services/ServicesInjectorDefault.java          |   22 +-
 .../container/DomainObjectContainerDefault.java    |   25 +-
 ...emoveJavaLangComparableMethodsFacetFactory.java |    2 +-
 ...omainObjectContainerDefaultTest_recognizes.java |   47 ++-
 .../adaptermanager/AdapterManagerDefault.java      |   17 +-
 .../system/transaction/IsisTransaction.java        |  131 +++----
 .../transaction/IsisTransactionFlushException.java |   43 +++
 .../system/transaction/IsisTransactionManager.java |  109 ++++--
 .../IsisTransactionManagerCommitException.java     |   43 +++
 ...IsisTransactionManagerDomCallbackException.java |   43 +++
 ...sTransactionManagerResourceCommitException.java |   43 +++
 .../system/transaction/IsisTransactionTest.java    |   10 +-
 .../WEB-INF/persistor_datanucleus.properties       |    1 +
 45 files changed, 1475 insertions(+), 735 deletions(-)
----------------------------------------------------------------------