Merge branch 'develop' into entitystore_sqlng
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/57438d0e Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/57438d0e Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/57438d0e Branch: refs/heads/develop Commit: 57438d0e94bc0f44b16187506390f20bd6121449 Parents: c3d8e01 955eaa9 Author: niclas <[email protected]> Authored: Tue May 16 11:15:25 2017 +0800 Committer: niclas <[email protected]> Committed: Tue May 16 11:15:25 2017 +0800 ---------------------------------------------------------------------- .gitignore | 1 + NOTICE.txt | 2 - buildSrc/build.gradle | 1 + .../DependenciesDeclarationExtension.groovy | 1 + .../distributions/DistributionsPlugin.groovy | 63 +- .../structure/manual/DocumentationTask.groovy | 21 +- .../reports/AggregatedJacocoReportTask.groovy | 68 ++- .../structure/reports/ReportsPlugin.groovy | 10 +- .../gradle/structure/tools/NpmToolPlugin.groovy | 47 ++ .../gradle-plugins/polygene-tool-npm.properties | 18 + .../org/apache/polygene/api/PolygeneAPI.java | 26 +- .../api/activation/ActivationException.java | 1 - .../ApplicationPassivationThread.java | 1 - .../api/activation/PassivationException.java | 2 - .../api/association/AssociationStateHolder.java | 3 +- .../api/association/ManyAssociation.java | 9 + .../api/association/ManyAssociationWrapper.java | 6 + .../api/association/NamedAssociation.java | 8 +- .../association/NamedAssociationWrapper.java | 6 + .../apache/polygene/api/cache/CacheOptions.java | 5 + .../polygene/api/common/AppliesToFilter.java | 9 +- .../api/common/ConstructionException.java | 2 - .../api/common/InvalidApplicationException.java | 5 +- .../polygene/api/common/QualifiedName.java | 3 +- .../apache/polygene/api/common/TypeName.java | 3 +- .../api/composite/AmbiguousTypeException.java | 5 +- .../api/composite/CompositeInstance.java | 8 + .../api/composite/DefaultMethodsFilter.java | 36 ++ .../InvalidValueCompositeException.java | 3 +- .../api/composite/NoSuchCompositeException.java | 5 +- .../polygene/api/composite/PropertyMapper.java | 27 +- .../StatefulAssociationCompositeDescriptor.java | 3 + .../polygene/api/constraint/Constraint.java | 2 - ...nstraintImplementationNotFoundException.java | 34 -- .../api/constraint/ConstraintViolation.java | 2 - .../ConstraintViolationException.java | 5 +- .../polygene/api/entity/EntityDescriptor.java | 4 + .../polygene/api/entity/EntityReference.java | 6 +- .../polygene/api/entity/LifecycleException.java | 5 +- .../polygene/api/identity/HasIdentity.java | 1 - .../api/mixin/InitializationException.java | 5 +- .../api/mixin/InvalidMixinException.java | 35 -- .../api/mixin/MixinMappingException.java | 35 -- .../apache/polygene/api/mixin/NoopMixin.java | 5 + .../polygene/api/property/DefaultValues.java | 2 +- .../api/query/NotQueryableException.java | 5 +- .../org/apache/polygene/api/query/Query.java | 4 +- .../polygene/api/query/QueryException.java | 5 +- .../api/query/QueryExpressionException.java | 3 - .../polygene/api/serialization/ConvertedBy.java | 7 +- .../polygene/api/serialization/Converters.java | 97 ++- .../JavaSerializationConverter.java | 88 +++ .../polygene/api/serialization/Serializer.java | 61 +- .../polygene/api/service/qualifier/Active.java | 2 +- .../service/qualifier/AnnotationQualifier.java | 2 +- .../api/service/qualifier/Available.java | 2 +- .../api/service/qualifier/HasMetaInfo.java | 34 +- .../api/service/qualifier/IdentifiedBy.java | 4 +- .../api/service/qualifier/Qualifier.java | 2 +- .../api/service/qualifier/ServiceQualifier.java | 48 +- .../api/service/qualifier/ServiceTags.java | 3 - .../polygene/api/structure/Application.java | 2 +- .../polygene/api/type/EntityCompositeType.java | 63 ++ .../api/type/StatefulAssociationValueType.java | 75 +++ .../polygene/api/type/ValueCompositeType.java | 40 +- .../polygene/api/unitofwork/UnitOfWork.java | 2 +- .../apache/polygene/api/usecase/Usecase.java | 4 +- .../org/apache/polygene/api/util/Classes.java | 2 +- .../polygene/api/value/ValueDescriptor.java | 1 + .../polygene/api/type/ValueTypeFactoryTest.java | 28 +- .../polygene/api/value/ValueCompositeTest.java | 27 +- .../polygene/bootstrap/ApplicationAssembly.java | 7 + .../polygene/bootstrap/AssemblyVisitor.java | 18 +- .../bootstrap/ImportedServiceDeclaration.java | 8 +- .../polygene/bootstrap/ModuleAssembly.java | 2 +- .../polygene/bootstrap/RuntimeFactory.java | 2 +- .../polygene/bootstrap/SingletonAssembler.java | 68 ++- .../bootstrap/layered/LayerAssembler.java | 1 + .../bootstrap/layered/ModuleAssembler.java | 1 + .../DefaultSerializationAssembler.java | 12 +- core/runtime/src/docs/runtime.txt | 2 +- .../polygene/runtime/PolygeneRuntimeImpl.java | 93 ++- .../runtime/activation/ActivationDelegate.java | 43 +- .../association/AbstractAssociationModel.java | 226 +++++++ .../runtime/association/AssociationModel.java | 190 +----- .../association/ManyAssociationInstance.java | 12 +- .../association/ManyAssociationModel.java | 226 +------ .../association/ManyAssociationsModel.java | 4 +- .../association/NamedAssociationInstance.java | 19 +- .../association/NamedAssociationModel.java | 229 +------ .../association/NamedAssociationsModel.java | 4 - .../bootstrap/ApplicationAssemblyImpl.java | 1 + .../bootstrap/CompositeAssemblyImpl.java | 296 ++++----- .../ImplementsMethodAppliesToFilter.java | 4 +- .../runtime/composite/AtomicInstancePool.java | 2 +- .../runtime/composite/CompositeMethodModel.java | 10 +- .../composite/CompositeMethodsModel.java | 57 +- .../runtime/composite/ConcernsModel.java | 6 +- .../runtime/composite/ConstraintsCheck.java | 2 +- .../runtime/composite/ConstraintsModel.java | 4 +- .../runtime/composite/ConstructorModel.java | 17 +- .../runtime/composite/ConstructorsModel.java | 11 +- .../runtime/composite/FragmentClassLoader.java | 1 - .../composite/FunctionStateResolver.java | 32 +- .../runtime/composite/GenericPredicate.java | 38 ++ .../runtime/composite/Genericpredicate.java | 38 -- .../runtime/composite/InstancePool.java | 4 +- .../composite/InterfaceDefaultMethodsMixin.java | 85 +++ .../polygene/runtime/composite/MixinsModel.java | 21 +- .../runtime/composite/SideEffectsModel.java | 6 +- .../runtime/composite/TransientInstance.java | 7 - .../polygene/runtime/composite/UsageGraph.java | 4 +- .../composite/ValueConstraintsInstance.java | 2 - .../polygene/runtime/entity/EntityInstance.java | 12 +- .../polygene/runtime/entity/EntityModel.java | 32 +- .../runtime/entity/EntityStateInstance.java | 49 +- .../InvocationInjectionProviderFactory.java | 3 +- .../polygene/runtime/internal/Activator.java | 14 +- .../runtime/property/PropertyInstance.java | 55 +- .../runtime/property/PropertyModel.java | 10 - .../runtime/query/QueryBuilderFactoryImpl.java | 4 +- .../polygene/runtime/query/QueryImpl.java | 10 +- .../ImportedServiceReferenceInstance.java | 4 +- .../runtime/service/ServiceInstance.java | 7 - .../runtime/structure/ModuleClassLoader.java | 6 +- .../runtime/structure/ModuleInstance.java | 4 +- .../runtime/type/ValueTypeFactoryInstance.java | 18 +- .../runtime/unitofwork/BuilderEntityState.java | 18 +- .../unitofwork/BuilderManyAssociationState.java | 18 +- .../BuilderNamedAssociationState.java | 11 + .../runtime/unitofwork/EntityStateStore.java | 39 -- .../runtime/unitofwork/ModuleUnitOfWork.java | 45 +- .../unitofwork/UnitOfWorkFactoryMixin.java | 3 +- .../runtime/unitofwork/UnitOfWorkInstance.java | 18 +- .../value/ManyAssociationValueState.java | 14 +- .../value/NamedAssociationValueState.java | 11 + .../value/ValueBuilderWithPrototype.java | 16 +- .../polygene/runtime/value/ValueInstance.java | 78 +-- .../polygene/runtime/value/ValueModel.java | 16 +- .../runtime/value/ValueStateInstance.java | 18 +- .../polygene/bootstrap/RuntimeMixinsTest.java | 187 ++++++ .../composite/InterfaceDefaultMethodsTest.java | 164 ++++- .../entity/EntityCompositeToStringTest.java | 90 +++ .../runtime/injection/ServiceInjectionTest.java | 24 +- .../runtime/mixin/DefaultMethodsTest.java | 97 +++ .../memory/MemoryMapEntityStoreMixin.java | 11 +- .../serialization/javaxjson/JavaxJson.java | 49 -- .../javaxjson/JavaxJsonAdapter.java | 5 +- .../javaxjson/JavaxJsonAdapters.java | 72 ++- .../javaxjson/JavaxJsonDeserializer.java | 58 +- .../javaxjson/JavaxJsonFactories.java | 133 ++++ .../javaxjson/JavaxJsonSerializer.java | 68 +-- .../spi/entity/ManyAssociationState.java | 2 + .../spi/entity/NamedAssociationState.java | 2 + .../ReadOnlyEntityStoreException.java | 32 - .../entitystore/helpers/DefaultEntityState.java | 18 +- .../helpers/DefaultManyAssociationState.java | 17 +- .../helpers/DefaultNamedAssociationState.java | 12 + .../entitystore/helpers/JSONEntityState.java | 360 ++++------- .../spi/entitystore/helpers/JSONKeys.java | 16 +- .../helpers/JSONManyAssociationState.java | 25 +- .../helpers/JSONMapEntityStoreMixin.java | 95 +-- .../helpers/JSONNamedAssociationState.java | 25 +- .../helpers/MapEntityStoreMixin.java | 74 +-- .../spi/serialization/AbstractDeserializer.java | 23 +- .../spi/serialization/AbstractSerializer.java | 18 - .../spi/serialization/JsonDeserializer.java | 5 +- .../spi/serialization/XmlDeserializer.java | 5 +- .../helpers/JSONManyAssociationStateTest.java | 47 +- .../helpers/JsonNamedAssociationStateTest.java | 30 +- core/testsupport/NOTICE | 256 -------- .../org/apache/polygene/test/model/Domain.java | 1 - .../AbstractConvertersSerializationTest.java | 16 +- .../AbstractPlainValueSerializationTest.java | 17 + ...AbstractValueCompositeSerializationTest.java | 56 +- .../org/apache/polygene/test/util/Assume.java | 12 +- dependencies.gradle | 18 +- distributions/build.gradle | 17 + distributions/src/src-dist/README.txt | 16 +- extensions/cache-ehcache/NOTICE | 10 - .../cache/ehcache/EhCacheConfiguration.java | 3 +- .../cache/ehcache/EhCachePoolMixin.java | 1 - extensions/cache-memcache/NOTICE | 103 ---- .../cache/memcache/MemcacheConfiguration.java | 2 - .../CassandraEntityStoreConfiguration.java | 2 - .../cassandra/CassandraEntityStoreService.java | 2 - .../entitystore/cassandra/ClusterBuilder.java | 2 +- .../file/FileEntityStoreConfiguration.java | 2 - .../entitystore/file/FileEntityStoreMixin.java | 6 +- .../file/FileEntityStoreService.java | 2 - extensions/entitystore-geode/NOTICE | 3 - .../entitystore/geode/GeodeConfiguration.java | 2 - .../geode/GeodeEntityStoreService.java | 2 - extensions/entitystore-hazelcast/NOTICE | 23 - .../hazelcast/HazelcastConfiguration.java | 2 - .../hazelcast/HazelcastEntityStoreService.java | 2 - extensions/entitystore-jclouds/NOTICE | 3 - .../JCloudsMapEntityStoreConfiguration.java | 2 - .../jclouds/JCloudsMapEntityStoreService.java | 2 - extensions/entitystore-jdbm/NOTICE | 50 -- .../entitystore/jdbm/JdbmConfiguration.java | 2 - .../jdbm/JdbmEntityStoreActivation.java | 2 +- .../jdbm/JdbmEntityStoreService.java | 2 - extensions/entitystore-leveldb/NOTICE | 30 - .../LevelDBEntityStoreConfiguration.java | 4 - .../leveldb/LevelDBEntityStoreService.java | 2 - extensions/entitystore-mongodb/NOTICE | 92 --- .../mongodb/MongoEntityStoreConfiguration.java | 7 +- .../mongodb/MongoMapEntityStoreMixin.java | 63 +- .../mongodb/MongoMapEntityStoreService.java | 2 - .../mongodb/EmbedMongoMapEntityStoreTest.java | 11 +- .../mongodb/MongoMapEntityStoreTest.java | 5 +- .../preferences/PreferencesEntityStoreInfo.java | 2 - .../PreferencesEntityStoreService.java | 3 +- extensions/entitystore-redis/NOTICE | 26 - .../redis/RedisEntityStoreConfiguration.java | 2 - .../redis/RedisMapEntityStoreService.java | 2 - extensions/entitystore-riak/NOTICE | 6 - .../riak/RiakEntityStoreConfiguration.java | 3 +- .../riak/RiakMapEntityStoreService.java | 2 - extensions/entitystore-sql/NOTICE | 4 - .../entitystore/sql/SQLMapEntityStoreMixin.java | 10 +- .../sql/SQLMapEntityStoreService.java | 2 - extensions/indexing-elasticsearch/NOTICE | 10 - .../ElasticSearchConfiguration.java | 2 - .../elasticsearch/ElasticSearchFinder.java | 2 +- .../ElasticSearchFinderSupport.java | 2 +- .../elasticsearch/ElasticSearchIndexer.java | 80 ++- .../client/ESClientIndexQueryService.java | 3 +- .../cluster/ESClusterIndexQueryService.java | 3 +- .../ESFilesystemIndexQueryService.java | 3 +- .../index/elasticsearch/ImmenseTermTest.java | 15 +- extensions/indexing-rdf/NOTICE | 3 - .../index/rdf/RdfIndexingEngineService.java | 3 +- ...llectingQualifiedIdentityResultCallback.java | 2 +- .../index/rdf/query/RdfQueryParserFactory.java | 2 - .../index/rdf/query/RdfQueryService.java | 5 +- .../index/rdf/query/internal/Namespaces.java | 2 +- extensions/indexing-solr/NOTICE | 3 - .../index/solr/EmbeddedSolrService.java | 5 +- .../polygene/index/solr/SolrQueryService.java | 3 +- .../apache/polygene/index/solr/SolrSearch.java | 2 +- .../solr/internal/SolrEntityIndexerMixin.java | 14 +- .../solr/internal/SolrEntityQueryMixin.java | 6 +- extensions/indexing-sql/build.gradle | 2 +- .../index/sql/SQLIndexingEngineService.java | 3 +- .../index/sql/support/api/SQLQuerying.java | 6 +- .../sql/support/common/RebuildingStrategy.java | 6 +- .../sql/support/common/ReindexingStrategy.java | 6 +- .../postgresql/PostgreSQLTypeHelper.java | 2 +- .../skeletons/SQLCompatEntityStateWrapper.java | 13 + extensions/metrics-codahale/NOTICE | 16 - extensions/migration/NOTICE | 25 - .../migration/MigrationConfiguration.java | 2 - .../polygene/migration/MigrationService.java | 609 +++++++------------ .../polygene/migration/MigrationTest.java | 4 +- extensions/reindexer/NOTICE | 25 - .../index/reindexer/ReindexAllService.java | 3 +- .../index/reindexer/ReindexerConfiguration.java | 2 - .../index/reindexer/ReindexerService.java | 3 +- extensions/serialization-javaxjson/NOTICE | 3 - .../JavaxJsonSerializationAssembler.java | 5 +- .../javaxjson/CustomJsonAdapterTest.java | 16 +- ...avaxJsonValueCompositeSerializationTest.java | 28 +- .../javaxxml/JavaxXmlDeserializer.java | 59 +- .../javaxxml/JavaxXmlSerializer.java | 43 +- .../JavaxXmlSerializationAssembler.java | 5 +- ...JavaxXmlValueCompositeSerializationTest.java | 20 +- extensions/serialization-messagepack/NOTICE | 40 -- .../messagepack/MessagePackDeserializer.java | 72 +-- .../messagepack/MessagePackSerializer.java | 47 +- .../MessagePackSerializationAssembler.java | 7 +- internals/testsupport-internal/NOTICE | 3 - .../polygene/test/internal/DockerRule.java | 2 +- .../polygene/library/alarm/AlarmEvent.java | 3 +- .../polygene/library/alarm/AlarmPoint.java | 7 +- .../library/alarm/AlarmPointEntity.java | 3 +- .../library/alarm/AlarmPointFactory.java | 3 +- .../polygene/library/alarm/AlarmProxy.java | 3 +- .../polygene/library/alarm/AlarmStatus.java | 3 +- .../polygene/library/alarm/AlarmSystem.java | 4 +- .../library/alarm/AlarmSystemService.java | 4 +- .../alarm/ExtendedAlarmModelService.java | 7 +- .../library/alarm/SimpleAlarmModelService.java | 7 +- .../alarm/StandardAlarmModelService.java | 7 +- libraries/circuitbreaker/NOTICE | 25 - .../jmx/CircuitBreakerJMXMBean.java | 16 +- .../jmx/CircuitBreakerManagement.java | 2 - .../library/constraints/ContainsConstraint.java | 3 - .../constraints/GreaterThanConstraint.java | 3 - .../constraints/InstanceOfConstraint.java | 3 - .../library/constraints/LessThanConstraint.java | 3 - .../library/constraints/MatchesConstraint.java | 3 - .../constraints/MaxLengthConstraint.java | 5 - .../constraints/MinLengthConstraint.java | 5 - .../NotEmptyCollectionConstraint.java | 3 - .../library/constraints/OneOfConstraint.java | 3 - .../library/constraints/RangeConstraint.java | 3 - .../library/constraints/URIConstraint.java | 4 - .../library/constraints/URLConstraint.java | 4 - .../library/constraints/annotation/OneOf.java | 2 +- libraries/fileconfig/NOTICE | 25 - .../fileconfig/FileConfigurationDataWiper.java | 27 +- .../fileconfig/FileConfigurationService.java | 11 +- libraries/http/NOTICE | 353 ----------- .../polygene/library/http/ConstraintInfo.java | 5 +- .../library/http/ConstraintService.java | 6 +- .../library/http/ContextListenerInfo.java | 2 - .../apache/polygene/library/http/Interface.java | 2 +- .../polygene/library/http/JettyActivation.java | 2 +- .../library/http/JettyConfiguration.java | 2 - .../polygene/library/http/JettyService.java | 3 +- .../library/http/UnitOfWorkFilterService.java | 3 +- .../library/http/WelcomeServletService.java | 3 +- .../library/http/HelloWorldServlet.java | 2 - libraries/jmx/NOTICE | 25 - .../library/jmx/ApplicationManagerService.java | 2 - .../jmx/ConfigurationManagerService.java | 2 - .../library/jmx/JMXConnectorConfiguration.java | 3 +- .../library/jmx/JMXConnectorService.java | 3 +- .../polygene/library/jmx/MBeanTracker.java | 6 +- .../polygene/library/jmx/ModelMBeanBuilder.java | 8 +- .../polygene/library/logging/debug/Debug.java | 7 +- .../library/logging/debug/DebugConcern.java | 7 +- .../records/CompositeDebugRecordEntity.java | 3 +- .../logging/debug/records/DebugRecord.java | 3 +- .../debug/records/EntityDebugRecordEntity.java | 2 +- .../debug/records/ServiceDebugRecordEntity.java | 3 +- .../debug/service/DebugOnConsoleSideEffect.java | 9 +- .../service/DebugServiceConfiguration.java | 2 - .../logging/debug/service/DebuggingService.java | 7 +- .../service/DebuggingServiceComposite.java | 3 +- .../debug/service/DebuggingServiceMixin.java | 19 +- .../library/logging/log/CategoryLog.java | 19 +- .../library/logging/log/CategoryLogConcern.java | 19 +- .../library/logging/log/CategoryLogMixin.java | 20 +- .../polygene/library/logging/log/SimpleLog.java | 19 +- .../library/logging/log/SimpleLogConcern.java | 19 +- .../library/logging/log/StandardLog.java | 7 +- .../library/logging/log/StandardLogConcern.java | 7 +- .../logging/log/records/CompositeLogRecord.java | 3 +- .../library/logging/log/records/LogRecord.java | 3 +- .../logging/log/service/LoggingService.java | 3 +- .../log/service/LoggingServiceComposite.java | 3 +- .../log/service/LoggingServiceMixin.java | 19 +- .../records/CompositeTraceRecordEntity.java | 3 +- .../trace/records/EntityTraceRecordEntity.java | 2 +- .../trace/records/ServiceTraceRecordEntity.java | 3 +- .../service/StandardTraceServiceComposite.java | 3 +- .../service/TraceServiceConfiguration.java | 3 +- .../library/osgi/OSGiEnabledService.java | 7 +- .../library/osgi/OSGiServiceExporter.java | 6 +- .../polygene/library/osgi/OSGiServiceTest.java | 1 + libraries/rdf/NOTICE | 103 ---- .../polygene/library/rdf/model/Model2XML.java | 4 +- .../repository/HttpRepositoryConfiguration.java | 2 - .../rdf/repository/HttpRepositoryService.java | 7 +- .../rdf/repository/MemoryRepositoryService.java | 7 +- .../rdf/repository/NativeRepositoryService.java | 3 +- .../rdf/repository/RdbmsRepositoryService.java | 11 +- libraries/rest-client/NOTICE | 4 - .../rest/client/RequestWriterDelegator.java | 2 +- .../rest/client/ResponseReaderDelegator.java | 2 +- .../rest/client/api/ContextResourceClient.java | 6 +- .../api/ContextResourceClientFactory.java | 8 +- .../library/rest/client/api/ErrorHandler.java | 21 +- .../library/rest/client/api/HandlerCommand.java | 10 +- .../responsereader/JSONResponseReader.java | 18 +- .../responsereader/TableResponseReader.java | 11 +- .../library/rest/client/spi/RequestWriter.java | 2 +- libraries/rest-common/NOTICE | 7 - .../library/rest/common/table/Table.java | 12 +- .../library/rest/common/table/TableBuilder.java | 3 +- .../library/rest/common/table/TableQuery.java | 24 +- libraries/rest-server/NOTICE | 34 -- .../rest/server/api/ContextResource.java | 6 +- .../library/rest/server/api/ResourceIndex.java | 2 +- .../server/api/constraint/ServiceAvailable.java | 2 +- .../server/restlet/InteractionConstraints.java | 4 +- .../restlet/InteractionConstraintsService.java | 4 +- .../server/restlet/RequestReaderDelegator.java | 2 +- .../server/restlet/ResponseWriterDelegator.java | 2 +- .../requestreader/DefaultRequestReader.java | 7 +- .../responsewriter/FormResponseWriter.java | 9 +- .../responsewriter/LinksResponseWriter.java | 14 +- .../responsewriter/ResourceResponseWriter.java | 9 +- .../ResourceTemplateResponseWriter.java | 4 +- .../responsewriter/TableResponseWriter.java | 41 +- .../ValueCompositeResponseWriter.java | 8 +- .../ValueDescriptorResponseWriter.java | 13 +- .../library/rest/server/spi/CommandResult.java | 2 +- libraries/rest/NOTICE | 6 - .../library/rest/admin/EntityResource.java | 10 +- .../rest/admin/ExtensionMediaTypeFilter.java | 2 +- .../admin/PolygeneServerServletService.java | 3 +- .../library/rest/admin/RestServerComposite.java | 5 +- libraries/restlet/NOTICE | 4 - .../library/restlet/PolygeneServerServlet.java | 3 - .../serialization/FormRepresentation.java | 9 +- .../library/scripting/ScriptRedirect.java | 1 - libraries/servlet/NOTICE | 25 - libraries/shiro-core/NOTICE | 47 -- .../domain/common/IdentifiableSubject.java | 2 - .../passwords/PasswordRealmConfiguration.java | 4 - .../domain/passwords/PasswordRealmService.java | 4 +- .../domain/passwords/PasswordSecurable.java | 5 +- .../library/shiro/domain/permissions/Role.java | 8 +- .../shiro/domain/permissions/RoleAssignee.java | 14 +- .../domain/permissions/RoleAssignment.java | 4 - .../shiro/domain/permissions/RoleFactory.java | 2 - .../shiro/ini/IniSecurityManagerService.java | 4 +- .../shiro/ini/ShiroIniConfiguration.java | 4 - libraries/shiro-web/NOTICE | 28 - .../library/shiro/web/ShiroFilterService.java | 3 +- libraries/spring/NOTICE | 4 - .../PolygeneApplicationFactoryBean.java | 15 +- .../PolygeneBootstrapBeanDefinitionParser.java | 2 +- libraries/sql-bonecp/NOTICE | 3 - libraries/sql-dbcp/NOTICE | 3 - libraries/sql-generator/NOTICE | 25 - ...ene.library.sql.generator.vendor.DerbyVendor | 16 + ...lygene.library.sql.generator.vendor.H2Vendor | 16 + ...ene.library.sql.generator.vendor.MySQLVendor | 16 + ...ibrary.sql.generator.vendor.PostgreSQLVendor | 16 + ...ygene.library.sql.generator.vendor.SQLVendor | 16 + ...ne.library.sql.generator.vendor.SQLiteVendor | 16 + libraries/sql-liquibase/NOTICE | 3 - libraries/sql/NOTICE | 25 - .../polygene/library/sql/common/Databases.java | 159 ----- .../AbstractDataSourceServiceImporterMixin.java | 3 +- .../sql/datasource/DataSourceConfiguration.java | 3 +- .../DataSourceConfigurationManagerService.java | 2 - libraries/uowfile/NOTICE | 25 - .../ConcurrentUoWFileModificationException.java | 2 - .../library/uowfile/internal/UoWFile.java | 2 +- .../uowfile/plural/HasUoWFilesLifecycle.java | 2 +- .../src/docs/tutorials/howto-build-system.txt | 7 + .../docs/tutorials/howto-releasing-apache.txt | 43 ++ manual/src/docs/website/resources/css/style.css | 1 - .../polygene/manual/recipes/assemble/Docs.java | 3 +- .../polygene/manual/recipes/assemble/Main.java | 41 +- .../recipes/contextualFragments/TraceAll.java | 2 - .../createConstraint/DialerComposite.java | 3 +- .../recipes/createEntity/AccidentValue.java | 2 +- .../manual/recipes/createEntity/CarEntity.java | 4 +- .../createEntity/CarEntityFactoryService.java | 3 +- .../manual/recipes/createEntity/Main.java | 10 +- .../createEntity/ManufacturerEntity.java | 4 +- .../ManufacturerRepositoryMixin.java | 2 +- .../ManufacturerRepositoryService.java | 3 +- .../recipes/createEntity/MyAssembler.java | 2 +- .../manual/recipes/sideeffects/OrderEntity.java | 4 +- .../org/apache/polygene/manual/travel/Main.java | 13 +- .../manual/travel/TravelPlanService.java | 3 +- release/build.gradle | 17 + reports/build.gradle | 17 + samples/rental/build.gradle | 11 +- .../binding/internal/BoundManyAssociation.java | 6 + .../binding/internal/BoundNamedAssociation.java | 6 + settings.gradle | 2 +- .../jdbm/JdbmEntityStorePerformanceTest.java | 20 +- .../org/apache/polygene/envisage/Envisage.java | 18 +- .../envisage/detail/DependencyPane.java | 9 +- .../envisage/detail/DetailModelPane.java | 9 +- .../polygene/envisage/detail/MethodPane.java | 9 +- .../polygene/envisage/detail/StatePane.java | 9 +- .../polygene/envisage/graph/GraphBuilder.java | 3 +- .../polygene/envisage/graph/GraphPane.java | 18 +- .../envisage/graph/StackedGraphDisplay.java | 9 +- .../envisage/tree/StructureModelBuilder.java | 8 +- .../polygene/envisage/tree/TreeModelPane.java | 27 +- .../envisage/tree/TypeModelBuilder.java | 17 +- .../envisage/sample/EnvisageSample.java | 6 +- .../school/config/mail/MailConfiguration.java | 2 - .../domain/person/assembly/PersonEntity.java | 4 +- .../initialdata/SamplePersonInitialData.java | 4 +- .../domain/school/assembly/SchoolEntity.java | 5 +- .../assembly/SchoolRepositoryService.java | 3 +- .../domain/school/assembly/StudentEntity.java | 6 +- .../domain/school/assembly/SubjectEntity.java | 8 +- .../mail/assembly/MailServiceComposite.java | 5 +- .../infrastructure/mail/assembly/MailValue.java | 3 +- tools/generator-polygene/README.md | 47 ++ tools/generator-polygene/app/index.js | 3 +- .../app/templates/CommandLineApplication/app.js | 17 + .../ConfigurationLayer/ConfigModule/module.js | 17 + .../app/templates/ConfigurationLayer/layer.js | 17 + .../ConnectivityLayer/RestApiModule/module.js | 17 + .../app/templates/ConnectivityLayer/layer.js | 17 + .../templates/DomainLayer/CrudModule/module.js | 17 + .../DomainLayer/DomainModule/module.js | 18 + .../templates/DomainLayer/JmxModule/module.js | 18 + .../DomainLayer/SecurityModule/module.js | 18 + .../app/templates/DomainLayer/layer.js | 17 + .../InfrastructureLayer/CachingModule/module.js | 17 + .../FileConfigurationModule/module.js | 18 + .../IndexingModule/module.js | 18 + .../InfrastructureLayer/MetricsModule/module.js | 18 + .../SerializationModule/module.js | 18 + .../InfrastructureLayer/StorageModule/module.js | 18 + .../app/templates/InfrastructureLayer/layer.js | 17 + .../app/templates/RestAPIApplication/app.js | 18 + .../CommandLineModule/module.js | 17 + .../app/templates/UserInterfaceLayer/layer.js | 17 + .../app/templates/buildtool/build.js | 18 + .../app/templates/buildtool/gradle-root.tmpl | 1 - .../buildtool/gradle-wrapper.properties_ | 2 +- .../app/templates/buildtool/settings.tmpl | 16 - tools/generator-polygene/build.gradle | 100 +++ tools/generator-polygene/package.json | 28 +- tools/generator-polygene/test/generator_test.js | 57 +- .../ApplicationDetailDescriptorBuilder.java | 9 +- .../MethodConcernsDetailDescriptor.java | 2 +- .../MethodConstraintsDetailDescriptor.java | 2 +- .../MethodSideEffectDetailDescriptor.java | 6 +- .../MethodSideEffectsDetailDescriptor.java | 2 +- .../model/descriptor/MixinDetailDescriptor.java | 6 +- tutorials/composites/src/docs/step2.txt | 2 +- tutorials/composites/src/docs/step3.txt | 2 +- .../tutorial10/HelloWorldComposite.java | 2 - .../tutorial3/HelloWorldComposite.java | 3 +- .../tutorial4/HelloWorldComposite.java | 4 +- .../tutorial5/HelloWorldComposite.java | 4 +- .../tutorial6/HelloWorldComposite.java | 4 +- .../tutorial7/HelloWorldComposite.java | 3 +- .../tutorial8/HelloWorldComposite.java | 3 +- .../tutorial9/HelloWorldComposite.java | 3 +- .../apache/polygene/tutorials/hello/Hello.java | 16 +- .../polygene/tutorials/hello/HelloTest.java | 2 - .../introduction/src/docs/state-modeling.txt | 6 +- .../polygene/demo/intro/StateModelingDocs.java | 53 +- .../polygene/demo/intro/WhatsAnObjectDocs.java | 24 +- .../tenminutes/src/docs/ten-minutes.txt | 5 +- .../polygene/demo/tenminute/OrderEntity.java | 6 +- .../demo/thirtyminutes/ThirtyMinutesDocs.java | 8 +- .../apache/polygene/demo/twominute/Main.java | 13 +- .../polygene/tutorials/services/step2/Book.java | 2 - .../services/step2/LibraryService.java | 3 +- .../polygene/tutorials/services/step3/Book.java | 2 - .../tutorials/services/step3/LibraryMixin.java | 4 +- .../services/step3/LibraryService.java | 3 +- .../polygene/tutorials/services/step4/Book.java | 2 - .../services/step4/LibraryConfiguration.java | 2 - .../tutorials/services/step4/LibraryMixin.java | 4 +- .../services/step4/LibraryService.java | 3 +- .../polygene/tutorials/services/step5/Book.java | 2 - .../services/step5/LibraryService.java | 13 +- .../polygene/tutorials/services/step6/Book.java | 2 - .../services/step6/LibraryService.java | 8 +- 549 files changed, 4819 insertions(+), 5759 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/57438d0e/settings.gradle ----------------------------------------------------------------------
