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/1f7357c3 Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/1f7357c3 Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/1f7357c3 Branch: refs/heads/develop Commit: 1f7357c320a60c42a2020dce924c99c37d0a533f Parents: 57438d0 6e5d911 Author: niclas <[email protected]> Authored: Mon Jun 5 14:12:34 2017 +0800 Committer: niclas <[email protected]> Committed: Mon Jun 5 14:12:34 2017 +0800 ---------------------------------------------------------------------- buildSrc/build.gradle | 2 +- .../polygene/gradle/code/CodePlugin.groovy | 16 +- .../gradle/code/PublishingPlugin.groovy | 23 +- .../DependenciesDeclarationExtension.groovy | 1 + .../gradle/structure/ProjectGroupTasks.groovy | 36 + .../polygene/gradle/structure/RootPlugin.groovy | 23 + .../gradle/structure/core/CorePlugin.groovy | 3 + .../distributions/DistributionsPlugin.groovy | 48 +- .../structure/extensions/ExtensionPlugin.groovy | 3 + .../internals/InternalDockerPlugin.groovy | 2 +- .../structure/internals/InternalPlugin.groovy | 10 +- .../structure/libraries/LibraryPlugin.groovy | 5 + .../structure/release/ReleasePlugin.groovy | 1 + .../structure/samples/SamplePlugin.groovy | 3 + .../gradle/structure/tools/ToolPlugin.groovy | 3 + .../structure/tutorials/TutorialPlugin.groovy | 3 + .../gradle-plugins/polygene-internal.properties | 2 +- core/api/build.gradle | 1 + core/api/src/docs/api.txt | 2 +- core/api/src/docs/composition.txt | 10 +- core/api/src/docs/dependency-injection.txt | 136 +++ core/api/src/docs/fragment.txt | 10 +- core/api/src/docs/layer.txt | 24 + core/api/src/docs/module.txt | 12 + core/api/src/docs/serialization.txt | 1 + core/api/src/docs/structure.txt | 35 +- core/api/src/docs/visibility.txt | 16 + .../api/composite/NoSuchTransientException.java | 9 +- .../polygene/api/composite/PropertyMapper.java | 2 +- .../api/configuration/Configuration.java | 222 ++-- .../configuration/ConfigurationComposite.java | 2 +- .../NoSuchConfigurationTypeException.java | 36 + .../api/service/NoSuchServiceException.java | 6 +- .../importer/ServiceInstanceImporter.java | 7 +- .../api/structure/ApplicationDescriptor.java | 10 + .../unitofwork/NoSuchEntityTypeException.java | 13 +- .../api/value/NoSuchValueException.java | 11 +- .../org/apache/polygene/api/OperatorsTest.java | 16 +- .../activation/PassivationExceptionTest.java | 61 +- .../api/docsupport/ApplicationDocs.java | 33 +- .../api/value/DocumentationSupport.java | 19 +- core/bootstrap/src/docs/bootstrap.txt | 2 +- .../bootstrap/ApplicationAssembler.java | 1 + .../bootstrap/ApplicationAssemblerAdapter.java | 1 - .../polygene/bootstrap/ApplicationName.java | 1 - .../apache/polygene/bootstrap/Assembler.java | 1 + .../apache/polygene/bootstrap/LayerName.java | 1 - .../polygene/bootstrap/ModuleAssembly.java | 30 +- .../apache/polygene/bootstrap/ModuleName.java | 1 - .../polygene/bootstrap/SingletonAssembler.java | 8 +- .../bootstrap/builder/ApplicationBuilder.java | 56 +- .../bootstrap/builder/LayerDeclaration.java | 2 - .../bootstrap/builder/ModuleDeclaration.java | 3 - .../DefaultIdentityGeneratorAssembler.java | 39 + .../DefaultMetricsProviderAssembler.java | 37 + .../defaults/DefaultSerializationAssembler.java | 52 + .../defaults/DefaultUnitOfWorkAssembler.java | 58 + .../polygene/bootstrap/defaults/package.html | 24 + .../DefaultIdentityGeneratorAssembler.java | 38 - .../layered/LayeredApplicationAssembler.java | 9 +- .../layered/LayeredLayerAssembler.java | 16 +- .../DefaultSerializationAssembler.java | 50 - .../unitofwork/DefaultUnitOfWorkAssembler.java | 55 - .../polygene/bootstrap/ClassScannerTest.java | 13 +- .../bootstrap/DocumentationSupport.java | 419 ++++--- core/runtime/src/docs/runtime.txt | 2 +- .../association/AssociationInstance.java | 6 +- .../ApplicationAssemblyFactoryImpl.java | 3 - .../bootstrap/ApplicationModelFactoryImpl.java | 125 ++- .../runtime/bootstrap/ModuleAssemblyImpl.java | 86 +- .../runtime/composite/CompositeMethodModel.java | 2 +- .../runtime/composite/CompositeModel.java | 38 +- .../GenericFragmentInvocationHandler.java | 2 - .../polygene/runtime/service/ServiceModel.java | 29 +- .../polygene/runtime/structure/LayerModel.java | 2 - .../runtime/structure/ModuleInstance.java | 23 +- .../polygene/runtime/structure/ModuleModel.java | 4 + .../runtime/structure/UsedLayersModel.java | 6 + .../runtime/unitofwork/ModuleUnitOfWork.java | 11 - .../bootstrap/ApplicationAssemblerTest.java | 40 +- .../polygene/bootstrap/ErrorReportingTest.java | 2 - .../polygene/bootstrap/RuntimeMixinsTest.java | 69 +- ...ceCollisionWithUnrelatedReturnTypesTest.java | 1 + .../polygene/regression/qi382/Qi382Test.java | 7 +- .../polygene/regression/qi383/Qi383Test.java | 5 +- .../polygene/regression/qi78/IssueTest.java | 23 +- .../activation/ApplicationActivationTest.java | 19 +- .../ImportedServiceActivationTest.java | 70 +- .../runtime/activation/LayerActivationTest.java | 19 +- .../activation/ModuleActivationTest.java | 19 +- .../activation/ServiceActivationTest.java | 32 +- .../AppliesToOrConditionQI241Test.java | 6 +- .../association/AssociationAssignmentTest.java | 5 +- .../bootstrap/docs/DocumentationSupport.java | 25 +- .../runtime/concerns/GenericConcernTest.java | 8 +- .../runtime/defaults/UseDefaultsTest.java | 2 + .../entity/EntityBuilderWithStateTest.java | 2 - .../runtime/entity/EntityVisibilityTest.java | 17 +- .../entity/associations/AssociationTest.java | 10 + .../ConstructorInjectionOfThisTest.java | 51 +- .../injection/InvocationInjectionTest.java | 17 +- .../runtime/injection/ServiceInjectionTest.java | 60 +- .../ConfigurationInstantiationTest.java | 119 ++ .../objects/ObjectBuilderFactoryTest.java | 64 +- .../runtime/objects/ObjectConcernTest.java | 14 +- .../runtime/objects/ObjectVisibilityTest.java | 20 +- .../property/ValueNestedBuilderTest.java | 2 + .../runtime/query/IterableQuerySourceTest.java | 14 +- .../runtime/query/NonQueryableTest.java | 7 +- .../runtime/service/AvailableServiceTest.java | 10 +- .../service/ConfigurationConstraintTest.java | 124 +++ .../runtime/service/ServiceVisibilityTest.java | 18 +- .../runtime/structure/MixinVisibilityTest.java | 213 ++-- .../polygene/runtime/structure/ModuleTest.java | 54 +- .../PrivateCompositeVisibilityTest.java | 6 +- .../runtime/structure/StructureTest.java | 39 +- .../structure/TypeToCompositeLookupTest.java | 9 - .../transients/TransientVisibilityTest.java | 9 - .../unitofwork/PrivateEntityUnitOfWorkTest.java | 13 +- .../runtime/value/AssociationToValueTest.java | 5 +- .../runtime/value/NestedValueBuilderTest.java | 10 +- .../runtime/value/ValueComposite2Test.java | 8 +- .../runtime/value/ValueCompositeBasicsTest.java | 2 + .../runtime/value/ValueVisibilityTest.java | 8 - .../runtime/value/ValueWithAssociationTest.java | 5 +- .../visibility/VisibilityInUnitOfWorkTest.java | 8 +- .../test/composite/CleanStackTraceTest.java | 15 +- .../memory/MemoryEntityStoreTest.java | 2 + .../service/HelloWorldService.properties | 2 +- .../runtime/service/TestService1.properties | 20 + .../runtime/service/TestService2.properties | 20 + .../helpers/JSONManyAssociationStateTest.java | 1 + .../helpers/JsonNamedAssociationStateTest.java | 1 + .../polygene/test/AbstractPolygeneTest.java | 4 - .../polygene/test/EntityTestAssembler.java | 21 +- .../cache/AbstractEntityStoreWithCacheTest.java | 9 +- ...bstractConfigurationDeserializationTest.java | 6 +- .../test/entity/AbstractEntityStoreTest.java | 92 +- .../test/indexing/AbstractAnyQueryTest.java | 2 - .../AbstractMultiLayeredIndexingTest.java | 3 +- .../metrics/AbstractPolygeneMetricsTest.java | 6 +- .../test/metrics/AbstractTimingCaptureTest.java | 2 - .../test/model/assembly/AccessLayer.java | 10 +- .../test/model/assembly/AccountModule.java | 2 - .../model/assembly/ApplicationAssembler.java | 1 - .../test/model/assembly/ConfigLayer.java | 3 - .../test/model/assembly/ConfigModule.java | 3 - .../test/model/assembly/DomainLayer.java | 3 - .../test/model/assembly/FamilyModule.java | 3 - .../test/model/assembly/IndexingLayer.java | 3 - .../test/model/assembly/PersistenceLayer.java | 3 - .../test/model/assembly/PersistenceModule.java | 3 - .../test/model/assembly/PetShopModule.java | 3 - .../model/assembly/TestExecutionModule.java | 2 - .../test/model/assembly/TestSuite1Module.java | 2 - .../test/model/assembly/TestSuite2Module.java | 2 - .../test/model/assembly/TestSuite3Module.java | 2 - .../AbstractCollectionSerializationTest.java | 2 - dependencies.gradle | 13 +- distributions/src/src-dist/README.txt | 16 +- .../gradle/wrapper-install/build.gradle | 25 + .../gradle/wrapper-install/settings.gradle | 19 + .../ehcache/assembly/EhCacheAssembler.java | 2 - .../cache/memcache/MemcachePoolMixin.java | 69 +- .../memcache/assembly/MemcacheAssembler.java | 2 - .../cache/memcache/MemcacheCachePoolTest.java | 2 +- extensions/entitystore-cassandra/build.gradle | 1 + .../CassandraEntityStoreConfiguration.java | 2 + .../cassandra/CassandraEntityStoreMixin.java | 7 +- .../entitystore/cassandra/ClusterBuilder.java | 18 +- .../assembly/CassandraEntityStoreAssembler.java | 2 - .../cassandra/CassandraEntityStoreTest.java | 85 ++ .../cassandra/CassandraMapEntityStoreTest.java | 83 -- .../cassandra/EmptyCassandraTableMixin.java | 2 - .../file/assembly/FileEntityStoreAssembler.java | 2 - .../entitystore/file/FileEntityStoreTest.java | 2 +- .../file/FileEntityStoreWithCacheTest.java | 2 +- .../entitystore/geode/GeodeConfiguration.java | 81 -- .../geode/GeodeEntityStoreConfiguration.java | 81 ++ .../geode/GeodeEntityStoreMixin.java | 10 +- .../assembly/GeodeEntityStoreAssembler.java | 6 +- .../entitystore/geode/GeodeEntityStoreTest.java | 2 +- .../geode/GeodeEntityStoreWithCacheTest.java | 2 +- .../hazelcast/HazelcastConfiguration.java | 39 - .../HazelcastEntityStoreConfiguration.java | 50 + .../hazelcast/HazelcastEntityStoreMixin.java | 8 +- .../assembly/HazelcastEntityStoreAssembler.java | 6 +- .../hazelcast/HazelcastEntityStoreTest.java | 2 +- .../HazelcastEntityStoreWithCacheTest.java | 2 +- .../JCloudsEntityStoreConfiguration.java | 54 + .../jclouds/JCloudsEntityStoreMixin.java | 284 +++++ .../jclouds/JCloudsEntityStoreService.java | 48 + .../JCloudsMapEntityStoreConfiguration.java | 54 - .../jclouds/JCloudsMapEntityStoreMixin.java | 284 ----- .../jclouds/JCloudsMapEntityStoreService.java | 48 - .../assembly/JCloudsEntityStoreAssembler.java | 10 +- .../jclouds/JCloudsFilesystemTest.java | 6 +- .../entitystore/jclouds/JCloudsS3Test.java | 9 +- .../jclouds/JCloudsTransientTest.java | 2 +- .../jclouds/JCloudsWithCacheTest.java | 2 +- .../entitystore/jdbm/JdbmConfiguration.java | 52 - .../jdbm/JdbmEntityStoreConfiguration.java | 52 + .../entitystore/jdbm/JdbmEntityStoreMixin.java | 4 +- .../jdbm/JdbmEntityStoreService.java | 8 +- .../jdbm/assembly/JdbmEntityStoreAssembler.java | 6 +- .../entitystore/jdbm/JdbmEntityStoreTest.java | 2 +- .../jdbm/JdbmEntityStoreWithCacheTest.java | 2 +- .../LevelDBEntityStoreConfiguration.java | 3 + .../leveldb/LevelDBEntityStoreMixin.java | 15 +- .../assembly/LevelDBEntityStoreAssembler.java | 2 - .../leveldb/JavaLevelDBEntityStoreTest.java | 2 +- .../leveldb/JniLevelDBEntityStoreTest.java | 2 +- .../LevelDBEntityStoreWithCacheTest.java | 2 +- .../assembly/MemoryEntityStoreAssembler.java | 2 - .../memory/MemoryEntityStoreTest.java | 1 + .../memory/MemoryEntityStoreWithCacheTest.java | 1 + .../entitystore/mongodb/MongoAccessors.java | 32 - .../entitystore/mongodb/MongoDBAccessors.java | 32 + .../MongoDBEntityStoreConfiguration.java | 92 ++ .../mongodb/MongoDBEntityStoreMixin.java | 322 ++++++ .../mongodb/MongoDBEntityStoreService.java | 49 + .../mongodb/MongoEntityStoreConfiguration.java | 92 -- .../mongodb/MongoMapEntityStoreMixin.java | 322 ------ .../mongodb/MongoMapEntityStoreService.java | 49 - .../assembly/MongoDBEntityStoreAssembler.java | 10 +- .../mongodb/EmbedMongoDBMapEntityStoreTest.java | 88 ++ .../mongodb/EmbedMongoMapEntityStoreTest.java | 88 -- .../mongodb/MongoDBEntityStoreTest.java | 88 ++ .../MongoDBEntityStoreWithCacheTest.java | 84 ++ .../mongodb/MongoMapEntityStoreTest.java | 88 -- .../MongoMapEntityStoreWithCacheTest.java | 84 -- .../PreferencesEntityStoreMixin.java | 44 +- .../PreferencesEntityStoreAssembler.java | 2 - .../preferences/PreferencesEntityStoreTest.java | 4 +- .../redis/RedisEntityStoreConfiguration.java | 2 +- .../redis/RedisEntityStoreMixin.java | 177 +++ .../redis/RedisEntityStoreService.java | 49 + .../redis/RedisMapEntityStoreMixin.java | 177 --- .../redis/RedisMapEntityStoreService.java | 49 - .../assembly/RedisEntityStoreAssembler.java | 6 +- .../entitystore/redis/RedisEntityStoreTest.java | 80 ++ .../redis/RedisEntityStoreWithCacheTest.java | 74 ++ .../redis/RedisMapEntityStoreTest.java | 80 -- .../redis/RedisMapEntityStoreWithCacheTest.java | 74 -- .../entitystore/riak/RiakEntityStoreMixin.java | 384 +++++++ .../riak/RiakEntityStoreService.java | 53 + .../riak/RiakMapEntityStoreMixin.java | 384 ------- .../riak/RiakMapEntityStoreService.java | 53 - .../riak/assembly/RiakEntityStoreAssembler.java | 11 +- .../entitystore/riak/RiakEntityStoreTest.java | 71 ++ .../riak/RiakEntityStoreWithCacheTest.java | 69 ++ .../riak/RiakMapEntityStoreTest.java | 71 -- .../riak/RiakMapEntityStoreWithCacheTest.java | 69 -- .../sql/SQLEntityStoreConfiguration.java | 47 + .../entitystore/sql/SQLEntityStoreMixin.java | 244 +++++ .../entitystore/sql/SQLEntityStoreService.java | 43 + .../sql/SQLMapEntityStoreConfiguration.java | 47 - .../entitystore/sql/SQLMapEntityStoreMixin.java | 244 ----- .../sql/SQLMapEntityStoreService.java | 43 - .../AbstractSQLEntityStoreAssembler.java | 97 ++ .../AbstractSQLMapEntityStoreAssembler.java | 97 -- .../assembly/DerbySQLEntityStoreAssembler.java | 2 +- .../sql/assembly/H2SQLEntityStoreAssembler.java | 2 +- .../sql/assembly/MySQLEntityStoreAssembler.java | 2 +- .../PostgreSQLEntityStoreAssembler.java | 2 +- .../assembly/SQLiteEntityStoreAssembler.java | 2 +- .../sql/DerbySQLEntityStoreTest.java | 6 +- .../entitystore/sql/H2SQLEntityStoreTest.java | 2 +- .../entitystore/sql/MySQLEntityStoreTest.java | 8 +- .../sql/PostgreSQLEntityStoreTest.java | 4 +- .../entitystore/sql/SQLiteEntityStoreTest.java | 2 +- .../ElasticSearchClusterConfiguration.java | 2 +- .../ElasticSearchConfiguration.java | 50 - .../ElasticSearchIndexException.java | 36 - .../ElasticSearchIndexExporter.java | 5 +- .../elasticsearch/ElasticSearchIndexer.java | 2 +- .../ElasticSearchIndexingConfiguration.java | 49 + .../ElasticSearchIndexingException.java | 35 + .../elasticsearch/ElasticSearchSupport.java | 5 +- .../assembly/ESClientIndexQueryAssembler.java | 7 +- .../assembly/ESClusterIndexQueryAssembler.java | 2 - .../ESFilesystemIndexQueryAssembler.java | 6 +- .../elasticsearch/client/ESClientSupport.java | 6 +- .../filesystem/ESFilesystemSupport.java | 6 +- .../index/elasticsearch/ESEmbeddedRule.java | 9 +- .../ElasticSearchComplexQueryTest.java | 2 +- .../elasticsearch/ElasticSearchFinderTest.java | 2 +- .../ElasticSearchQueryMultimoduleTest.java | 4 +- .../elasticsearch/ElasticSearchQueryTest.java | 2 +- .../index/elasticsearch/ElasticSearchTest.java | 2 +- .../index/elasticsearch/ImmenseTermTest.java | 2 +- .../index/rdf/RdfIndexingEngineService.java | 30 - .../polygene/index/rdf/RdfIndexingService.java | 30 + .../rdf/assembly/RdfMemoryStoreAssembler.java | 6 +- .../assembly/RdfNativeSesameStoreAssembler.java | 6 +- .../assembly/RdfRdbmsSesameStoreAssembler.java | 6 +- .../index/rdf/indexing/RdfExporter.java | 106 -- .../index/rdf/indexing/RdfIndexExporter.java | 92 ++ .../index/rdf/indexing/RdfIndexerService.java | 239 ++++ .../index/rdf/indexing/RdfIndexingService.java | 240 ---- .../polygene/index/rdf/RdfComplexQueryTest.java | 2 +- .../polygene/index/rdf/RdfEntityFinderTest.java | 2 +- .../index/rdf/RdfNamedQueryMultimoduleTest.java | 3 - .../index/rdf/RdfQueryMultimoduleTest.java | 4 - .../apache/polygene/index/rdf/RdfQueryTest.java | 2 - .../polygene/index/rdf/qi95/Qi95IssueTest.java | 187 +--- .../polygene/index/solr/SolrQueryService.java | 3 +- .../index/sql/SQLIndexingConfiguration.java | 31 + .../sql/SQLIndexingEngineConfiguration.java | 31 - .../index/sql/SQLIndexingEngineService.java | 44 - .../polygene/index/sql/SQLIndexingService.java | 44 + .../AbstractSQLIndexQueryAssembler.java | 8 +- .../assembly/PostgreSQLIndexQueryAssembler.java | 4 +- .../support/postgresql/PostgreSQLService.java | 4 +- .../postgresql/PostgreSQLComplexQueryTest.java | 2 +- .../postgresql/PostgreSQLDBIntegrityTest.java | 2 +- .../postgresql/PostgreSQLEntityFinderTest.java | 2 +- .../sql/postgresql/PostgreSQLQueryTest.java | 2 +- .../codahale/CodahaleMetricsProvider.java | 3 +- .../assembly/CodahaleMetricsAssembler.java | 2 - .../polygene/migration/MigrationTest.java | 58 +- .../polygene/index/reindexer/ReindexerTest.java | 8 +- ...vaxJsonConfigurationDeserializationTest.java | 8 + gradle/wrapper/gradle-wrapper.jar | Bin 54227 -> 54416 bytes gradlew | 6 +- internals/testsupport-internal/build.gradle | 7 +- .../polygene/test/docker/DelayChecker.java | 60 + .../apache/polygene/test/docker/DockerRule.java | 156 +++ .../apache/polygene/test/docker/package.html | 25 + .../polygene/test/internal/DelayChecker.java | 60 - .../polygene/test/internal/DockerRule.java | 156 --- .../apache/polygene/test/internal/package.html | 25 - .../library/alarm/AlarmSystemAssembler.java | 2 - libraries/constraints/build.gradle | 2 + .../library/constraints/HostPortConstraint.java | 43 + .../constraints/HostPortListConstraint.java | 58 + .../constraints/annotation/HostPort.java | 37 + .../constraints/annotation/HostPortList.java | 37 + .../constraints/HostPortConstraintTest.java | 119 ++ .../constraints/HostPortListConstraintTest.java | 159 +++ .../fileconfig/FileConfigurationAssembler.java | 2 - .../fileconfig/FileConfigurationTest.java | 42 +- .../library/http/JettyServiceAssembler.java | 4 +- .../library/http/SecureJettyConfiguration.java | 2 +- .../http/VirtualHostJettyServiceTest.java | 2 - libraries/jmx/src/docs/jmx.txt | 2 +- .../polygene/library/jmx/JMXAssembler.java | 2 - .../apache/polygene/library/jmx/JMXTest.java | 15 +- .../log/assemblies/LoggingAssembler.java | 2 - .../trace/assemblies/TracingAssembler.java | 2 - .../polygene/library/rdf/Model2XMLTest.java | 54 +- .../library/rest/client/ClientAssembler.java | 3 +- .../ContextResourceClientFactoryTest.java | 2 + .../rest/client/ContinuousIntegrationTest.java | 2 + .../library/rest/client/RssReaderTest.java | 2 + .../library/rest/common/ValueAssembler.java | 2 - .../server/assembler/RestServerAssembler.java | 3 +- .../library/rest/admin/EntitiesResource.java | 1 - .../library/rest/admin/IndexResource.java | 10 +- .../library/rest/admin/RestAssembler.java | 2 - .../library/rest/admin/DomainAssembler.java | 4 +- .../polygene/library/rest/admin/RestTest.java | 4 +- .../restlet/PolygeneRestApplication.java | 84 +- .../PolygeneRestApplicationLauncher.java | 104 ++ .../restlet/assembly/CrudServiceAssembler.java | 2 - .../restlet/assembly/GenericRestLayer.java | 2 - .../assembly/RestApplicationAssembler.java | 1 - .../RestletCrudConnectivityAssembler.java | 2 - .../assembly/RestletCrudModuleAssembler.java | 2 - .../configuration/ConfigurationLayer.java | 2 - .../configuration/ConfigurationModule.java | 2 - .../connectivity/ConnectivityLayer.java | 2 - .../assembly/connectivity/RestModule.java | 2 - .../assembly/connectivity/SecurityModule.java | 2 - .../restlet/assembly/domain/CrudModule.java | 2 - .../restlet/assembly/domain/DomainLayer.java | 2 - .../infrastructue/FileStorageModule.java | 4 +- .../assembly/infrastructue/IndexingModule.java | 2 - .../infrastructue/InfrastructureLayer.java | 2 - .../infrastructue/SerializationModule.java | 2 - .../assembly/resource/ResourceLayer.java | 2 - .../polygene/library/scripting/Scripting.java | 2 +- .../library/scripting/HelloSpeakerTest.java | 31 +- .../shiro/assembly/PasswordDomainAssembler.java | 2 - .../assembly/PermissionsDomainAssembler.java | 2 - .../assembly/StandaloneShiroAssembler.java | 2 - .../library/shiro/web/ShiroFilterService.java | 5 +- .../shiro/web/assembly/HttpShiroAssembler.java | 25 +- .../PolygeneApplicationFactoryBean.java | 8 +- .../importer/SpringImporterAssembler.java | 3 +- .../sql/liquibase/LiquibaseAssembler.java | 2 - ...bstractPooledDataSourceServiceAssembler.java | 2 - .../sql/assembly/DataSourceAssembler.java | 2 - .../sql/assembly/DataSourceJMXAssembler.java | 2 - .../assembly/ExternalDataSourceAssembler.java | 2 - .../DataSourceConfigurationState.java | 3 +- ...taSourceConfigurationManagerServiceTest.java | 3 - .../assembly/PersistingSequencingAssembler.java | 2 - .../assembly/TransientSequencingAssembler.java | 2 - .../uid/uuid/assembly/UuidServiceAssembler.java | 2 - .../uowfile/bootstrap/UoWFileAssembler.java | 2 - .../docs/tutorials/howto-releasing-apache.txt | 11 +- manual/src/docs/userguide/extensions.txt | 4 + manual/src/docs/userguide/glossary.txt | 8 + manual/src/docs/userguide/tools.txt | 9 +- .../src/docs/website/resources/css/polygene.css | 4 + .../docs/website/resources/images/cloudbees.png | Bin 7493 -> 0 bytes .../website/resources/images/library-jmx.png | Bin 36579 -> 244987 bytes .../resources/images/tools-entity-viewer.png | Bin 52322 -> 0 bytes .../images/tools-envisage-stacked-collapsed.png | Bin 30355 -> 211242 bytes .../resources/images/tools-envisage-stacked.png | Bin 36070 -> 225560 bytes .../images/tools-envisage-structure.png | Bin 90145 -> 277222 bytes .../resources/images/tools-envisage-type.png | Bin 88278 -> 279752 bytes .../moneytransfer/test/TransferMoneyTest.java | 21 +- .../moneytransfer/test/TransferMoneyTest2.java | 29 +- .../sample/forum/assembler/ForumAssembler.java | 2 - .../apache/polygene/sample/forum/web/Main.java | 4 +- .../sample/rental/web/assembly/PagesModule.java | 2 - .../assembly/RentalApplicationAssembler.java | 2 - .../rental/web/assembly/RentalModule.java | 2 - .../rental/web/assembly/StorageModule.java | 2 - .../sample/sqlsupport/AppAssembler.java | 2 - .../swing/binding/SwingBindingAssembler.java | 2 +- .../sample/swing/binding/example/Main.java | 20 +- .../jdbm/JdbmEntityStorePerformanceTest.java | 6 +- .../MemoryEntityStorePerformanceTest.java | 13 +- .../sql/DerbySQLEntityStorePerformanceTest.java | 51 +- .../PostgreSQLEntityStorePerformanceTest.java | 57 +- .../indexing/rdf/QueryPerformanceTest.java | 9 +- .../CompositeCreationPerformanceTest.java | 14 +- .../composite/InvocationPerformanceTest.java | 6 +- .../PropertyMixinInvocationPerformanceTest.java | 4 +- .../object/ObjectCreationPerformanceTest.java | 16 +- .../ServiceInvocationPerformanceTest.java | 16 +- .../test/regression/ConcernsOnPropertyTest.java | 6 +- tools/envisage/src/docs/envisage.txt | 56 + .../java/org/apache/polygene/envisage/Main.java | 7 +- .../envisage/school/EnvisageSchoolSample.java | 12 +- .../envisage/school/SchoolAssembler.java | 8 +- .../persistence/PersistenceAssembler.java | 4 +- tools/generator-polygene/.gitignore | 1 + tools/generator-polygene/app/index.js | 238 ++-- .../application.java.tmpl | 83 ++ .../CommandLineApplication/bootstrap.tmpl | 49 + .../ConfigModule/bootstrap.tmpl | 3 + .../templates/ConfigurationLayer/bootstrap.tmpl | 2 +- .../HttpServerModule/bootstrap.tmpl | 95 ++ .../HttpServerModule/module.js | 29 + .../RestApiModule/DefaultEnroler.tmpl | 7 +- .../templates/ConnectivityLayer/bootstrap.tmpl | 3 +- .../DomainLayer/DomainModule/Configuration.tmpl | 10 +- .../DomainLayer/DomainModule/Crud.tmpl | 5 +- .../DomainLayer/DomainModule/Entity.tmpl | 5 +- .../DomainLayer/DomainModule/bootstrap.tmpl | 19 +- .../DomainModule/config.properties.tmpl | 22 + .../DomainLayer/DomainModule/config.yaml.tmpl | 23 - .../DomainLayer/DomainModule/module.js | 12 +- .../DomainLayer/JmxModule/bootstrap.tmpl | 6 +- .../DomainLayer/SecurityModule/bootstrap.tmpl | 20 - .../IndexingModule/bootstrap.tmpl | 29 +- .../indexing/ds-index-postgresql.properties | 23 + .../indexing/index-rdf.properties | 57 + .../IndexingModule/indexing/solr-schema.xml | 606 ++++++++++ .../IndexingModule/indexing/solrconfig.xml | 1036 ++++++++++++++++++ .../IndexingModule/module.js | 13 + .../MetricsModule/bootstrap.tmpl | 31 +- .../InfrastructureLayer/MetricsModule/module.js | 8 +- .../StorageModule/bootstrap.tmpl | 45 +- .../InfrastructureLayer/StorageModule/module.js | 18 + .../storage/ds-es-derbysql.properties | 24 + .../storage/ds-es-h2sql.properties | 24 + .../storage/ds-es-mysql.properties | 24 + .../storage/ds-es-postgresql.properties | 24 + .../storage/ds-es-sqlite.properties | 24 + .../storage/es-cassandra.properties | 50 + .../StorageModule/storage/es-file.properties | 49 + .../StorageModule/storage/es-geode.properties | 53 + .../storage/es-hazelcast.properties | 29 + .../StorageModule/storage/es-jclouds.properties | 48 + .../StorageModule/storage/es-jdbm.properties | 31 + .../StorageModule/storage/es-leveldb.properties | 52 + .../StorageModule/storage/es-mongodb.properties | 71 ++ .../StorageModule/storage/es-redis.properties | 44 + .../StorageModule/storage/es-riak.properties | 107 ++ .../StorageModule/storage/es-sql.properties | 36 + .../InfrastructureLayer/bootstrap.tmpl | 12 +- .../DevelopmentKeyManagement.java.tmpl | 259 +++++ .../RestAPIApplication/Launcher.java.tmpl | 72 ++ .../app/templates/RestAPIApplication/app.js | 23 +- .../RestAPIApplication/application.java.tmpl | 89 ++ .../RestAPIApplication/bootstrap-test.tmpl | 336 ++++++ .../templates/RestAPIApplication/bootstrap.tmpl | 71 ++ .../RestAPIApplication/web-shiro.ini.tmpl | 44 + .../templates/RestAPIApplication/web.xml.tmpl | 46 - .../CommandLineModule/bootstrap.tmpl | 2 +- .../app/templates/buildtool/build.js | 8 +- .../app/templates/buildtool/gradle-app.tmpl | 118 +- .../templates/buildtool/gradle-bootstrap.tmpl | 60 +- .../app/templates/buildtool/gradle-model.tmpl | 8 +- .../app/templates/buildtool/gradle-rest.tmpl | 6 +- .../app/templates/buildtool/gradle-root.tmpl | 18 +- .../app/templates/buildtool/gradle-wrapper.jar_ | Bin 51348 -> 0 bytes .../buildtool/gradle-wrapper.properties_ | 24 - .../app/templates/buildtool/gradlew-bat.tmpl | 109 -- .../app/templates/buildtool/gradlew.tmpl | 183 ---- tools/generator-polygene/build.gradle | 24 +- tools/generator-polygene/package.json | 2 +- .../src/docs/yeoman_polygene.txt | 438 ++++++++ tools/generator-polygene/test/generator_test.js | 6 +- tools/model-detail/dev-status.xml | 2 +- .../descriptor/ActivatorDetailDescriptor.java | 29 + .../descriptor/ApplicationDetailDescriptor.java | 26 + .../descriptor/CompositeDetailDescriptor.java | 27 +- .../CompositeMethodDetailDescriptor.java | 36 +- .../descriptor/ConstructorDetailDescriptor.java | 8 + .../descriptor/EntityDetailDescriptor.java | 10 +- .../ImportedServiceCompositeDescriptor.java | 17 + .../ImportedServiceDetailDescriptor.java | 14 + .../InjectedFieldDetailDescriptor.java | 9 + .../InjectedMethodDetailDescriptor.java | 8 + .../InjectedParametersDetailDescriptor.java | 29 +- .../model/descriptor/LayerDetailDescriptor.java | 29 + .../MethodConcernDetailDescriptor.java | 28 + .../MethodConcernsDetailDescriptor.java | 14 + .../MethodConstraintDetailDescriptor.java | 9 + .../MethodConstraintsDetailDescriptor.java | 6 + .../MethodSideEffectDetailDescriptor.java | 27 + .../MethodSideEffectsDetailDescriptor.java | 9 + .../model/descriptor/MixinDetailDescriptor.java | 28 + .../descriptor/ModuleDetailDescriptor.java | 21 + .../descriptor/ObjectDetailDescriptor.java | 28 + .../descriptor/ServiceDetailDescriptor.java | 7 + .../tools/model/descriptor/ServiceUsage.java | 17 + .../descriptor/TransientDetailDescriptor.java | 7 + .../model/descriptor/ValueDetailDescriptor.java | 10 +- .../tools/model/descriptor/package.html | 2 +- .../polygene/tools/model/util/APIFinder.java | 4 +- .../polygene/tools/model/util/package.html | 2 +- tools/src/docs/envisage.txt | 55 - tools/src/docs/yeoman_polygene.txt | 388 ------- .../cargo/step2/SequencingConcernTest.java | 36 +- .../composites/tutorial10/HelloWorldTest.java | 16 +- .../composites/tutorial3/HelloWorldTest.java | 16 +- .../composites/tutorial4/HelloWorldTest.java | 16 +- .../composites/tutorial5/HelloWorldTest.java | 16 +- .../composites/tutorial6/HelloWorldTest.java | 16 +- .../composites/tutorial7/HelloWorldTest.java | 16 +- .../composites/tutorial8/HelloWorldTest.java | 18 +- .../composites/tutorial9/HelloWorldTest.java | 18 +- .../polygene/tutorials/hello/HelloTest4.java | 7 +- 550 files changed, 11843 insertions(+), 7355 deletions(-) ----------------------------------------------------------------------
