You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by ni...@apache.org on 2015/04/24 05:46:15 UTC

[2/3] zest-qi4j git commit: Merge branch 'develop' into Drop_slf4j_dependency

Merge branch 'develop' into Drop_slf4j_dependency


Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/72524b33
Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/72524b33
Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/72524b33

Branch: refs/heads/develop
Commit: 72524b3377652a84fc9e8a9d6b631ecb6908b7ee
Parents: c69d16e d7159b1
Author: Niclas Hedhman <ni...@hedhman.org>
Authored: Sun Apr 5 11:07:56 2015 +0300
Committer: Niclas Hedhman <ni...@hedhman.org>
Committed: Sun Apr 5 11:07:56 2015 +0300

----------------------------------------------------------------------
 build.gradle                                    |  15 +-
 core/api/src/docs/unitofwork.txt                |   3 +-
 .../org/qi4j/api/unitofwork/UnitOfWork.java     | 113 ++-
 .../composite/FunctionStateResolver.java        |  71 ++
 .../qi4j/runtime/composite/StateResolver.java   |  36 +
 .../runtime/entity/EntityPropertyInstance.java  |   2 +-
 .../qi4j/runtime/entity/EntityStateModel.java   |   2 +-
 .../qi4j/runtime/injection/DependencyModel.java |  12 +-
 .../injection/InjectionProviderFactory.java     |   6 +-
 .../qi4j/runtime/structure/ModuleInstance.java  |  87 +-
 .../runtime/structure/ModuleUnitOfWork.java     | 109 ++-
 .../unitofwork/EntityBuilderInstance.java       |  50 +-
 .../runtime/value/ValueBuilderInstance.java     |   3 +-
 .../runtime/value/ValueBuilderWithState.java    |  19 +-
 .../qi4j/runtime/value/ValueStateInstance.java  |   4 +-
 .../org/qi4j/runtime/value/ValueStateModel.java |  21 +-
 .../composite/CompositeModelResolverTest.java   |   4 +-
 .../entity/EntityBuilderWithStateTest.java      | 148 ++++
 .../ServiceInstantiationTests.java              |  18 +-
 .../transients/TransientBuilderFactoryTest.java |   2 +-
 .../qi4j/runtime/instantiation/My.properties    |   1 +
 .../runtime/instantiation/MyService.properties  |   1 -
 doap.rdf                                        |  64 ++
 .../internal/AbstractElasticSearchSupport.java  |  11 +-
 gradle/wrapper/gradle-wrapper.properties        |   2 +-
 libraries/conversion/src/docs/conversion.txt    |  41 +-
 .../conversion/values/EntityToValue.java        |  34 +-
 .../qi4j/library/conversion/values/Shared.java  |  67 ++
 .../conversion/values/ValueToEntity.java        | 132 +++
 .../values/ValueToEntityAssembler.java          |  39 +
 .../conversion/values/ValueToEntityMixin.java   | 829 +++++++++++++++++++
 .../conversion/values/ValueToEntityService.java |  27 +
 .../conversion/values/EntityToValueTest.java    | 190 +----
 .../library/conversion/values/TestModel.java    | 200 +++++
 .../conversion/values/ValueToEntityTest.java    | 351 ++++++++
 .../rest/server/DomainEventSourceResource.java  |   2 +-
 .../replay/ApplicationEventPlayer.java          |   7 +-
 .../source/ApplicationEventSource.java          |  11 +-
 .../helper/ApplicationEventParameters.java      |   1 -
 .../domain/replay/DomainEventPlayer.java        |   6 +-
 .../domain/source/EventSource.java              |   1 +
 .../domain/source/helper/EventParameters.java   |   1 -
 .../domain/source/helper/EventRouter.java       |   2 +-
 .../domain/source/helper/UnitOfWorkRouter.java  |   2 +-
 .../java/org/qi4j/lang/groovy/GroovyMixin.java  |   2 +-
 .../qi4j/lang/javascript/JavaScriptMixin.java   |   2 +-
 .../java/org/qi4j/lang/jruby/JRubyMixin.java    |   2 +-
 .../bootstrap/Qi4jApplicationBootstrap.java     |  17 +-
 .../library/spring/importer/SpringImporter.java |   2 +-
 .../library/struts2/Qi4jPropertyAccessor.java   |   2 +-
 .../src/docs/tutorials/howto-create-concern.txt |   4 +-
 .../src/docs/tutorials/howto-create-entity.txt  |  11 +-
 .../createEntity/CarEntityFactoryMixin.java     |   8 +-
 .../wicket/form/DateTextFieldWithPicker.java    |   2 +-
 .../handling/ProcessHandlingEvent.java          |   2 +-
 .../wicket/form/DateTextFieldWithPicker.java    |   2 +-
 .../qi4j/envisage/detail/DetailModelPane.java   |   4 +-
 .../org/qi4j/envisage/detail/GeneralPane.java   |  10 +-
 .../org/qi4j/envisage/graph/GraphBuilder.java   |   8 +-
 .../java/org/qi4j/envisage/print/PDFWriter.java |   6 +-
 .../envisage/tree/StructureModelBuilder.java    |   6 +-
 .../envisage/tree/TreeModelCellRenderer.java    |   2 +-
 .../qi4j/envisage/tree/TypeModelBuilder.java    |   4 +-
 .../descriptor/ActivatorDetailDescriptor.java   |  15 +-
 .../descriptor/ApplicationDetailDescriptor.java |  34 +-
 .../ApplicationDetailDescriptorBuilder.java     |   7 +-
 .../descriptor/CompositeDetailDescriptor.java   |  15 +-
 .../descriptor/ConstructorDetailDescriptor.java |   3 +
 .../descriptor/EntityDetailDescriptor.java      |  16 +-
 .../ImportedServiceDetailDescriptor.java        |  29 +-
 .../model/descriptor/LayerDetailDescriptor.java |  36 +-
 .../MethodConcernDetailDescriptor.java          |   6 +-
 .../descriptor/ModuleDetailDescriptor.java      |  85 +-
 .../descriptor/ObjectDetailDescriptor.java      |  15 +-
 .../descriptor/ServiceDetailDescriptor.java     |  28 +-
 .../descriptor/TransientDetailDescriptor.java   |  40 +
 .../model/descriptor/ValueDetailDescriptor.java |  14 +
 .../org/qi4j/tools/model/util/SPIFinder.java    |  50 +-
 .../model/util/ServiceConfigurationFinder.java  |   8 +-
 .../tools/model/util/ServiceUsageFinder.java    |  28 +-
 .../qi4j/tools/model/VisitableDetailTest.java   | 148 ++++
 81 files changed, 2907 insertions(+), 513 deletions(-)
----------------------------------------------------------------------