Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/5cf33920 Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/5cf33920 Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/5cf33920 Branch: refs/heads/develop Commit: 5cf339205006dcaf8314db8e92548777b30ee43e Parents: 0655a44 9d16d55 Author: niclas <[email protected]> Authored: Sat Feb 4 13:47:28 2017 +0800 Committer: niclas <[email protected]> Committed: Sat Feb 4 13:47:28 2017 +0800 ---------------------------------------------------------------------- .../ConstraintViolationException.java | 2 +- .../property/InvalidPropertyTypeException.java | 7 +++-- .../polygene/api/query/grammar/OrderBy.java | 6 +---- .../activation/PassivationExceptionTest.java | 2 +- .../api/composite/PropertyMapperTest.java | 4 +-- .../apache/polygene/api/util/ClassesTest.java | 6 ++--- .../api/value/DocumentationSupport.java | 10 -------- .../runtime/association/AssociationsModel.java | 2 +- .../bootstrap/CompositeAssemblyImpl.java | 2 +- .../runtime/composite/ConcernsModel.java | 2 +- .../runtime/composite/ConstraintsModel.java | 2 +- .../runtime/composite/SideEffectsModel.java | 2 +- .../composite/TransientBuilderInstance.java | 4 +-- .../ImportedServiceReferenceInstance.java | 2 +- .../unitofwork/EntityBuilderInstance.java | 2 +- .../runtime/value/ValueBuilderInstance.java | 2 +- .../value/ValueBuilderWithPrototype.java | 4 +-- .../runtime/value/ValueBuilderWithState.java | 4 +-- .../apache/polygene/api/common/PluginTest.java | 2 +- .../runtime/injection/StateInjectionTest.java | 6 ++--- .../injection/UnitOfWorkInjectionTest.java | 2 +- .../sideeffects/SpecificSideEffectTest.java | 3 +-- .../spi/property/DefaultValuesTest.java | 6 ++--- .../test/entity/AbstractEntityStoreTest.java | 2 +- .../test/indexing/AbstractEntityFinderTest.java | 6 ++--- .../ehcache/assembly/EhCacheAssembler.java | 2 +- .../cache/memcache/MemcacheAssembler.java | 2 +- .../assembly/ESClusterIndexQueryAssembler.java | 2 +- .../ESFilesystemIndexQueryAssembler.java | 2 +- .../AbstractSQLIndexQueryAssembler.java | 2 +- .../postgresql/PostgreSQLEntityFinderTest.java | 4 +-- .../JacksonValueSerializationAssembler.java | 27 +++----------------- .../OrgJsonValueSerializationAssembler.java | 27 +++----------------- .../stax/StaxValueSerializationAssembler.java | 27 +++----------------- .../library/alarm/AlarmSystemAssembler.java | 2 +- .../library/alarm/AlarmServiceTest.java | 6 ++--- .../library/alarm/SimpleAlarmModelTest.java | 12 ++++----- .../library/alarm/StandardAlarmModelTest.java | 16 ++++++------ .../BreaksCircuitOnThrowableTest.java | 2 +- .../jmx/CircuitBreakerManagementSample.java | 2 +- .../fileconfig/FileConfigurationAssembler.java | 2 +- .../library/http/AbstractJettyMixin.java | 4 +-- .../library/http/JettyServiceAssembler.java | 2 +- .../polygene/library/http/ServletInfo.java | 2 +- .../logging/trace/TraceOnConsoleSideEffect.java | 7 ++--- .../rdf/model/ApplicationSerializer.java | 2 +- .../responsewriter/LinksResponseWriter.java | 2 +- .../restlet/assembly/domain/DomainLayer.java | 8 ------ .../infrastructue/InfrastructureLayer.java | 13 +++------- .../infrastructue/SerializationModule.java | 10 -------- .../shiro/assembly/PasswordDomainAssembler.java | 2 +- .../assembly/StandaloneShiroAssembler.java | 2 +- .../sql/liquibase/LiquibaseAssembler.java | 2 +- ...bstractPooledDataSourceServiceAssembler.java | 2 +- .../sample/forum/assembler/ForumAssembler.java | 1 - .../rental/web/assembly/StorageModule.java | 1 - .../polygene/envisage/detail/MethodPane.java | 5 +--- .../envisage/graph/StackedGraphDisplay.java | 2 +- .../app/templates/DomainLayer/bootstrap.tmpl | 8 ------ .../app/templates/Heroes/bootstrap.tmpl | 7 +---- .../InfrastructureLayer/bootstrap.tmpl | 9 ++----- .../JacksonSerializationModule/bootstrap.tmpl | 10 -------- .../common/ApplicationAssemblerWriter.java | 6 +---- .../project/common/DomainLayerWriter.java | 8 ------ .../common/InfrastructureLayerWriter.java | 9 ++----- .../common/SecurityRepositoryWriter.java | 2 -- .../common/SerializationModuleWriter.java | 10 -------- 67 files changed, 95 insertions(+), 270 deletions(-) ----------------------------------------------------------------------
