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/07/31 04:59:59 UTC
[79/81] [abbrv] zest-java git commit: Tightening everything up after
massive namespace change. Removal of practically all "Qi4j" names and
references.
Tightening everything up after massive namespace change. Removal of practically all "Qi4j" names and references.
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/ab97249b
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/ab97249b
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/ab97249b
Branch: refs/heads/develop
Commit: ab97249b165628fb3d9394e6aa0997939cd84b32
Parents: 8f20b31
Author: Niclas Hedhman <ni...@hedhman.org>
Authored: Fri Jul 31 03:21:19 2015 +0800
Committer: Niclas Hedhman <ni...@hedhman.org>
Committed: Fri Jul 31 10:51:29 2015 +0800
----------------------------------------------------------------------
build.gradle | 62 +-
buildSrc/src/bin/devstatus.py | 2 +-
buildSrc/src/main/groovy/VersionClass.groovy | 2 +-
core/api/build.gradle | 10 +-
core/api/dev-status.xml | 6 +-
.../src/main/java/org/apache/zest/api/Qi4j.java | 192 -----
.../main/java/org/apache/zest/api/ZestApi.java | 192 +++++
.../zest/api/common/ConstructionException.java | 2 +-
.../apache/zest/api/common/QualifiedName.java | 6 +-
.../org/apache/zest/api/common/UseDefaults.java | 2 +-
.../zest/api/composite/CompositeContext.java | 4 +-
.../zest/api/composite/PropertyMapper.java | 4 +-
.../zest/api/configuration/Configuration.java | 8 +-
.../ConstraintViolationException.java | 13 +-
.../apache/zest/api/entity/EntityReference.java | 4 +-
.../zest/api/injection/scope/Structure.java | 4 +-
.../zest/api/metrics/MetricsCounterFactory.java | 2 +-
.../api/metrics/MetricsHealthCheckFactory.java | 2 +-
.../api/metrics/MetricsHistogramFactory.java | 2 +-
.../zest/api/metrics/MetricsMeterFactory.java | 2 +-
.../zest/api/metrics/MetricsTimerFactory.java | 2 +-
.../org/apache/zest/api/property/Numbers.java | 2 +-
.../zest/api/service/qualifier/package.html | 12 +-
.../api/structure/ApplicationDescriptor.java | 4 +-
.../java/org/apache/zest/api/util/Classes.java | 6 +-
.../api/configuration/ConfigurationTest.java | 4 +-
.../DeclareConfigurationDefaultsTest.java | 4 +-
.../dataset/iterable/IterableDataSetTest.java | 4 +-
.../zest/api/docsupport/ApplicationDocs.java | 14 +-
.../api/injection/scope/StateFieldTest.java | 4 +-
.../decoratorMixin/DecoratorMixinTest.java | 4 +-
.../zest/api/object/ObjectBuilderTest.java | 4 +-
.../zest/api/property/PropertyErrorTest.java | 4 +-
.../apache/zest/api/unitofwork/RemovalTest.java | 4 +-
.../api/unitofwork/UnitOfWorkTemplateTest.java | 4 +-
.../org/apache/zest/api/util/ClassesTest.java | 4 +-
.../zest/api/value/DocumentationSupport.java | 4 +-
.../api/value/ValueBuilderTemplateTest.java | 4 +-
.../zest/api/value/ValueCompositeTest.java | 4 +-
core/bootstrap/build.gradle | 4 +-
core/bootstrap/dev-status.xml | 6 +-
.../org/apache/zest/bootstrap/Energy4Java.java | 14 +-
.../org/apache/zest/bootstrap/Qi4jRuntime.java | 32 -
.../apache/zest/bootstrap/RuntimeFactory.java | 12 +-
.../zest/bootstrap/SingletonAssembler.java | 12 +-
.../org/apache/zest/bootstrap/ZestRuntime.java | 32 +
.../bootstrap/builder/ApplicationBuilder.java | 6 +-
.../layered/LayeredApplicationAssembler.java | 14 +-
.../zest/bootstrap/DocumentationSupport.java | 14 +-
.../builder/ApplicationBuilderTest.java | 2 +-
core/functional/dev-status.xml | 6 +-
core/io/build.gradle | 4 +-
core/io/dev-status.xml | 6 +-
core/runtime/build.gradle | 6 +-
core/runtime/dev-status.xml | 6 +-
.../apache/zest/runtime/Qi4jRuntimeImpl.java | 358 --------
.../apache/zest/runtime/ZestRuntimeImpl.java | 358 ++++++++
.../AbstractAssociationInstance.java | 2 +-
.../zest/runtime/composite/CompactLevel.java | 2 +-
.../runtime/composite/FragmentClassLoader.java | 14 +-
.../composite/FragmentInvocationHandler.java | 4 +-
.../runtime/composite/TransientClassLoader.java | 10 +-
.../runtime/composite/TransientInstance.java | 4 +-
.../StructureInjectionProviderFactory.java | 4 +-
.../apache/zest/runtime/internal/Activator.java | 8 +-
.../runtime/structure/ApplicationInstance.java | 8 +-
.../runtime/structure/ApplicationModel.java | 8 +-
.../apache/zest/api/common/OptionalTest.java | 4 +-
.../zest/api/common/PropertyErrorTest.java | 4 +-
.../zest/api/common/PropertyTypeTest.java | 4 +-
.../org/apache/zest/api/common/RemovalTest.java | 4 +-
.../zest/api/common/ValueCompositeTest.java | 4 +-
.../constraints/PropertyConstraintTest.java | 4 +-
.../zest/regression/qi230/Qi230IssueTest.java | 8 +-
...faceCollisionWithRelatedReturnTypesTest.java | 4 +-
...ceCollisionWithUnrelatedReturnTypesTest.java | 6 +-
.../apache/zest/regression/qi377/IssueTest.java | 4 +-
.../qi377/SetAssociationInSideEffectTest.java | 4 +-
...alueCollisionWithRelatedReturnTypesTest.java | 4 +-
.../apache/zest/regression/qi382/Qi382Test.java | 4 +-
.../apache/zest/regression/qi383/Qi383Test.java | 4 +-
.../apache/zest/regression/qi53/IssueTest.java | 4 +-
.../apache/zest/regression/qi55/IssueTest.java | 4 +-
.../apache/zest/regression/qi59/IssueTest.java | 4 +-
.../apache/zest/regression/qi65/IssueTest.java | 4 +-
.../apache/zest/regression/qi74/IssueTest.java | 4 +-
.../apache/zest/regression/qi78/IssueTest.java | 4 +-
.../apache/zest/regression/qi94/IssueTest.java | 6 +-
.../org/apache/zest/runtime/Qi4jAPITest.java | 81 --
.../org/apache/zest/runtime/Qi4jSPITest.java | 127 ---
.../org/apache/zest/runtime/ZestAPITest.java | 81 ++
.../org/apache/zest/runtime/ZestSPITest.java | 127 +++
.../runtime/appliesto/AppliesToFilterTest.java | 4 +-
.../AppliesToOrConditionQI241Test.java | 4 +-
.../zest/runtime/appliesto/AppliesToTest.java | 4 +-
.../appliesto/FragmentAppliesToTest.java | 4 +-
.../association/AssociationEqualityTest.java | 40 +-
.../DereferenceForBootstrappedConcernsTest.java | 8 +-
.../runtime/composite/AbstractMixinTest.java | 6 +-
.../composite/CompositeFactoryImplTest.java | 4 +-
.../runtime/composite/FunctionalListTest.java | 4 +-
.../zest/runtime/composite/MapOverrideTest.java | 4 +-
.../zest/runtime/composite/QI247Test1.java | 4 +-
.../zest/runtime/composite/QI247Test2.java | 4 +-
.../zest/runtime/composite/QI256Test.java | 4 +-
.../runtime/composite/TransientAsClassTest.java | 4 +-
.../runtime/concerns/GenericConcernTest.java | 4 +-
.../runtime/concerns/ModuleConcernTest.java | 4 +-
.../concerns/PropertyInheritanceTest.java | 4 +-
.../runtime/constraints/ConstraintsTest.java | 4 +-
.../constraints/ConstraintsTest.properties | 6 +-
.../zest/runtime/defaults/UseDefaultsTest.java | 4 +-
.../zest/runtime/entity/AggregatedTest.java | 4 +-
.../entity/EntityBuilderWithStateTest.java | 4 +-
.../entity/EntityCompositeEqualityTest.java | 4 +-
.../zest/runtime/entity/EntityCreationTest.java | 4 +-
.../zest/runtime/entity/EntityTypeTest.java | 4 +-
.../runtime/entity/EntityVisibilityTest.java | 6 +-
.../zest/runtime/entity/LifecycleTest.java | 4 +-
.../apache/zest/runtime/entity/QI273Test.java | 4 +-
.../entity/associations/AssociationTest.java | 4 +-
.../associations/ImmutableAssociationTest.java | 4 +-
.../injection/ActivatorInjectionTest.java | 4 +-
.../IllegalUnitOfWorkInjectionTest.java | 4 +-
.../runtime/injection/StateInjectionTest.java | 4 +-
.../injection/StateParameterInjectionTest.java | 4 +-
.../injection/StructureInjectionTest.java | 46 +-
.../runtime/injection/ThisInjectionTest.java | 6 +-
.../injection/UnitOfWorkInjectionTest.java | 4 +-
.../runtime/injection/UsesGenericClassTest.java | 4 +-
.../runtime/injection/UsesGenericListTest.java | 4 +-
.../zest/runtime/injection/UsesGraphTest.java | 4 +-
.../runtime/injection/UsesInjectionTest.java | 4 +-
.../EagerServiceInstantiationTest.java | 4 +-
.../ServiceInstantiationTests.java | 4 +-
.../TransientInstantiationTests.java | 4 +-
.../instantiation/ValueInstantiationTests.java | 4 +-
.../zest/runtime/mixin/AssemblyMixinTest.java | 4 +-
.../zest/runtime/mixin/AssemblyRoleTest.java | 4 +-
.../zest/runtime/mixin/InitializableTest.java | 4 +-
.../InvokeServiceFromModuleAssemblyTest.java | 4 +-
.../apache/zest/runtime/mixin/JDKMixinTest.java | 4 +-
.../mixin/MethodInterceptionMixinTest.java | 4 +-
.../zest/runtime/mixin/MixinPrecedenceTest.java | 4 +-
.../mixin/MixinsOnThisInjectionTest.java | 4 +-
.../zest/runtime/mixin/PrivateMixinTest.java | 4 +-
.../apache/zest/runtime/mixin/Qi228Test.java | 4 +-
.../runtime/objects/ObjectVisibilityTest.java | 6 +-
.../runtime/property/ImmutablePropertyTest.java | 4 +-
.../runtime/property/PropertyEqualityTest.java | 16 +-
.../property/PropertyStringArrayTest.java | 4 +-
.../zest/runtime/property/PropertyTest.java | 4 +-
.../property/ValueNestedBuilderTest.java | 4 +-
.../zest/runtime/query/NonQueryableTest.java | 4 +-
.../query/QueryBuilderFactoryImplTest.java | 4 +-
.../runtime/service/ComplexActivatableTest.java | 4 +-
.../zest/runtime/service/ConfigurationTest.java | 4 +-
.../zest/runtime/service/ServiceFinderTest.java | 4 +-
.../runtime/service/ServiceVisibilityTest.java | 6 +-
.../sideeffects/GenericSideEffectTest.java | 4 +-
.../sideeffects/ModuleSideEffectTest.java | 4 +-
.../sideeffects/SampleTransientTest.java | 4 +-
.../sideeffects/SpecificSideEffectTest.java | 4 +-
.../runtime/structure/ApplicationModeTest.java | 6 +-
.../structure/CompositeDescriptorTest.java | 4 +-
.../runtime/threaded/ContextCompositeTest.java | 4 +-
.../transients/TransientVisibilityTest.java | 6 +-
.../unitofwork/AutoCloseableUoWTest.java | 4 +-
.../unitofwork/PrivateEntityUnitOfWorkTest.java | 2 +-
.../zest/runtime/unitofwork/RemovalTest.java | 4 +-
.../unitofwork/UnitOfWorkFactoryTest.java | 4 +-
.../runtime/value/NestedValueBuilderTest.java | 4 +-
.../runtime/value/ValueCompositeBasicsTest.java | 4 +-
.../zest/runtime/value/ValueEqualityTest.java | 32 +-
.../ValueInjectionDeserializationTest.java | 4 +-
.../value/ValueSerializationRegressionTest.java | 4 +-
.../zest/runtime/value/ValueVisibilityTest.java | 6 +-
.../runtime/value/ValueWithAssociationTest.java | 4 +-
.../visibility/VisibilityInUnitOfWorkTest.java | 4 +-
.../service/importer/InstanceImporterTest.java | 4 +-
.../service/importer/NewObjectImporterTest.java | 4 +-
.../importer/ServiceInstanceImporterTest.java | 4 +-
.../test/java/org/apache/zest/test/ASMTest.java | 80 +-
.../test/composite/CleanStackTraceTest.java | 20 +-
core/spi/build.gradle | 6 +-
core/spi/dev-status.xml | 6 +-
.../main/java/org/apache/zest/spi/Qi4jSPI.java | 69 --
.../main/java/org/apache/zest/spi/ZestSPI.java | 69 ++
.../zest/spi/entity/QualifiedIdentity.java | 8 +-
.../ConcurrentModificationCheckConcern.java | 4 +-
.../helpers/JSONMapEntityStoreMixin.java | 4 +-
.../helpers/MapEntityStoreMixin.java | 4 +-
.../zest/spi/value/ValueSerializerAdapter.java | 4 +-
core/testsupport/build.gradle | 4 +-
core/testsupport/dev-status.xml | 6 +-
.../src/docs/reference/ref-testsupport.txt | 4 +-
core/testsupport/src/docs/testsupport.txt | 2 +-
.../apache/zest/test/AbstractQi4jBaseTest.java | 128 ---
.../zest/test/AbstractQi4jScenarioTest.java | 143 ----
.../org/apache/zest/test/AbstractQi4jTest.java | 85 --
.../apache/zest/test/AbstractZestBaseTest.java | 128 +++
.../zest/test/AbstractZestScenarioTest.java | 143 ++++
.../org/apache/zest/test/AbstractZestTest.java | 85 ++
.../zest/test/cache/AbstractCachePoolTest.java | 4 +-
...bstractConfigurationDeserializationTest.java | 4 +-
.../test/entity/AbstractEntityStoreTest.java | 4 +-
.../test/indexing/AbstractAnyQueryTest.java | 4 +-
.../zest/test/indexing/AbstractQueryTest.java | 2 +-
.../java/org/apache/zest/test/util/Assume.java | 5 +-
.../AbstractCollectionSerializationTest.java | 4 +-
.../test/value/AbstractJsonDateFormatTest.java | 4 +-
.../AbstractPlainValueSerializationTest.java | 4 +-
...AbstractValueCompositeSerializationTest.java | 4 +-
etc/qi4j-api-checkstyle.xml | 213 -----
etc/qi4j-runtime-checkstyle.xml | 209 -----
etc/qi4j-tests-checkstyle.xml | 197 -----
etc/zest-api-checkstyle.xml | 213 +++++
etc/zest-runtime-checkstyle.xml | 209 +++++
etc/zest-tests-checkstyle.xml | 197 +++++
extensions/cache-ehcache/build.gradle | 8 +-
extensions/cache-ehcache/dev-status.xml | 6 +-
.../zest/cache/ehcache/EhCachePoolMixin.java | 2 +-
extensions/cache-memcache/build.gradle | 6 +-
extensions/cache-memcache/dev-status.xml | 6 +-
extensions/entitystore-file/build.gradle | 16 +-
extensions/entitystore-file/dev-status.xml | 6 +-
.../entitystore-file/src/docs/es-file.txt | 2 +-
.../file/FileEntityStoreConfiguration.java | 2 +-
.../entitystore/file/FileEntityStoreMixin.java | 2 +-
.../entitystore-hazelcast/README.persistent | 2 +-
extensions/entitystore-hazelcast/build.gradle | 14 +-
extensions/entitystore-hazelcast/dev-status.xml | 6 +-
.../hazelcast/HazelcastEntityStoreMixin.java | 2 +-
.../HazelcastEntityStoreService.properties | 2 +-
.../zest/entitystore/hazelcast/hazelcast.xml | 2 +-
extensions/entitystore-jclouds/build.gradle | 10 +-
extensions/entitystore-jclouds/dev-status.xml | 6 +-
.../JCloudsMapEntityStoreConfiguration.java | 2 +-
.../jclouds/JCloudsMapEntityStoreMixin.java | 4 +-
extensions/entitystore-jdbm/build.gradle | 12 +-
extensions/entitystore-jdbm/dev-status.xml | 6 +-
.../entitystore-jdbm/src/docs/es-jdbm.txt | 2 +-
.../entitystore/jdbm/JdbmConfiguration.java | 2 +-
.../entitystore/jdbm/JdbmEntityStoreMixin.java | 2 +-
.../entitystore/jdbm/DocumentationSupport.java | 4 +-
extensions/entitystore-leveldb/build.gradle | 12 +-
extensions/entitystore-leveldb/dev-status.xml | 6 +-
.../zest/entitystore/leveldb/package.html | 2 +-
extensions/entitystore-memory/build.gradle | 8 +-
extensions/entitystore-memory/dev-status.xml | 6 +-
extensions/entitystore-mongodb/build.gradle | 10 +-
extensions/entitystore-mongodb/dev-status.xml | 6 +-
.../mongodb/MongoMapEntityStoreMixin.java | 8 +-
.../mongodb/MongoMapEntityStoreTest.java | 4 +-
.../MongoMapEntityStoreWithCacheTest.java | 4 +-
extensions/entitystore-preferences/build.gradle | 8 +-
.../entitystore-preferences/dev-status.xml | 6 +-
.../prefs/PreferencesEntityStoreMixin.java | 6 +-
.../zest/entitystore/DocumentationSupport.java | 4 +-
extensions/entitystore-redis/build.gradle | 10 +-
extensions/entitystore-redis/dev-status.xml | 6 +-
extensions/entitystore-riak/build.gradle | 10 +-
extensions/entitystore-riak/dev-status.xml | 6 +-
.../riak/AbstractRiakMapEntityStore.java | 4 +-
.../riak/RiakHttpEntityStoreConfiguration.java | 2 +-
.../RiakProtobufEntityStoreConfiguration.java | 2 +-
extensions/entitystore-sql/build.gradle | 12 +-
extensions/entitystore-sql/dev-status.xml | 6 +-
extensions/entitystore-sql/src/docs/es-sql.txt | 2 +-
.../entitystore/sql/SQLEntityStoreMixin.java | 8 +-
.../zest/entitystore/sql/internal/SQLs.java | 4 +-
.../sql/DerbySQLEntityStoreTest.java | 2 +-
.../entitystore/sql/H2SQLEntityStoreTest.java | 2 +-
.../entitystore/sql/SQLiteEntityStoreTest.java | 2 +-
extensions/indexing-elasticsearch/build.gradle | 8 +-
.../indexing-elasticsearch/dev-status.xml | 6 +-
.../ElasticSearchConfiguration.java | 4 +-
.../internal/AbstractElasticSearchSupport.java | 6 +-
.../ElasticSearchComplexQueryTest.java | 6 +-
.../elasticsearch/ElasticSearchFinderTest.java | 6 +-
.../elasticsearch/ElasticSearchQueryTest.java | 6 +-
.../index/elasticsearch/ElasticSearchTest.java | 10 +-
.../index/elasticsearch/ImmenseTermTest.java | 10 +-
extensions/indexing-rdf/build.gradle | 14 +-
extensions/indexing-rdf/dev-status.xml | 6 +-
.../index/rdf/query/RdfQueryParserFactory.java | 4 +-
.../rdf/query/internal/RdfQueryParserImpl.java | 8 +-
.../apache/zest/index/rdf/ContainsAllTest.java | 4 +-
.../org/apache/zest/index/rdf/ContainsTest.java | 4 +-
.../zest/index/rdf/RDFPerformanceTest.java | 4 +-
.../zest/index/rdf/RdfNamedQueryTest.java | 144 ++--
.../zest/index/rdf/qi173/Qi173IssueTest.java | 4 +-
.../zest/index/rdf/qi64/AbstractIssueTest.java | 10 +-
.../withPropagationMandatory/IssueTest.java | 4 +-
.../qi64/withPropagationRequired/IssueTest.java | 4 +-
.../withPropagationRequiresNew/IssueTest.java | 4 +-
.../zest/index/rdf/qi66/Qi66IssueTest.java | 14 +-
.../zest/index/rdf/qi95/Qi95IssueTest.java | 4 +-
extensions/indexing-solr/build.gradle | 10 +-
extensions/indexing-solr/dev-status.xml | 6 +-
.../zest/index/solr/SolrEntityFinderTest.java | 4 +-
.../zest/index/solr/SolrNamedQueryTest.java | 4 +-
.../zest/index/solr/SolrQueryServiceTest.java | 8 +-
.../apache/zest/index/solr/SolrQueryTest.java | 4 +-
extensions/indexing-sql/build.gradle | 12 +-
extensions/indexing-sql/dev-status.xml | 6 +-
extensions/indexing-sql/instructions.txt | 2 +-
extensions/indexing-sql/src/docs/index-sql.txt | 2 +-
.../support/skeletons/AbstractSQLIndexing.java | 8 +-
.../support/skeletons/AbstractSQLQuerying.java | 8 +-
.../support/skeletons/AbstractSQLStartup.java | 2 +-
.../postgresql/PostgreSQLDBIntegrityTest.java | 4 +-
.../sql/postgresql/PostgreSQLQueryTest.java | 2 +-
extensions/metrics-yammer/build.gradle | 6 +-
extensions/metrics-yammer/dev-status.xml | 6 +-
.../metrics/yammer/NoMetricsInstalledTest.java | 6 +-
.../apache/zest/metrics/yammer/YammerTest.java | 6 +-
extensions/migration/build.gradle | 6 +-
extensions/migration/dev-status.xml | 6 +-
.../apache/zest/migration/MigrationTest.java | 6 +-
extensions/reindexer/build.gradle | 10 +-
extensions/reindexer/dev-status.xml | 6 +-
.../zest/index/reindexer/ReindexerTest.java | 10 +-
.../jdbm/JdbmEntityStoreService.properties | 2 +-
.../rdf/repository/rdf-indexing.properties | 2 +-
.../valueserialization-jackson/build.gradle | 6 +-
.../valueserialization-jackson/dev-status.xml | 6 +-
.../valueserialization-orgjson/build.gradle | 6 +-
.../valueserialization-orgjson/dev-status.xml | 6 +-
extensions/valueserialization-stax/build.gradle | 6 +-
.../valueserialization-stax/dev-status.xml | 6 +-
libraries/alarm/build.gradle | 6 +-
libraries/alarm/dev-status.xml | 6 +-
.../apache/zest/library/alarm/AlarmModel.java | 2 +-
.../apache/zest/library/alarm/AlarmPoint.java | 2 +-
.../alarm/ExtendedAlarmModelService.java | 2 +-
.../library/alarm/SimpleAlarmModelService.java | 2 +-
.../alarm/StandardAlarmModelService.java | 2 +-
.../library/alarm/AlarmHistoryImplTest.java | 4 +-
.../zest/library/alarm/AlarmPointImplTest.java | 4 +-
.../zest/library/alarm/AlarmProxyTest.java | 4 +-
.../zest/library/alarm/AlarmServiceTest.java | 4 +-
.../library/alarm/ExtendedAlarmModelTest.java | 4 +-
.../library/alarm/SimpleAlarmModelTest.java | 6 +-
.../library/alarm/StandardAlarmModelTest.java | 6 +-
.../zest/library/appbrowser/AppBrowserTest.java | 4 +-
libraries/circuitbreaker/build.gradle | 10 +-
libraries/circuitbreaker/dev-status.xml | 6 +-
.../jmx/CircuitBreakerManagement.java | 4 +-
.../BreaksCircuitOnThrowableTest.java | 4 +-
libraries/constraints/build.gradle | 6 +-
libraries/constraints/dev-status.xml | 6 +-
.../library/constraints/ConstraintTest.java | 8 +-
.../library/constraints/qi70/IssueTest.java | 4 +-
libraries/conversion/build.gradle | 6 +-
libraries/conversion/dev-status.xml | 6 +-
.../conversion/values/EntityToValue.java | 4 +-
.../conversion/values/ValueToEntityMixin.java | 4 +-
.../conversion/values/EntityToValueTest.java | 4 +-
.../values/NestedValuesConversionTest.java | 4 +-
.../conversion/values/ValueToEntityTest.java | 4 +-
libraries/eventsourcing-jdbm/build.gradle | 12 +-
libraries/eventsourcing-jdbm/dev-status.xml | 6 +-
.../source/jdbm/JdbmEventStoreServiceTest.java | 4 +-
libraries/eventsourcing-rest/build.gradle | 8 +-
libraries/eventsourcing-rest/dev-status.xml | 6 +-
libraries/eventsourcing/build.gradle | 6 +-
libraries/eventsourcing/dev-status.xml | 6 +-
.../replay/ApplicationEventPlayerService.java | 4 +-
.../factory/DomainEventFactoryService.java | 4 +-
.../factory/UnitOfWorkNotificationConcern.java | 4 +-
.../domain/replay/DomainEventPlayerService.java | 4 +-
.../application/ApplicationEventTest.java | 4 +-
.../eventsourcing/domain/DomainEventTest.java | 4 +-
.../source/helper/DomainEventTrackerTest.java | 4 +-
libraries/fileconfig/build.gradle | 6 +-
libraries/fileconfig/dev-status.xml | 6 +-
.../library/fileconfig/FileConfiguration.java | 2 +-
libraries/http/build.gradle | 10 +-
libraries/http/dev-status.xml | 6 +-
.../zest/library/http/AbstractJettyTest.java | 4 +-
.../library/http/AbstractSecureJettyTest.java | 6 +-
.../library/http/JettyJMXStatisticsTest.java | 4 +-
.../http/VirtualHostJettyServiceTest.java | 4 +-
libraries/http/src/test/resources/logback.xml | 2 +-
.../http/qi4j-lib-http-unittests-ca.jceks | Bin 1075 -> 0 bytes
.../qi4j-lib-http-unittests-client-cert.jceks | Bin 3395 -> 0 bytes
.../qi4j-lib-http-unittests-server-cert.jceks | Bin 3380 -> 0 bytes
.../http/zest-lib-http-unittests-ca.jceks | Bin 0 -> 1075 bytes
.../zest-lib-http-unittests-client-cert.jceks | Bin 0 -> 3395 bytes
.../zest-lib-http-unittests-server-cert.jceks | Bin 0 -> 3380 bytes
libraries/invocation-cache/build.gradle | 8 +-
libraries/invocation-cache/dev-status.xml | 6 +-
libraries/jmx/build.gradle | 8 +-
libraries/jmx/dev-status.xml | 6 +-
.../library/jmx/ApplicationManagerService.java | 2 +-
.../jmx/ConfigurationManagerService.java | 12 +-
.../org/apache/zest/library/jmx/Qi4jMBeans.java | 42 -
.../org/apache/zest/library/jmx/ZestMBeans.java | 42 +
libraries/lang-groovy/build.gradle | 6 +-
libraries/lang-groovy/dev-status.xml | 6 +-
.../apache/zest/library/groovy/GroovyMixin.java | 4 +-
.../zest/library/groovy/GroovyMixinTest.java | 4 +-
.../zest/library/groovy/HelloSpeakerTest.java | 4 +-
libraries/lang-javascript/build.gradle | 8 +-
libraries/lang-javascript/dev-status.xml | 6 +-
.../library/javascript/JavaScriptMixin.java | 2 +-
.../library/javascript/JavaScriptMixinTest.java | 4 +-
libraries/lang-scala/build.gradle | 8 +-
libraries/lang-scala/dev-status.xml | 6 +-
.../zest/library/scala/ScalaTraitMixin.java | 4 +-
libraries/locking/build.gradle | 6 +-
libraries/locking/dev-status.xml | 6 +-
.../zest/library/locking/LockingTest.java | 4 +-
libraries/logging/build.gradle | 10 +-
libraries/logging/dev-status.xml | 6 +-
.../library/logging/debug/DebugConcern.java | 4 +-
.../debug/service/DebugOnConsoleSideEffect.java | 4 +-
.../debug/service/DebuggingServiceMixin.java | 4 +-
.../library/logging/log/CategoryLogConcern.java | 4 +-
.../library/logging/log/SimpleLogConcern.java | 6 +-
.../library/logging/log/StandardLogConcern.java | 4 +-
.../log/service/LogOnConsoleSideEffect.java | 4 +-
.../log/service/LoggingServiceMixin.java | 4 +-
.../logging/trace/AbstractTraceConcern.java | 4 +-
.../trace/service/TraceServiceMixin.java | 4 +-
.../zest/library/logging/DebuggingTest.java | 6 +-
.../zest/library/logging/TracingTest.java | 4 +-
libraries/metrics/build.gradle | 8 +-
libraries/metrics/dev-status.xml | 6 +-
.../zest/library/metrics/MetricsTest.java | 8 +-
libraries/osgi/build.gradle | 6 +-
libraries/osgi/dev-status.xml | 6 +-
.../zest/library/osgi/OSGiServiceExporter.java | 6 +-
.../zest/library/osgi/DocumentationSupport.java | 4 +-
.../zest/library/osgi/OSGiServiceTest.java | 16 +-
libraries/rdf/build.gradle | 12 +-
libraries/rdf/dev-status.xml | 6 +-
.../org/apache/zest/library/rdf/Qi4jEntity.java | 33 -
.../apache/zest/library/rdf/Qi4jEntityType.java | 33 -
.../org/apache/zest/library/rdf/Qi4jRdf.java | 81 --
.../org/apache/zest/library/rdf/ZestEntity.java | 33 +
.../apache/zest/library/rdf/ZestEntityType.java | 33 +
.../org/apache/zest/library/rdf/ZestRdf.java | 81 ++
.../rdf/entity/EntityStateSerializer.java | 4 +-
.../rdf/entity/EntityTypeSerializer.java | 6 +-
.../library/rdf/model/ApplicationVisitor.java | 28 +-
.../repository/HttpRepositoryConfiguration.java | 2 +-
.../rdf/repository/HttpRepositoryService.java | 2 +-
.../rdf/repository/NativeRepositoryService.java | 2 +-
.../rdf/serializer/AbstractSerializer.java | 6 +-
.../rdf/serializer/SerializerContext.java | 2 +-
.../zest/library/rdf/ApplicationXmlTest.java | 6 +-
.../rdf/entity/EntitySerializerTest.java | 4 +-
.../rdf/entity/EntityTypeSerializerTest.java | 10 +-
.../org/apache/zest/library/rdf/entity/test.xml | 32 +-
.../apache/zest/library/rdf/entity/test2.xml | 24 +-
.../rdf/repository/MemoryRepositoryTest.java | 4 +-
.../rdf/repository/NativeRepositoryTest.java | 4 +-
libraries/rest-client/build.gradle | 12 +-
libraries/rest-client/dev-status.xml | 6 +-
.../rest/client/RequestWriterDelegator.java | 2 +-
.../rest/client/ResponseReaderDelegator.java | 2 +-
.../ValueCompositeRequestWriter.java | 4 +-
.../library/rest/client/rest-client.properties | 10 +-
.../ContextResourceClientFactoryTest.java | 6 +-
.../rest/client/ContinuousIntegrationTest.java | 6 +-
.../zest/library/rest/client/RssReaderTest.java | 4 +-
libraries/rest-common/build.gradle | 2 +-
libraries/rest-common/dev-status.xml | 6 +-
.../library/rest/common/table/TableQuery.java | 4 +-
libraries/rest-server/build.gradle | 8 +-
libraries/rest-server/dev-status.xml | 6 +-
.../rest/server/api/ContextResource.java | 4 +-
.../rest/server/api/ResourceValidity.java | 6 +-
.../server/restlet/RequestReaderDelegator.java | 2 +-
.../server/restlet/ResponseWriterDelegator.java | 2 +-
.../freemarker/ValueCompositeTemplateModel.java | 8 +-
.../library/rest/server/rest-server.properties | 16 +-
libraries/rest/build.gradle | 10 +-
libraries/rest/dev-status.xml | 6 +-
.../library/rest/admin/EntitiesResource.java | 4 +-
.../zest/library/rest/admin/Qi4jFinder.java | 38 -
.../library/rest/admin/Qi4jServerServlet.java | 38 -
.../rest/admin/Qi4jServerServletService.java | 28 -
.../zest/library/rest/admin/RestAssembler.java | 2 +-
.../zest/library/rest/admin/ZestFinder.java | 38 +
.../library/rest/admin/ZestServerServlet.java | 38 +
.../rest/admin/ZestServerServletService.java | 28 +
.../zest/library/rest/admin/sparqlform.html | 18 +-
.../apache/zest/library/rest/admin/Main.java | 4 +-
.../zest/library/rest/admin/RestTest.java | 22 +-
.../rest/admin/RestletServletAssembler.java | 2 +-
libraries/scheduler/build.gradle | 10 +-
libraries/scheduler/dev-status.xml | 6 +-
.../scheduler/AbstractSchedulerTest.java | 4 +-
libraries/scripting/build.gradle | 8 +-
libraries/scripting/dev-status.xml | 6 +-
libraries/servlet/build.gradle | 6 +-
libraries/servlet/dev-status.xml | 6 +-
libraries/servlet/src/docs/servlet.txt | 6 +-
.../apache/zest/library/servlet/Qi4jFilter.java | 45 -
.../zest/library/servlet/Qi4jServlet.java | 51 --
.../library/servlet/Qi4jServletSupport.java | 38 -
.../apache/zest/library/servlet/ZestFilter.java | 45 +
.../zest/library/servlet/ZestServlet.java | 50 ++
.../library/servlet/ZestServletSupport.java | 38 +
.../lifecycle/AbstractQi4jServletBootstrap.java | 137 ---
.../lifecycle/AbstractZestServletBootstrap.java | 137 +++
.../apache/zest/library/servlet/package.html | 14 +-
.../zest/library/servlet/ServletTest.java | 6 +-
libraries/shiro-core/build.gradle | 12 +-
libraries/shiro-core/dev-status.xml | 6 +-
.../zest/library/shiro/PasswordDomainTest.java | 4 +-
.../library/shiro/PermissionsDomainTest.java | 4 +-
.../zest/library/shiro/RealmServiceTest.java | 4 +-
.../zest/library/shiro/StandaloneShiroTest.java | 4 +-
libraries/shiro-web/build.gradle | 18 +-
libraries/shiro-web/dev-status.xml | 6 +-
.../library/shiro/web/WebHttpShiroTest.java | 4 +-
.../library/shiro/web/WebRealmServiceTest.java | 4 +-
libraries/spring/build.gradle | 6 +-
libraries/spring/dev-status.xml | 6 +-
libraries/spring/src/docs/spring.txt | 18 +-
.../library/spring/bootstrap/Constants.java | 2 +-
.../bootstrap/Qi4jApplicationBootstrap.java | 85 --
.../bootstrap/ZestApplicationBootstrap.java | 85 ++
.../internal/Qi4jNamespaceHandler.java | 31 -
.../internal/ZestNamespaceHandler.java | 31 +
.../application/Qi4jApplicationFactoryBean.java | 116 ---
.../Qi4jBootstrapBeanDefinitionParser.java | 99 ---
.../application/ZestApplicationFactoryBean.java | 116 +++
.../ZestBootstrapBeanDefinitionParser.java | 100 +++
.../Qi4jServiceBeanDefinitionParser.java | 52 --
.../ZestServiceBeanDefinitionParser.java | 52 ++
.../src/main/resources/META-INF/spring.handlers | 2 +-
.../src/main/resources/META-INF/spring.schemas | 2 +-
.../apache/zest/library/spring/spring-0.5.xsd | 10 +-
.../zest/library/spring/MyZestBootstrapper.java | 4 +-
.../spring/bootstrap/Qi4jExportServiceTest.java | 56 --
.../spring/bootstrap/Qi4jTestBootstrap.java | 55 --
.../spring/bootstrap/ZestExportServiceTest.java | 56 ++
.../spring/bootstrap/ZestTestBootstrap.java | 55 ++
.../spring/importer/Qi4jImportServiceTest.java | 111 ---
.../spring/importer/ZestImportServiceTest.java | 111 +++
.../bootstrap/Qi4jExportServiceTest-context.xml | 33 -
.../bootstrap/ZestExportServiceTest-context.xml | 33 +
.../importer/Qi4jImportServiceTest-context.xml | 25 -
.../importer/ZestImportServiceTest-context.xml | 25 +
libraries/sql-bonecp/build.gradle | 2 +-
libraries/sql-bonecp/dev-status.xml | 6 +-
libraries/sql-dbcp/build.gradle | 2 +-
libraries/sql-dbcp/dev-status.xml | 6 +-
libraries/sql-liquibase/build.gradle | 8 +-
libraries/sql-liquibase/dev-status.xml | 6 +-
.../library/sql/liquibase/LiquibaseService.java | 2 +-
libraries/sql/build.gradle | 20 +-
libraries/sql/dev-status.xml | 6 +-
.../DataSourceConfigurationManagerService.java | 4 +-
.../sql/datasource/ExternalDataSourceTest.java | 4 +-
libraries/uid/build.gradle | 6 +-
libraries/uid/dev-status.xml | 6 +-
.../uid/sequence/PersistingSequencingTest.java | 4 +-
.../uid/sequence/TransientSequencingTest.java | 4 +-
.../zest/library/uid/uuid/UuidServiceTest.java | 4 +-
libraries/uowfile/build.gradle | 8 +-
libraries/uowfile/dev-status.xml | 6 +-
.../zest/library/uowfile/internal/UoWFile.java | 2 +-
.../uowfile/internal/UoWFileFactory.java | 4 +-
.../library/uowfile/AbstractUoWFileTest.java | 4 +-
manual/build.gradle | 16 +-
manual/src/docs/reference/index.txt | 6 +-
.../src/docs/tutorials/howto-writing-docs.txt | 4 +-
manual/src/docs/userguide/docinfo.xml | 4 +-
manual/src/docs/userguide/index.txt | 6 +-
manual/src/docs/userguide/preface.txt | 2 +-
manual/src/docs/website/resources/css/qi4j.css | 824 -------------------
manual/src/docs/website/resources/css/zest.css | 824 +++++++++++++++++++
manual/src/docs/website/xsl/head.xsl | 8 +-
.../zest/manual/recipes/assemble/Main.java | 6 +-
.../zest/manual/recipes/createEntity/Main.java | 4 +-
.../manual/recipes/properties/SwingPanel.java | 4 +-
.../resources/css/progressive-enhancement.css | 2 +-
manual/src/resources/images/qi4j-blue.png | Bin 853 -> 0 bytes
manual/src/resources/images/zest-blue.png | Bin 0 -> 853 bytes
.../src/resources/js/progressive-enhancement.js | 2 +-
.../schemas/2008/dev-status/1/dev-status.xsd | 10 +-
manual/src/xsl/chunked-basic.xsl | 2 +-
manual/src/xsl/disqus-footer.xsl | 6 +-
manual/src/xsl/fo.xsl | 2 +-
manual/src/xsl/head-offline.xsl | 6 +-
maven-compat.gradle | 6 +-
samples/dci-cargo/dcisample_a/build.gradle | 18 +-
.../bootstrap/DCISampleApplication_a.java | 4 +-
.../VisualizeApplicationStructure.java | 6 +-
.../sample_a/bootstrap/assembly/Assembler.java | 4 +-
.../sample_a/communication/web/BasePage.java | 4 +-
.../infrastructure/WicketQi4jApplication.java | 254 ------
.../infrastructure/WicketZestApplication.java | 254 ++++++
.../conversion/EntityToDTOService.java | 6 +-
.../infrastructure/model/JSONModel.java | 2 +-
.../infrastructure/model/ReadOnlyModel.java | 8 +-
.../src/main/resources/log4j.properties | 2 +-
.../sample_a/communication/web/BasePage.html | 8 +-
samples/dci-cargo/dcisample_b/build.gradle | 18 +-
.../bootstrap/DCISampleApplication_b.java | 4 +-
.../VisualizeApplicationStructure.java | 6 +-
.../sample_b/bootstrap/assembly/Assembler.java | 2 -
.../sample_b/communication/web/BasePage.java | 4 +-
.../infrastructure/WicketQi4jApplication.java | 236 ------
.../infrastructure/WicketZestApplication.java | 236 ++++++
.../conversion/EntityToDTOService.java | 6 +-
.../infrastructure/model/JSONModel.java | 2 +-
.../infrastructure/model/ReadOnlyModel.java | 8 +-
.../src/main/resources/log4j.properties | 2 +-
.../sample_b/communication/web/BasePage.html | 8 +-
samples/dci/build.gradle | 8 +-
samples/forum/build.gradle | 16 +-
.../zest/sample/forum/context/Context.java | 4 +-
samples/rental/build.gradle | 8 +-
.../org/apache/zest/sample/rental/web/Page.java | 6 +-
.../zest/sample/rental/web/QuikitResolver.java | 2 +-
.../zest/sample/rental/web/QuikitServlet.java | 12 +-
.../zest/sample/rental/web/UrlService.java | 4 +-
.../zest/sample/rental/web/BookingPage.html | 2 +-
.../apache/zest/sample/rental/web/MainPage.html | 2 +-
samples/rental/src/main/webapp/WEB-INF/web.xml | 2 +-
samples/sql-support/build.gradle | 14 +-
samples/swing/build.gradle | 2 +-
settings.gradle | 6 +-
tests/performance/build.gradle | 20 +-
.../AbstractEntityStorePerformanceTest.java | 18 +-
.../PostgreSQLEntityStorePerformanceTest.java | 6 +-
.../indexing/rdf/QueryPerformanceTest.java | 34 +-
.../composite/InvocationPerformanceTest.java | 4 +-
.../PropertyMixinInvocationPerformanceTest.java | 4 +-
tests/regression/build.gradle | 16 +-
.../niclas2/ConcernsOnPropertyTest.java | 4 +-
tools/envisage/build.gradle | 14 +-
tools/envisage/dev-status.xml | 6 +-
.../java/org/apache/zest/envisage/Envisage.java | 4 +-
.../org/apache/zest/envisage/EnvisageFrame.java | 6 +-
.../zest/envisage/detail/DependencyPane.form | 30 +-
.../zest/envisage/detail/DependencyPane.java | 12 +-
.../zest/envisage/detail/ImportedByPane.form | 20 +-
.../zest/envisage/detail/ImportedByPane.java | 4 +-
.../detail/ServiceConfigurationPane.form | 26 +-
.../detail/ServiceConfigurationPane.java | 8 +-
.../zest/envisage/graph/GraphBuilder.java | 2 +-
.../apache/zest/envisage/graph/GraphPane.java | 2 +-
.../envisage/tree/StructureModelBuilder.java | 2 +-
.../zest/envisage/tree/TreeModelPane.java | 4 +-
.../zest/envisage/tree/TypeModelBuilder.java | 2 +-
.../zest/envisage/EnvisageFrame.properties | 2 +-
.../envisage/detail/DependencyPane.properties | 12 +-
.../envisage/detail/ImportedByPane.properties | 4 +-
.../detail/ServiceConfigurationPane.properties | 8 +-
.../zest/envisage/sample/EnvisageSample.java | 4 +-
tools/model-detail/build.gradle | 8 +-
tools/model-detail/dev-status.xml | 6 +-
.../ImportedServiceCompositeDescriptor.java | 2 +-
.../ImportedServiceDetailDescriptor.java | 2 +-
tools/qidea/build.gradle | 6 +-
.../plugin/idea/Qi4jApplicationComponent.java | 131 ---
.../plugin/idea/ZestApplicationComponent.java | 131 +++
.../common/Qi4jAppliesToConstants.java | 31 -
.../appliesTo/common/Qi4jAppliesToUtil.java | 136 ---
.../common/ZestAppliesToConstants.java | 31 +
.../appliesTo/common/ZestAppliesToUtil.java | 136 +++
...ToAnnotationDeclaredCorrectlyInspection.java | 12 +-
.../common/actions/Qi4jCreateActionGroup.java | 80 --
.../common/actions/ZestCreateActionGroup.java | 80 ++
.../ide/plugin/idea/common/facet/Qi4jFacet.java | 47 --
.../common/facet/Qi4jFacetConfiguration.java | 54 --
.../plugin/idea/common/facet/Qi4jFacetType.java | 120 ---
.../ide/plugin/idea/common/facet/ZestFacet.java | 48 ++
.../common/facet/ZestFacetConfiguration.java | 54 ++
.../plugin/idea/common/facet/ZestFacetType.java | 120 +++
.../common/facet/ui/Qi4jFacetEditorTab.java | 70 --
.../common/facet/ui/ZestFacetEditorTab.java | 70 ++
.../idea/common/inspections/AbstractFix.java | 4 +-
.../common/inspections/AbstractInspection.java | 8 +-
.../common/intentions/AbstractIntention.java | 2 +-
.../common/resource/Qi4jResourceBundle.java | 66 --
.../common/resource/ZestResourceBundle.java | 66 ++
.../CreateConcernOfInPackageAction.java | 6 +-
.../concerns/common/Qi4jConcernConstants.java | 38 -
.../idea/concerns/common/Qi4jConcernUtil.java | 226 -----
.../concerns/common/ZestConcernConstants.java | 38 +
.../idea/concerns/common/ZestConcernUtil.java | 226 +++++
...nsAnnotationDeclaredCorrectlyInspection.java | 8 +-
.../intentions/add/AddConcernOnType.java | 6 +-
...nAnnotationDeclarationOnFieldInspection.java | 5 +-
.../Qi4jInvocationAnnotationConstants.java | 30 -
.../common/Qi4jInvocationAnnotationUtil.java | 127 ---
.../ZestInvocationAnnotationConstants.java | 30 +
.../common/ZestInvocationAnnotationUtil.java | 127 +++
...onAnnotationDeclaredCorrectlyInspection.java | 10 +-
.../common/Qi4jServiceAnnotationConstants.java | 30 -
.../common/Qi4jServiceAnnotationUtil.java | 97 ---
.../common/ZestServiceAnnotationConstants.java | 30 +
.../common/ZestServiceAnnotationUtil.java | 97 +++
...ceAnnotationDeclaredCorrectlyInspection.java | 10 +-
.../Qi4jStructureAnnotationConstants.java | 51 --
.../common/Qi4jStructureAnnotationUtil.java | 122 ---
.../common/ReplaceWithStructureAnnotation.java | 2 +-
.../ZestStructureAnnotationConstants.java | 51 ++
.../common/ZestStructureAnnotationUtil.java | 122 +++
...reAnnotationDeclaredCorrectlyInspection.java | 8 +-
.../idea/mixins/common/Qi4jMixinConstants.java | 30 -
.../idea/mixins/common/Qi4jMixinUtil.java | 194 -----
.../idea/mixins/common/ZestMixinConstants.java | 30 +
.../idea/mixins/common/ZestMixinUtil.java | 194 +++++
.../inspections/MixinImplementsMixinType.java | 8 +-
.../MixinsAnnotationDeclaredOnMixinType.java | 4 +-
.../common/Qi4jSideEffectConstants.java | 33 -
.../sideEffects/common/Qi4jSideEffectUtil.java | 186 -----
.../common/ZestSideEffectConstants.java | 33 +
.../sideEffects/common/ZestSideEffectUtil.java | 186 +++++
...tsAnnotationDeclaredCorrectlyInspection.java | 12 +-
.../src/main/resources/META-INF/plugin.xml | 6 +-
.../j2ee/GenericConcernOf.java.html | 2 +-
...nsAnnotationDeclaredCorrectlyInspection.html | 2 +-
.../resource/Qi4jResourceBundle.properties | 159 ----
.../resource/ZestResourceBundle.properties | 159 ++++
tools/shell/build.gradle | 4 +-
tools/shell/src/bin/qi4j | 19 -
tools/shell/src/bin/zest | 19 +
tutorials/cargo/build.gradle | 6 +-
.../tutorials/cargo/step2/Step2TestCase.java | 4 +-
tutorials/composites/build.gradle | 8 +-
.../tutorials/composites/tutorial2/package.html | 2 +-
.../tutorials/composites/tutorial5/package.html | 4 +-
tutorials/hello/build.gradle | 8 +-
.../apache/zest/tutorials/hello/HelloTest.java | 4 +-
.../apache/zest/tutorials/hello/HelloTest2.java | 4 +-
.../apache/zest/tutorials/hello/HelloTest3.java | 4 +-
.../apache/zest/tutorials/hello/HelloTest4.java | 4 +-
tutorials/introduction/build.gradle | 6 +-
tutorials/introduction/tenminutes/build.gradle | 6 +-
.../introduction/thirtyminutes/build.gradle | 8 +-
tutorials/introduction/twominutes/build.gradle | 6 +-
tutorials/services/build.gradle | 6 +-
.../zest/tutorials/services/step3/package.html | 2 +-
.../tutorials/services/step2/LibraryTest.java | 4 +-
.../tutorials/services/step3/LibraryTest.java | 4 +-
.../tutorials/services/step4/LibraryTest.java | 4 +-
.../tutorials/services/step5/LibraryTest.java | 4 +-
.../tutorials/services/step6/LibraryTest.java | 4 +-
749 files changed, 8405 insertions(+), 8453 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index d7666e6..066dc99 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ project.ext {
title = "Apache Zest™ (Java Edition) SDK"
description = "Apache Zest™ (Java Edition) is a framework for domain centric application development, including evolved concepts from AOP, DI and DDD."
testFailures = [ ]
- mainClassName = 'org.qi4j.container.Main'
+ mainClassName = 'org.apache.zest.container.Main'
groovycMain_mx = "700m"
groovycMain_permSize = "512m"
groovycMain_maxPermSize = "512m"
@@ -54,7 +54,7 @@ sourceCompatibility = "1.7"
// Collect the modules that fulfills the Release Criteria.
project.ext {
- releaseSpec = new org.qi4j.gradle.plugin.ModuleReleaseSpecification()
+ releaseSpec = new org.apache.zest.gradle.plugin.ModuleReleaseSpecification()
releaseApprovedProjects = allprojects.findAll( { p -> rootProject.releaseSpec.satisfiedBy( p ) } )
}
@@ -135,7 +135,7 @@ allprojects {
defaultTasks 'classes', 'test'
- group = name == 'org.qi4j' ? 'org.qi4j' : name.substring( 0, name.lastIndexOf( '.' ) )
+ group = name == 'org.apache.zest' ? 'org.apache.zest' : name.substring( 0, name.lastIndexOf( '.' ) )
if( version == 'unspecified' ) {
version = System.properties.version ?: "0"
}
@@ -292,28 +292,28 @@ allprojects {
apply plugin: VersionClass
apply plugin: AsciidocBuildInfo
-// if( name == "org.qi4j.core.runtime" )
+// if( name == "org.apache.zest.core.runtime" )
// {
// checkstyleMain {
-// configFile = new File( "$rootProject.projectDir.absolutePath/etc/qi4j-runtime-checkstyle.xml" )
+// configFile = new File( "$rootProject.projectDir.absolutePath/etc/zest-runtime-checkstyle.xml" )
// ignoreFailures = true
// }
// }
// else
// {
// checkstyleMain {
-// configFile = new File( rootProject.projectDir.absolutePath.toString() + '/etc/qi4j-api-checkstyle.xml' )
+// configFile = new File( rootProject.projectDir.absolutePath.toString() + '/etc/zest-api-checkstyle.xml' )
// ignoreFailures = true
// reporting.baseDir = "$rootProject.reporting.baseDir/checkstyle"
// }
// }
// checkstyleTest {
-// configFile = new File( "$rootProject.projectDir.absolutePath/etc/qi4j-tests-checkstyle.xml" )
+// configFile = new File( "$rootProject.projectDir.absolutePath/etc/zest-tests-checkstyle.xml" )
// ignoreFailures = true
// }
//
// checkstyleVersion {
-// configFile = new File( "$rootProject.projectDir.absolutePath/etc/qi4j-tests-checkstyle.xml" )
+// configFile = new File( "$rootProject.projectDir.absolutePath/etc/zest-tests-checkstyle.xml" )
// ignoreFailures = true
// }
@@ -476,12 +476,12 @@ task coverageReport {
dependsOn subprojects*.test
def outputPath = "build/reports/coverage"
def coveredProjects = subprojects.findAll { p -> new File( "${p.buildDir.path}/jacoco" ).exists() }
- def coreProjects = coveredProjects.findAll { p -> p.name.startsWith('org.qi4j.core' ) }
- def libProjects = coveredProjects.findAll { p -> p.name.startsWith( 'org.qi4j.lib' ) }
- def extProjects = coveredProjects.findAll { p -> p.name.startsWith( 'org.qi4j.ext' ) }
- def toolsProjects = coveredProjects.findAll { p -> p.name.startsWith( 'org.qi4j.tool' ) }
- def tutoProjects = coveredProjects.findAll { p -> p.name.startsWith( 'org.qi4j.tuto' ) }
- def samplesProjects = coveredProjects.findAll { p -> p.name.startsWith( 'org.qi4j.sample' ) }
+ def coreProjects = coveredProjects.findAll { p -> p.name.startsWith('org.apache.zest.core' ) }
+ def libProjects = coveredProjects.findAll { p -> p.name.startsWith( 'org.apache.zest.lib' ) }
+ def extProjects = coveredProjects.findAll { p -> p.name.startsWith( 'org.apache.zest.ext' ) }
+ def toolsProjects = coveredProjects.findAll { p -> p.name.startsWith( 'org.apache.zest.tool' ) }
+ def tutoProjects = coveredProjects.findAll { p -> p.name.startsWith( 'org.apache.zest.tuto' ) }
+ def samplesProjects = coveredProjects.findAll { p -> p.name.startsWith( 'org.apache.zest.sample' ) }
ant {
taskdef name:'jacocoreport', classname: 'org.jacoco.ant.ReportTask', classpath: configurations.jacoco.asPath
mkdir dir: outputPath
@@ -533,10 +533,10 @@ task javadocs( type: Javadoc ) {
options.overview = "${rootProject.projectDir}/src/javadoc/overview.html"
title = "${rootProject.title} ${version}"
def apiSources = releaseApprovedProjects.findAll( { project ->
- ( project.name.startsWith( 'org.qi4j.core' ) && !project.name.startsWith( 'org.qi4j.core.runtime' ) ) ||
- project.name.startsWith( 'org.qi4j.library' ) ||
- project.name.startsWith( 'org.qi4j.extension' ) ||
- project.name.startsWith( 'org.qi4j.tool' )
+ ( project.name.startsWith( 'org.apache.zest.core' ) && !project.name.startsWith( 'org.apache.zest.core.runtime' ) ) ||
+ project.name.startsWith( 'org.apache.zest.library' ) ||
+ project.name.startsWith( 'org.apache.zest.extension' ) ||
+ project.name.startsWith( 'org.apache.zest.tool' )
} )
source apiSources.collect { project ->
project.sourceSets.main.allJava
@@ -546,13 +546,13 @@ task javadocs( type: Javadoc ) {
classpath = files( apiSources.collect { project ->
project.sourceSets.main.compileClasspath
} )
- options.group( [ "Core API": [ "org.qi4j.api", "org.qi4j.api.*", "org.qi4j.io", "org.qi4j.functional" ],
- "Core Bootstrap": [ "org.qi4j.bootstrap", "org.qi4j.bootstrap.*" ],
- "Core SPI": [ "org.qi4j.spi", "org.qi4j.spi.*" ],
- "Libraries": [ "org.qi4j.library.*", "org.qi4j.logging", "org.qi4j.logging.*", "org.qi4j.lang.*" ],
- "Extensions": [ "org.qi4j.valueserialization.*", "org.qi4j.entitystore.*", "org.qi4j.index.*", "org.qi4j.metrics.*", "org.qi4j.cache.*", "org.qi4j.migration", "org.qi4j.migration.*" ],
- "Tools": [ "org.qi4j.tools.*", "org.qi4j.envisage", "org.qi4j.envisage.*", "org.qi4j.library.swing.entityviewer" ],
- "Test Support": [ "org.qi4j.test", "org.qi4j.test.*" ]
+ options.group( [ "Core API": [ "org.apache.zest.api", "org.apache.zest.api.*", "org.apache.zest.io", "org.apache.zest.functional" ],
+ "Core Bootstrap": [ "org.apache.zest.bootstrap", "org.apache.zest.bootstrap.*" ],
+ "Core SPI": [ "org.apache.zest.spi", "org.apache.zest.spi.*" ],
+ "Libraries": [ "org.apache.zest.library.*" ],
+ "Extensions": [ "org.apache.zest.valueserialization.*", "org.apache.zest.entitystore.*", "org.apache.zest.index.*", "org.apache.zest.metrics.*", "org.apache.zest.cache.*", "org.apache.zest.migration", "org.apache.zest.migration.*" ],
+ "Tools": [ "org.apache.zest.tools.*", "org.apache.zest.envisage", "org.apache.zest.envisage.*" ],
+ "Test Support": [ "org.apache.zest.test", "org.apache.zest.test.*" ]
] )
}
@@ -579,7 +579,7 @@ task buildAll( dependsOn: [
jar,
subprojects*.dependencyReport,
subprojects*.assemble,
- ':org.qi4j.manual:website'
+ ':org.apache.zest.manual:website'
] ) { }
// Generate license headers with comment styles
@@ -617,7 +617,7 @@ task generateBinDistGoOfflineHelpers {
goOfflineGradle += 'apply plugin: \'java\'\nconfigurations { download }\nrepositories {\n'
def goOfflinePom = licenseHeader( 'xml' )
goOfflinePom += '<project>\n <modelVersion>4.0.0</modelVersion>\n'
- goOfflinePom += " <groupId>org.qi4j</groupId>\n <artifactId>go-offline-helper</artifactId>\n <version>$version</version>\n"
+ goOfflinePom += " <groupId>org.apache.zest</groupId>\n <artifactId>go-offline-helper</artifactId>\n <version>$version</version>\n"
goOfflinePom += ' <packaging>pom</packaging>\n'
goOfflinePom += ' <!--\n This pom has the sole purpose of downloading all dependencies in a directory relative to this file named \'dependencies\'.\n'
goOfflinePom += ' Use the following command:\n\n mvn -f go-offline.pom validate\n -->\n <repositories>\n'
@@ -640,7 +640,7 @@ task generateBinDistGoOfflineHelpers {
rootProject.dependencies { allRuntimeDeps.each{ goOfflineHelpers it } }
rootProject.configurations.goOfflineHelpers.incoming.resolutionResult.allComponents.each { comp ->
def depCoords = "${comp.moduleVersion.group}:${comp.moduleVersion.name}:${comp.moduleVersion.version}"
- if( !comp.moduleVersion.group.startsWith( 'org.qi4j' ) ) {
+ if( !comp.moduleVersion.group.startsWith( 'org.apache.zest' ) ) {
goOfflineGradle += " download( '$depCoords' ) { transitive = false }\n"
goOfflinePom += " <dependency><groupId>${comp.moduleVersion.group}</groupId><artifactId>${comp.moduleVersion.name}</artifactId><version>${comp.moduleVersion.version}</version></dependency>\n"
}
@@ -936,7 +936,7 @@ task checkBinDist_goOfflineGradle( type: GradleBuild, dependsOn: unpackBinDist )
releaseApprovedProjects*.configurations.runtime.allDependencies.findAll({it.name}).each { dep ->
def jarArtifactId = dep.name instanceof String ? dep.name : dep.name.last()
def jarVersion = dep.version instanceof String ? dep.version : dep.version.last()
- if( !jarArtifactId.startsWith( 'org.qi4j' ) ) {
+ if( !jarArtifactId.startsWith( 'org.apache.zest' ) ) {
def jarName = "${jarArtifactId}-${jarVersion}.jar"
if( !new File( dependenciesDir, jarName ).exists() ) {
throw new GradleException( "Binary distribution go-offline.gradle failed! Missing: $jarName" );
@@ -960,7 +960,7 @@ task checkBinDist_goOfflineMaven( type: Exec, dependsOn: unpackBinDist ) {
releaseApprovedProjects*.configurations.runtime.allDependencies.findAll({it.name}).each { dep ->
def jarArtifactId = dep.name instanceof String ? dep.name : dep.name.last()
def jarVersion = dep.version instanceof String ? dep.version : dep.version.last()
- if( !jarArtifactId.startsWith( 'org.qi4j' ) ) {
+ if( !jarArtifactId.startsWith( 'org.apache.zest' ) ) {
def jarName = "${jarArtifactId}-${jarVersion}.jar"
if( !new File( dependenciesDir, jarName ).exists() ) {
throw new GradleException( "Binary distribution go-offline.pom failed! Missing: $jarName" );
@@ -1019,7 +1019,7 @@ task release {
throw new GradleException( "'version' must be given as a system property to perform a release." )
}
}
- dependsOn checkReleaseSpec, rat, archiveJavadocs, ':org.qi4j.manual:copyWebsite', allprojects*.uploadArchives, dist
+ dependsOn checkReleaseSpec, rat, archiveJavadocs, ':org.apache.zest.manual:copyWebsite', allprojects*.uploadArchives, dist
}
//
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/buildSrc/src/bin/devstatus.py
----------------------------------------------------------------------
diff --git a/buildSrc/src/bin/devstatus.py b/buildSrc/src/bin/devstatus.py
index aa4a106..81bbc04 100755
--- a/buildSrc/src/bin/devstatus.py
+++ b/buildSrc/src/bin/devstatus.py
@@ -23,7 +23,7 @@ import sys
import xml.dom.minidom
PATH_PATTERN="%(source)s"
-NS="http://www.qi4j.org/schemas/2008/dev-status/1"
+NS="http://zest.apache.org/schemas/2008/dev-status/1"
def configuration(indata):
config = {}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/buildSrc/src/main/groovy/VersionClass.groovy
----------------------------------------------------------------------
diff --git a/buildSrc/src/main/groovy/VersionClass.groovy b/buildSrc/src/main/groovy/VersionClass.groovy
index 94c690e..77bf6ce 100644
--- a/buildSrc/src/main/groovy/VersionClass.groovy
+++ b/buildSrc/src/main/groovy/VersionClass.groovy
@@ -33,7 +33,7 @@ class VersionClass implements Plugin<Project>
def makeVersionClassTask = project.task('makeVersionClass') << {
def now = new Date()
def tmpGroup = project.name
- if( tmpGroup.startsWith("org.qi4j.core"))
+ if( tmpGroup.startsWith("org.apache.zest.core"))
{
tmpGroup = tmpGroup - ".core"
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/api/build.gradle
----------------------------------------------------------------------
diff --git a/core/api/build.gradle b/core/api/build.gradle
index ab89613..bcd3a8a 100644
--- a/core/api/build.gradle
+++ b/core/api/build.gradle
@@ -21,13 +21,13 @@ jar { manifest { name = "Apache Zest™ Core API"}}
dependencies {
- compile project( ':org.qi4j.core:org.qi4j.core.io' )
+ compile project( ':org.apache.zest.core:org.apache.zest.core.io' )
compile libraries.jodatime
- testCompile project( ':org.qi4j.core:org.qi4j.core.testsupport' )
- testCompile project( ':org.qi4j.libraries:org.qi4j.library.constraints' )
- testCompile project( ':org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson' )
+ testCompile project( ':org.apache.zest.core:org.apache.zest.core.testsupport' )
+ testCompile project( ':org.apache.zest.libraries:org.apache.zest.library.constraints' )
+ testCompile project( ':org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson' )
- testRuntime project( ':org.qi4j.core:org.qi4j.core.runtime' )
+ testRuntime project( ':org.apache.zest.core:org.apache.zest.core.runtime' )
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/api/dev-status.xml
----------------------------------------------------------------------
diff --git a/core/api/dev-status.xml b/core/api/dev-status.xml
index a17ec6f..c46a86d 100644
--- a/core/api/dev-status.xml
+++ b/core/api/dev-status.xml
@@ -15,10 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
+<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
- http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
+ xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
+ http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
<status>
<codebase>stable</codebase>
<!--none,early,beta,stable,mature-->
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/api/src/main/java/org/apache/zest/api/Qi4j.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/Qi4j.java b/core/api/src/main/java/org/apache/zest/api/Qi4j.java
deleted file mode 100644
index 470c166..0000000
--- a/core/api/src/main/java/org/apache/zest/api/Qi4j.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 2007, Rickard Öberg. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.zest.api;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Proxy;
-import org.apache.zest.api.association.AbstractAssociation;
-import org.apache.zest.api.association.AssociationDescriptor;
-import org.apache.zest.api.composite.Composite;
-import org.apache.zest.api.composite.CompositeDescriptor;
-import org.apache.zest.api.composite.CompositeInstance;
-import org.apache.zest.api.composite.InvalidCompositeException;
-import org.apache.zest.api.composite.ModelDescriptor;
-import org.apache.zest.api.composite.TransientDescriptor;
-import org.apache.zest.api.entity.EntityDescriptor;
-import org.apache.zest.api.property.Property;
-import org.apache.zest.api.property.PropertyDescriptor;
-import org.apache.zest.api.service.ServiceDescriptor;
-import org.apache.zest.api.structure.Module;
-import org.apache.zest.api.value.ValueDescriptor;
-import org.apache.zest.functional.Function;
-
-/**
- * Encapsulation of the Zest API.
- */
-public interface Qi4j
-{
- /**
- * If a Modifier gets a reference to the Composite using @This,
- * then that reference must be dereferenced using this method
- * before handing it out for others to use.
- *
- * @param <T> Parameterized type of the Composite
- * @param composite instance reference injected in Modified using @This
- *
- * @return the dereferenced Composite
- */
- <T> T dereference( T composite );
-
- /**
- * Returns the Module or UnitOfWork where the Composite belongs.
- *
- * @param compositeOrUow The Composite (Service, Value, Entity or Transient) or UnitOfWork to lookup the Module it
- * belongs to.
- *
- * @return The Module instance where the Composite or UnitOfWork belongs to.
- */
- Module moduleOf( Object compositeOrUow );
-
- /**
- * Returns the ModelDescriptor of the Composite.
- *
- * @param compositeOrServiceReference The Composite (Service, Value, Entity or Transient) for which to lookup the
- * ModelDescriptor
- *
- * @return The ModelDescriptor of the Composite
- */
- ModelDescriptor modelDescriptorFor( Object compositeOrServiceReference );
-
- /**
- * Returns the CompositeDescriptor of the Composite.
- *
- * @param compositeOrServiceReference The Composite (Service, Value, Entity or Transient) for which to lookup the
- * CompositeDescriptor
- *
- * @return The CompositeDescriptor of the Composite
- */
- CompositeDescriptor compositeDescriptorFor( Object compositeOrServiceReference );
-
- /**
- * Returns the TransientDescriptor of the TransientComposite.
- *
- * @param transsient The TransientComposite for which to lookup the TransientDescriptor
- *
- * @return The TransientDescriptor of the TransientComposite
- */
- TransientDescriptor transientDescriptorFor( Object transsient );
-
- /**
- * Returns the EntityDescriptor of the EntityComposite.
- *
- * @param entity The EntityComposite for which to lookup the EntityDescriptor
- *
- * @return The EntityDescriptor of the EntityComposite
- */
- EntityDescriptor entityDescriptorFor( Object entity );
-
- /**
- * Returns the ValueDescriptor of the ValueComposite.
- *
- * @param value The ValueComposite for which to lookup the ValueDescriptor
- *
- * @return The ValueDescriptor of the ValueComposite
- */
- ValueDescriptor valueDescriptorFor( Object value );
-
- /**
- * Returns the ServiceDescriptor of the ServiceComposite.
- *
- * @param service The ServiceComposite for which to lookup the ServiceDescriptor
- *
- * @return The ServiceDescriptor of the ServiceComposite
- */
- ServiceDescriptor serviceDescriptorFor( Object service );
-
- /**
- * Returns the PropertyDescriptor of the Property.
- *
- * @param property The Property for which to lookup the PropertyDescriptor
- *
- * @return The PropertyDescriptor of the Property
- */
- PropertyDescriptor propertyDescriptorFor( Property<?> property );
-
- /**
- * Returns the AssociationDescriptor of the Association.
- *
- * @param association The Association for which to lookup the AssociationDescriptor
- *
- * @return The AssociationDescriptor of the Association
- */
- AssociationDescriptor associationDescriptorFor( AbstractAssociation association );
-
- /**
- * Function that returns the CompositeDescriptor of a Composite.
- */
- Function<Composite, CompositeDescriptor> FUNCTION_DESCRIPTOR_FOR = new Function<Composite, CompositeDescriptor>()
- {
- @Override
- public CompositeDescriptor map( Composite composite )
- {
- if( composite instanceof Proxy )
- {
- InvocationHandler invocationHandler = Proxy.getInvocationHandler( composite );
- return ( (CompositeInstance) invocationHandler ).descriptor();
- }
- try
- {
- Class<? extends Composite> compositeClass = composite.getClass();
- Field instanceField = compositeClass.getField( "_instance" );
- Object instance = instanceField.get( composite );
- return ( (CompositeInstance) instance ).descriptor();
- }
- catch( Exception e )
- {
- InvalidCompositeException exception = new InvalidCompositeException( "Could not get _instance field" );
- exception.initCause( e );
- throw exception;
- }
- }
- };
-
- /**
- * Function that returns the CompositeInstance of a Composite.
- */
- Function<Composite, CompositeInstance> FUNCTION_COMPOSITE_INSTANCE_OF = new Function<Composite, CompositeInstance>()
- {
- @Override
- public CompositeInstance map( Composite composite )
- {
- if( composite instanceof Proxy )
- {
- return ( (CompositeInstance) Proxy.getInvocationHandler( composite ) );
- }
- try
- {
- Class<? extends Composite> compositeClass = composite.getClass();
- Field instanceField = compositeClass.getField( "_instance" );
- Object instance = instanceField.get( composite );
- return (CompositeInstance) instance;
- }
- catch( Exception e )
- {
- InvalidCompositeException exception = new InvalidCompositeException( "Could not get _instance field" );
- exception.initCause( e );
- throw exception;
- }
- }
- };
-}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/api/src/main/java/org/apache/zest/api/ZestApi.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/ZestApi.java b/core/api/src/main/java/org/apache/zest/api/ZestApi.java
new file mode 100644
index 0000000..6c20e94
--- /dev/null
+++ b/core/api/src/main/java/org/apache/zest/api/ZestApi.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright (c) 2007, Rickard Öberg. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.zest.api;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
+import org.apache.zest.api.association.AbstractAssociation;
+import org.apache.zest.api.association.AssociationDescriptor;
+import org.apache.zest.api.composite.Composite;
+import org.apache.zest.api.composite.CompositeDescriptor;
+import org.apache.zest.api.composite.CompositeInstance;
+import org.apache.zest.api.composite.InvalidCompositeException;
+import org.apache.zest.api.composite.ModelDescriptor;
+import org.apache.zest.api.composite.TransientDescriptor;
+import org.apache.zest.api.entity.EntityDescriptor;
+import org.apache.zest.api.property.Property;
+import org.apache.zest.api.property.PropertyDescriptor;
+import org.apache.zest.api.service.ServiceDescriptor;
+import org.apache.zest.api.structure.Module;
+import org.apache.zest.api.value.ValueDescriptor;
+import org.apache.zest.functional.Function;
+
+/**
+ * Encapsulation of the Zest API.
+ */
+public interface ZestAPI
+{
+ /**
+ * If a Modifier gets a reference to the Composite using @This,
+ * then that reference must be dereferenced using this method
+ * before handing it out for others to use.
+ *
+ * @param <T> Parameterized type of the Composite
+ * @param composite instance reference injected in Modified using @This
+ *
+ * @return the dereferenced Composite
+ */
+ <T> T dereference( T composite );
+
+ /**
+ * Returns the Module or UnitOfWork where the Composite belongs.
+ *
+ * @param compositeOrUow The Composite (Service, Value, Entity or Transient) or UnitOfWork to lookup the Module it
+ * belongs to.
+ *
+ * @return The Module instance where the Composite or UnitOfWork belongs to.
+ */
+ Module moduleOf( Object compositeOrUow );
+
+ /**
+ * Returns the ModelDescriptor of the Composite.
+ *
+ * @param compositeOrServiceReference The Composite (Service, Value, Entity or Transient) for which to lookup the
+ * ModelDescriptor
+ *
+ * @return The ModelDescriptor of the Composite
+ */
+ ModelDescriptor modelDescriptorFor( Object compositeOrServiceReference );
+
+ /**
+ * Returns the CompositeDescriptor of the Composite.
+ *
+ * @param compositeOrServiceReference The Composite (Service, Value, Entity or Transient) for which to lookup the
+ * CompositeDescriptor
+ *
+ * @return The CompositeDescriptor of the Composite
+ */
+ CompositeDescriptor compositeDescriptorFor( Object compositeOrServiceReference );
+
+ /**
+ * Returns the TransientDescriptor of the TransientComposite.
+ *
+ * @param transsient The TransientComposite for which to lookup the TransientDescriptor
+ *
+ * @return The TransientDescriptor of the TransientComposite
+ */
+ TransientDescriptor transientDescriptorFor( Object transsient );
+
+ /**
+ * Returns the EntityDescriptor of the EntityComposite.
+ *
+ * @param entity The EntityComposite for which to lookup the EntityDescriptor
+ *
+ * @return The EntityDescriptor of the EntityComposite
+ */
+ EntityDescriptor entityDescriptorFor( Object entity );
+
+ /**
+ * Returns the ValueDescriptor of the ValueComposite.
+ *
+ * @param value The ValueComposite for which to lookup the ValueDescriptor
+ *
+ * @return The ValueDescriptor of the ValueComposite
+ */
+ ValueDescriptor valueDescriptorFor( Object value );
+
+ /**
+ * Returns the ServiceDescriptor of the ServiceComposite.
+ *
+ * @param service The ServiceComposite for which to lookup the ServiceDescriptor
+ *
+ * @return The ServiceDescriptor of the ServiceComposite
+ */
+ ServiceDescriptor serviceDescriptorFor( Object service );
+
+ /**
+ * Returns the PropertyDescriptor of the Property.
+ *
+ * @param property The Property for which to lookup the PropertyDescriptor
+ *
+ * @return The PropertyDescriptor of the Property
+ */
+ PropertyDescriptor propertyDescriptorFor( Property<?> property );
+
+ /**
+ * Returns the AssociationDescriptor of the Association.
+ *
+ * @param association The Association for which to lookup the AssociationDescriptor
+ *
+ * @return The AssociationDescriptor of the Association
+ */
+ AssociationDescriptor associationDescriptorFor( AbstractAssociation association );
+
+ /**
+ * Function that returns the CompositeDescriptor of a Composite.
+ */
+ Function<Composite, CompositeDescriptor> FUNCTION_DESCRIPTOR_FOR = new Function<Composite, CompositeDescriptor>()
+ {
+ @Override
+ public CompositeDescriptor map( Composite composite )
+ {
+ if( composite instanceof Proxy )
+ {
+ InvocationHandler invocationHandler = Proxy.getInvocationHandler( composite );
+ return ( (CompositeInstance) invocationHandler ).descriptor();
+ }
+ try
+ {
+ Class<? extends Composite> compositeClass = composite.getClass();
+ Field instanceField = compositeClass.getField( "_instance" );
+ Object instance = instanceField.get( composite );
+ return ( (CompositeInstance) instance ).descriptor();
+ }
+ catch( Exception e )
+ {
+ InvalidCompositeException exception = new InvalidCompositeException( "Could not get _instance field" );
+ exception.initCause( e );
+ throw exception;
+ }
+ }
+ };
+
+ /**
+ * Function that returns the CompositeInstance of a Composite.
+ */
+ Function<Composite, CompositeInstance> FUNCTION_COMPOSITE_INSTANCE_OF = new Function<Composite, CompositeInstance>()
+ {
+ @Override
+ public CompositeInstance map( Composite composite )
+ {
+ if( composite instanceof Proxy )
+ {
+ return ( (CompositeInstance) Proxy.getInvocationHandler( composite ) );
+ }
+ try
+ {
+ Class<? extends Composite> compositeClass = composite.getClass();
+ Field instanceField = compositeClass.getField( "_instance" );
+ Object instance = instanceField.get( composite );
+ return (CompositeInstance) instance;
+ }
+ catch( Exception e )
+ {
+ InvalidCompositeException exception = new InvalidCompositeException( "Could not get _instance field" );
+ exception.initCause( e );
+ throw exception;
+ }
+ }
+ };
+}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/api/src/main/java/org/apache/zest/api/common/ConstructionException.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/common/ConstructionException.java b/core/api/src/main/java/org/apache/zest/api/common/ConstructionException.java
index 3a5fff1..c3e4a59 100644
--- a/core/api/src/main/java/org/apache/zest/api/common/ConstructionException.java
+++ b/core/api/src/main/java/org/apache/zest/api/common/ConstructionException.java
@@ -23,7 +23,7 @@ package org.apache.zest.api.common;
* <li>interface instead of a class.</li>
* <li>useful constructor missing.</li>
* <li>exception thrown in the constructor.</li>
- * <li>Subclassing of org.qi4j.api.property.Property</li>
+ * <li>Subclassing of org.apache.zest.api.property.Property</li>
* </ul>
* <p>
* See the nested exception for additional details.
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/api/src/main/java/org/apache/zest/api/common/QualifiedName.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/common/QualifiedName.java b/core/api/src/main/java/org/apache/zest/api/common/QualifiedName.java
index eef1cce..ebc04e4 100644
--- a/core/api/src/main/java/org/apache/zest/api/common/QualifiedName.java
+++ b/core/api/src/main/java/org/apache/zest/api/common/QualifiedName.java
@@ -184,15 +184,15 @@ public final class QualifiedName
* The URI of the {@link TypeName} component is in the form of;
* </p>
* <pre>
- * "urn:qi4j:type:" normalizedClassName
+ * "urn:zest:type:" normalizedClassName
* </pre>
* <p>
* where {@code normalizedClassName} is the fully-qualified class name having had any dollar ($) characters replaced
* by URI friendly dashes (-), with a trailing hash (#). Examples;
* </p>
* <pre>
- * urn:qi4j:type:org.qi4j.api.common.QualifiedName#
- * urn:qi4j:type:org.qi4j.samples.MyClass-MyInnerClass#
+ * urn:zest:type:org.apache.zest.api.common.QualifiedName#
+ * urn:zest:type:org.apache.zest.samples.MyClass-MyInnerClass#
* </pre>
*
* @return the URI of the {@link TypeName} component of the QualifiedName.
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/api/src/main/java/org/apache/zest/api/common/UseDefaults.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/common/UseDefaults.java b/core/api/src/main/java/org/apache/zest/api/common/UseDefaults.java
index a09e76a..140b5f3 100644
--- a/core/api/src/main/java/org/apache/zest/api/common/UseDefaults.java
+++ b/core/api/src/main/java/org/apache/zest/api/common/UseDefaults.java
@@ -46,7 +46,7 @@ import java.lang.annotation.Target;
* </p>
* <p>
* It is also possible to change the default values for Composites during the assembly. This is done by calling the
- * {@code org.qi4j.bootstrap.ModuleAssembly#forMixin(Class)} method.
+ * {@code org.apache.zest.bootstrap.ModuleAssembly#forMixin(Class)} method.
* </p>
* <p>
* Example;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/api/src/main/java/org/apache/zest/api/composite/CompositeContext.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/composite/CompositeContext.java b/core/api/src/main/java/org/apache/zest/api/composite/CompositeContext.java
index b50d0d3..2e1aa59 100644
--- a/core/api/src/main/java/org/apache/zest/api/composite/CompositeContext.java
+++ b/core/api/src/main/java/org/apache/zest/api/composite/CompositeContext.java
@@ -18,7 +18,7 @@ import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-import org.apache.zest.api.Qi4j;
+import org.apache.zest.api.ZestAPI;
import org.apache.zest.api.structure.Module;
import org.apache.zest.functional.Iterables;
@@ -52,7 +52,7 @@ public class CompositeContext<T extends TransientComposite>
{
TransientComposite composite = get();
- Iterable<Class<?>> types = Qi4j.FUNCTION_COMPOSITE_INSTANCE_OF.map( composite ).types();
+ Iterable<Class<?>> types = ZestAPI.FUNCTION_COMPOSITE_INSTANCE_OF.map( composite ).types();
return (T) Proxy.newProxyInstance(
composite.getClass().getClassLoader(),
toArray( Class.class, Iterables.<Class>cast( types ) ),
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/api/src/main/java/org/apache/zest/api/composite/PropertyMapper.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/composite/PropertyMapper.java b/core/api/src/main/java/org/apache/zest/api/composite/PropertyMapper.java
index 92f2e7b..16363c5 100644
--- a/core/api/src/main/java/org/apache/zest/api/composite/PropertyMapper.java
+++ b/core/api/src/main/java/org/apache/zest/api/composite/PropertyMapper.java
@@ -36,7 +36,7 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import org.apache.zest.api.Qi4j;
+import org.apache.zest.api.ZestAPI;
import org.apache.zest.api.property.GenericPropertyInfo;
import org.apache.zest.api.property.Property;
import org.apache.zest.api.util.Classes;
@@ -462,7 +462,7 @@ public final class PropertyMapper
@SuppressWarnings( "unchecked" )
public Object map( Composite composite, Type type, String value )
{
- return Qi4j.FUNCTION_COMPOSITE_INSTANCE_OF.map( composite ).module().newValueFromSerializedState( (Class<Object>) type, value );
+ return ZestAPI.FUNCTION_COMPOSITE_INSTANCE_OF.map( composite ).module().newValueFromSerializedState( (Class<Object>) type, value );
}
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/api/src/main/java/org/apache/zest/api/configuration/Configuration.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/configuration/Configuration.java b/core/api/src/main/java/org/apache/zest/api/configuration/Configuration.java
index 9125dac..471dc28 100644
--- a/core/api/src/main/java/org/apache/zest/api/configuration/Configuration.java
+++ b/core/api/src/main/java/org/apache/zest/api/configuration/Configuration.java
@@ -17,7 +17,7 @@ package org.apache.zest.api.configuration;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.zest.api.Qi4j;
+import org.apache.zest.api.ZestAPI;
import org.apache.zest.api.composite.Composite;
import org.apache.zest.api.composite.PropertyMapper;
import org.apache.zest.api.constraint.ConstraintViolationException;
@@ -58,7 +58,7 @@ import static org.apache.zest.functional.Iterables.first;
* <p>
* If a new Configuration instance is created then it will be populated with properties
* from the properties file whose filesystem name is the same as the identity (e.g. "MyService.properties").
- * If a service is not given a name via the {@code org.qi4j.bootstrap.ServiceDeclaration#identifiedBy(String)}, the
+ * If a service is not given a name via the {@code org.apache.zest.bootstrap.ServiceDeclaration#identifiedBy(String)}, the
* name will default to the FQCN of the ServiceComposite type.
* </p>
* <p>
@@ -134,7 +134,7 @@ public interface Configuration<T>
/**
* Updates the values of the managed user ConfigurationComposite instance from the underlying
- * {@code org.qi4j.spi.entitystore.EntityStore}. Any modified values in the current user configuration that
+ * {@code org.apache.zest.spi.entitystore.EntityStore}. Any modified values in the current user configuration that
* has not been saved, via {@link #save()} method, will be lost.
*/
void refresh();
@@ -159,7 +159,7 @@ public interface Configuration<T>
private UnitOfWork uow;
@Structure
- private Qi4j api;
+ private ZestAPI api;
@This
private ServiceComposite me;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/api/src/main/java/org/apache/zest/api/constraint/ConstraintViolationException.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/constraint/ConstraintViolationException.java b/core/api/src/main/java/org/apache/zest/api/constraint/ConstraintViolationException.java
index 67c0702..62a6509 100644
--- a/core/api/src/main/java/org/apache/zest/api/constraint/ConstraintViolationException.java
+++ b/core/api/src/main/java/org/apache/zest/api/constraint/ConstraintViolationException.java
@@ -25,7 +25,7 @@ import java.util.Collection;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import org.apache.zest.api.Qi4j;
+import org.apache.zest.api.ZestAPI;
import org.apache.zest.api.composite.Composite;
import org.apache.zest.functional.Function;
import org.apache.zest.functional.Iterables;
@@ -54,7 +54,7 @@ public class ConstraintViolationException
Collection<ConstraintViolation> constraintViolations
)
{
- this( instance.toString(), Qi4j.FUNCTION_DESCRIPTOR_FOR.map( instance ).types(), method, constraintViolations );
+ this( instance.toString(), ZestAPI.FUNCTION_DESCRIPTOR_FOR.map( instance ).types(), method, constraintViolations );
}
public ConstraintViolationException( String instanceToString,
@@ -92,10 +92,11 @@ public class ConstraintViolationException
/**
* Creates localized messages of all the constraint violations that has occured.
* <p>
- * The key "<code>Qi4j_ConstraintViolation_<i><strong>CompositeType</strong></i></code>" will be used to lookup the text formatting
+ * The key "<code>zest.constraint.<i><strong>CompositeType</strong></i>.<i><string>methodName</string></i></code>"
+ * will be used to lookup the text formatting
* pattern from the ResourceBundle, where <strong><code><i>CompositeType</i></code></strong> is the
* class name of the Composite where the constraint was violated. If such key does not exist, then the
- * key "<code>Qi4j_ConstraintViolation</code>" will be used, and if that one also doesn't exist, or
+ * key "<code>zest.constraint</code>" will be used, and if that one also doesn't exist, or
* the resourceBundle argument is null, then the default patterns will be used;
* </p>
* <table summary="Localization of constraint vioations.">
@@ -157,13 +158,13 @@ public class ConstraintViolationException
{
try
{
- pattern = bundle.getString( "qi4j.constraint." + mixinTypeName + "." + methodName );
+ pattern = bundle.getString( "zest.constraint." + mixinTypeName + "." + methodName );
}
catch( MissingResourceException e1 )
{
try
{
- pattern = bundle.getString( "qi4j.constraint" );
+ pattern = bundle.getString( "zest.constraint" );
}
catch( MissingResourceException e2 )
{
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/api/src/main/java/org/apache/zest/api/entity/EntityReference.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/entity/EntityReference.java b/core/api/src/main/java/org/apache/zest/api/entity/EntityReference.java
index 19d9f72..88563df 100644
--- a/core/api/src/main/java/org/apache/zest/api/entity/EntityReference.java
+++ b/core/api/src/main/java/org/apache/zest/api/entity/EntityReference.java
@@ -32,7 +32,7 @@ public final class EntityReference
*/
public static EntityReference parseURI( String uri )
{
- String identity = uri.substring( "urn:qi4j:entity:".length() );
+ String identity = uri.substring( "urn:zest:entity:".length() );
return new EntityReference( identity );
}
@@ -98,7 +98,7 @@ public final class EntityReference
*/
public String toURI()
{
- return "urn:qi4j:entity:" + identity;
+ return "urn:zest:entity:" + identity;
}
@Override
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/api/src/main/java/org/apache/zest/api/injection/scope/Structure.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/injection/scope/Structure.java b/core/api/src/main/java/org/apache/zest/api/injection/scope/Structure.java
index 7f1322f..fa6de5e 100644
--- a/core/api/src/main/java/org/apache/zest/api/injection/scope/Structure.java
+++ b/core/api/src/main/java/org/apache/zest/api/injection/scope/Structure.java
@@ -36,8 +36,8 @@ import org.apache.zest.api.injection.InjectionScope;
* - Module
* - Layer
* - Application
- * - Qi4j
- * - Qi4jSPI
+ * - ZestAPI
+ * - ZestSPI
* </code></pre>
*/
@Retention( RetentionPolicy.RUNTIME )
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ab97249b/core/api/src/main/java/org/apache/zest/api/metrics/MetricsCounterFactory.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/zest/api/metrics/MetricsCounterFactory.java b/core/api/src/main/java/org/apache/zest/api/metrics/MetricsCounterFactory.java
index ac1e7fe..8b2374b 100644
--- a/core/api/src/main/java/org/apache/zest/api/metrics/MetricsCounterFactory.java
+++ b/core/api/src/main/java/org/apache/zest/api/metrics/MetricsCounterFactory.java
@@ -28,7 +28,7 @@ public interface MetricsCounterFactory extends MetricsFactory
* @param origin The class that instantiate the metric
* @param name A human readable, short name of the metric.
*
- * @return A Metric instance to be used, OR org.qi4j.spi.metrics.DefaultMetric.NULL if not supported.
+ * @return A Metric instance to be used, OR org.apache.zest.spi.metrics.DefaultMetric.NULL if not supported.
*/
MetricsCounter createCounter( Class<?> origin, String name );
}