ZEST-195 ; Replace all "zest" with "polygene"
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/54b69c48 Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/54b69c48 Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/54b69c48 Branch: refs/heads/develop Commit: 54b69c48d47c641495235e14ce271c3947b83990 Parents: 1c722f4 Author: Niclas Hedhman <[email protected]> Authored: Tue Dec 13 20:34:27 2016 +0800 Committer: Niclas Hedhman <[email protected]> Committed: Tue Dec 13 20:34:36 2016 +0800 ---------------------------------------------------------------------- KEYS | 2 +- README.txt | 6 +- .../src/asciidoc/filters/devstatus/devstatus.py | 2 +- .../polygene/gradle/RootProjectPlugin.groovy | 8 +- .../gradle/doc/DocumentationTask.groovy | 4 +- .../polygene/gradle/doc/ManualPlugin.groovy | 16 +- .../gradle/publish/PublishingPlugin.groovy | 6 +- core/api/build.gradle | 8 +- core/api/dev-status.xml | 6 +- core/api/src/docs/application.txt | 8 +- core/api/src/docs/composition.txt | 4 +- core/api/src/docs/concern.txt | 6 +- core/api/src/docs/configuration.txt | 6 +- core/api/src/docs/decoratormixin.txt | 12 +- core/api/src/docs/metrics.txt | 14 +- core/api/src/docs/mixin.txt | 28 +- core/api/src/docs/servicecomposite.txt | 12 +- core/api/src/docs/valuecomposite.txt | 6 +- .../polygene/api/service/qualifier/package.html | 2 +- .../api/docsupport/ApplicationDocs.java | 14 +- core/bootstrap/build.gradle | 4 +- core/bootstrap/dev-status.xml | 6 +- core/bootstrap/src/docs/bootstrap.txt | 26 +- .../polygene/bootstrap/SingletonAssembler.java | 8 +- .../bootstrap/builder/ApplicationBuilder.java | 6 +- .../layered/LayeredApplicationAssembler.java | 14 +- .../bootstrap/DocumentationSupport.java | 14 +- core/runtime/build.gradle | 6 +- core/runtime/dev-status.xml | 6 +- core/runtime/src/docs/runtime.txt | 6 +- .../runtime/composite/FragmentClassLoader.java | 2 +- .../runtime/composite/TransientClassLoader.java | 4 +- .../polygene/regression/qi78/IssueTest.java | 4 +- .../polygene/regression/qi94/IssueTest.java | 2 +- .../association/AssociationEqualityTest.java | 36 +- .../bootstrap/docs/DocumentationSupport.java | 6 +- .../constraints/ConstraintsTest.properties | 6 +- .../runtime/entity/EntityVisibilityTest.java | 6 +- .../runtime/objects/ObjectVisibilityTest.java | 6 +- .../runtime/property/PropertyEqualityTest.java | 12 +- .../runtime/service/ServiceVisibilityTest.java | 6 +- .../transients/TransientVisibilityTest.java | 6 +- .../runtime/value/ValueEqualityTest.java | 28 +- .../runtime/value/ValueVisibilityTest.java | 6 +- .../visibility/VisibilityInUnitOfWorkTest.java | 4 +- .../java/org/apache/polygene/test/ASMTest.java | 58 +-- core/spi/build.gradle | 6 +- core/spi/dev-status.xml | 6 +- core/testsupport/build.gradle | 4 +- core/testsupport/dev-status.xml | 6 +- core/testsupport/src/docs/testsupport.txt | 8 +- .../polygene/test/AbstractZestBaseTest.java | 10 +- .../polygene/test/AbstractZestScenarioTest.java | 10 +- .../AbstractPlainValueSerializationTest.java | 2 +- doap.rdf | 16 +- extensions/cache-ehcache/build.gradle | 10 +- extensions/cache-ehcache/dev-status.xml | 6 +- .../cache-ehcache/src/docs/cache-ehcache.txt | 4 +- extensions/cache-memcache/build.gradle | 8 +- extensions/cache-memcache/dev-status.xml | 6 +- .../cache-memcache/src/docs/cache-memcache.txt | 4 +- extensions/entitystore-file/build.gradle | 14 +- extensions/entitystore-file/dev-status.xml | 6 +- .../entitystore-file/src/docs/es-file.txt | 6 +- extensions/entitystore-geode/build.gradle | 10 +- extensions/entitystore-geode/dev-status.xml | 6 +- .../entitystore-geode/src/docs/es-geode.txt | 4 +- .../entitystore-hazelcast/README.persistent | 2 +- extensions/entitystore-hazelcast/build.gradle | 10 +- extensions/entitystore-hazelcast/dev-status.xml | 6 +- .../src/docs/es-hazelcast.txt | 4 +- .../HazelcastEntityStoreService.properties | 2 +- .../entitystore/hazelcast/hazelcast.xml | 2 +- extensions/entitystore-jclouds/build.gradle | 12 +- extensions/entitystore-jclouds/dev-status.xml | 6 +- .../entitystore-jclouds/src/docs/es-jclouds.txt | 4 +- extensions/entitystore-jdbm/build.gradle | 12 +- extensions/entitystore-jdbm/dev-status.xml | 6 +- .../entitystore-jdbm/src/docs/es-jdbm.txt | 6 +- extensions/entitystore-leveldb/build.gradle | 12 +- extensions/entitystore-leveldb/dev-status.xml | 6 +- .../entitystore-leveldb/src/docs/es-leveldb.txt | 4 +- .../polygene/entitystore/leveldb/package.html | 2 +- extensions/entitystore-memory/build.gradle | 8 +- extensions/entitystore-memory/dev-status.xml | 6 +- .../entitystore-memory/src/docs/es-memory.txt | 2 +- extensions/entitystore-mongodb/build.gradle | 10 +- extensions/entitystore-mongodb/dev-status.xml | 6 +- .../entitystore-mongodb/src/docs/es-mongodb.txt | 4 +- extensions/entitystore-preferences/build.gradle | 8 +- .../entitystore-preferences/dev-status.xml | 6 +- .../src/docs/es-preferences.txt | 2 +- extensions/entitystore-redis/build.gradle | 10 +- extensions/entitystore-redis/dev-status.xml | 6 +- .../entitystore-redis/src/docs/es-redis.txt | 4 +- extensions/entitystore-riak/build.gradle | 12 +- extensions/entitystore-riak/dev-status.xml | 6 +- .../entitystore-riak/src/docs/es-riak.txt | 4 +- extensions/entitystore-sql/build.gradle | 12 +- extensions/entitystore-sql/dev-status.xml | 6 +- extensions/entitystore-sql/src/docs/es-sql.txt | 12 +- .../polygene/entitystore/sql/internal/SQLs.java | 4 +- extensions/indexing-elasticsearch/build.gradle | 8 +- .../indexing-elasticsearch/dev-status.xml | 6 +- .../src/docs/index-elasticsearch.txt | 12 +- .../ElasticSearchConfiguration.java | 4 +- .../internal/AbstractElasticSearchSupport.java | 6 +- extensions/indexing-rdf/build.gradle | 14 +- extensions/indexing-rdf/dev-status.xml | 6 +- extensions/indexing-rdf/src/docs/index-rdf.txt | 56 +-- .../polygene/index/rdf/qi95/Qi95IssueTest.java | 4 +- extensions/indexing-solr/build.gradle | 10 +- extensions/indexing-solr/dev-status.xml | 6 +- .../indexing-solr/src/docs/index-solr.txt | 2 +- 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 | 4 +- extensions/metrics-codahale/build.gradle | 10 +- extensions/metrics-codahale/dev-status.xml | 6 +- .../src/docs/metrics-codahale.txt | 4 +- extensions/migration/build.gradle | 6 +- extensions/migration/dev-status.xml | 6 +- extensions/reindexer/build.gradle | 10 +- extensions/reindexer/dev-status.xml | 6 +- extensions/reindexer/src/docs/reindexer.txt | 4 +- .../valueserialization-jackson/build.gradle | 6 +- .../valueserialization-jackson/dev-status.xml | 6 +- .../src/docs/vs-jackson.txt | 2 +- .../valueserialization-orgjson/build.gradle | 6 +- .../valueserialization-orgjson/dev-status.xml | 6 +- .../src/docs/vs-orgjson.txt | 2 +- extensions/valueserialization-stax/build.gradle | 6 +- .../valueserialization-stax/dev-status.xml | 6 +- .../src/docs/vs-stax.txt | 2 +- libraries/alarm/build.gradle | 6 +- libraries/alarm/dev-status.xml | 6 +- libraries/alarm/src/docs/alarm.txt | 2 +- libraries/circuitbreaker/build.gradle | 8 +- libraries/circuitbreaker/dev-status.xml | 6 +- .../circuitbreaker/src/docs/circuitbreaker.txt | 6 +- libraries/constraints/build.gradle | 6 +- libraries/constraints/dev-status.xml | 6 +- libraries/constraints/src/docs/constraints.txt | 2 +- libraries/fileconfig/build.gradle | 6 +- libraries/fileconfig/dev-status.xml | 6 +- libraries/fileconfig/src/docs/fileconfig.txt | 6 +- libraries/http/build.gradle | 10 +- libraries/http/dev-status.xml | 6 +- libraries/http/src/docs/http.txt | 14 +- libraries/invocation-cache/build.gradle | 8 +- libraries/invocation-cache/dev-status.xml | 6 +- .../src/docs/invocation-cache.txt | 4 +- libraries/jmx/build.gradle | 6 +- libraries/jmx/dev-status.xml | 6 +- libraries/jmx/src/docs/jmx.txt | 4 +- libraries/lang-groovy/build.gradle | 6 +- libraries/lang-groovy/dev-status.xml | 6 +- libraries/lang-groovy/src/docs/lang-groovy.txt | 14 +- libraries/lang-javascript/build.gradle | 8 +- libraries/lang-javascript/dev-status.xml | 6 +- .../src/docs/lang-javascript.txt | 4 +- libraries/locking/build.gradle | 6 +- libraries/locking/dev-status.xml | 6 +- libraries/locking/src/docs/locking.txt | 2 +- libraries/logging/build.gradle | 8 +- libraries/logging/dev-status.xml | 6 +- libraries/logging/src/docs/logging.txt | 8 +- libraries/metrics/build.gradle | 8 +- libraries/metrics/dev-status.xml | 6 +- libraries/metrics/src/docs/metrics.txt | 4 +- libraries/osgi/build.gradle | 6 +- libraries/osgi/dev-status.xml | 6 +- libraries/osgi/src/docs/osgi.txt | 4 +- libraries/rdf/build.gradle | 12 +- libraries/rdf/dev-status.xml | 6 +- .../polygene/library/rdf/entity/test2.xml | 24 +- libraries/rest-client/build.gradle | 10 +- libraries/rest-client/dev-status.xml | 6 +- libraries/rest-client/src/docs/primer.txt | 4 +- libraries/rest-client/src/docs/rest-client.txt | 14 +- .../ContextResourceClientFactoryTest.java | 2 +- .../rest/client/ContinuousIntegrationTest.java | 2 +- libraries/rest-common/build.gradle | 2 +- libraries/rest-common/dev-status.xml | 6 +- libraries/rest-server/build.gradle | 6 +- libraries/rest-server/dev-status.xml | 6 +- libraries/rest/build.gradle | 10 +- libraries/rest/dev-status.xml | 6 +- .../polygene/library/rest/admin/sparqlform.html | 18 +- .../polygene/library/rest/admin/Main.java | 4 +- .../polygene/library/rest/admin/RestTest.java | 2 +- libraries/restlet/build.gradle | 14 +- libraries/restlet/dev-status.xml | 6 +- .../library/restlet/ZrestApplication.java | 14 +- libraries/scripting/build.gradle | 6 +- libraries/scripting/dev-status.xml | 6 +- libraries/servlet/build.gradle | 6 +- libraries/servlet/dev-status.xml | 6 +- libraries/servlet/src/docs/servlet.txt | 4 +- .../lifecycle/AbstractZestServletBootstrap.java | 10 +- .../polygene/library/servlet/package.html | 14 +- libraries/shiro-core/build.gradle | 12 +- libraries/shiro-core/dev-status.xml | 6 +- libraries/shiro-core/src/docs/shiro.txt | 24 +- libraries/shiro-web/build.gradle | 16 +- libraries/shiro-web/dev-status.xml | 6 +- libraries/shiro-web/src/docs/shiro-web.txt | 2 +- libraries/spring/build.gradle | 6 +- libraries/spring/dev-status.xml | 6 +- libraries/spring/src/docs/spring.txt | 14 +- .../library/spring/bootstrap/Constants.java | 2 +- .../bootstrap/ZestApplicationBootstrap.java | 4 +- .../src/main/resources/META-INF/spring.handlers | 2 +- .../src/main/resources/META-INF/spring.schemas | 2 +- .../polygene/library/spring/spring-0.5.xsd | 4 +- .../bootstrap/ZestExportServiceTest-context.xml | 8 +- 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 +- libraries/sql/build.gradle | 18 +- libraries/sql/dev-status.xml | 6 +- libraries/sql/src/docs/sql.txt | 20 +- libraries/uid/build.gradle | 6 +- libraries/uid/dev-status.xml | 6 +- libraries/uid/src/docs/uid.txt | 12 +- libraries/uowfile/build.gradle | 8 +- libraries/uowfile/dev-status.xml | 6 +- libraries/uowfile/src/docs/uowfile.txt | 24 +- manual/build.gradle | 8 +- manual/src/docs/reference/index.txt | 6 +- .../tutorials/howto-assembly-application.txt | 14 +- .../src/docs/tutorials/howto-build-system.txt | 2 +- .../docs/tutorials/howto-configure-service.txt | 26 +- .../tutorials/howto-contextual-fragments.txt | 4 +- .../src/docs/tutorials/howto-create-concern.txt | 16 +- .../docs/tutorials/howto-create-constraint.txt | 16 +- .../src/docs/tutorials/howto-create-entity.txt | 36 +- .../docs/tutorials/howto-create-sideeffect.txt | 16 +- .../src/docs/tutorials/howto-depend-on-zest.txt | 4 +- .../tutorials/howto-invocation-annotation.txt | 6 +- .../tutorials/howto-leverage-properties.txt | 14 +- .../docs/tutorials/howto-releasing-apache.txt | 416 +++++++++---------- .../src/docs/tutorials/howto-writing-docs.txt | 20 +- manual/src/docs/userguide/core.txt | 2 +- manual/src/docs/userguide/index.txt | 6 +- manual/src/docs/userguide/preface.txt | 2 +- manual/src/docs/website/intro.txt | 2 +- manual/src/docs/website/javadocs.txt | 24 +- manual/src/docs/website/samples.txt | 14 +- manual/src/docs/website/tutorials.txt | 6 +- manual/src/docs/website/xsl/head.xsl | 6 +- .../polygene/manual/recipes/assemble/Main.java | 6 +- .../manual/recipes/createEntity/Main.java | 4 +- .../resources/css/progressive-enhancement.css | 2 +- .../src/resources/js/progressive-enhancement.js | 4 +- .../schemas/2008/dev-status/1/dev-status.xsd | 8 +- manual/src/xsl/disqus-footer.xsl | 4 +- manual/src/xsl/fo.xsl | 2 +- manual/src/xsl/head-offline.xsl | 6 +- samples/dci/build.gradle | 8 +- samples/forum/build.gradle | 18 +- samples/rental/build.gradle | 8 +- .../sample/rental/web/QuikitServlet.java | 4 +- .../polygene/sample/rental/web/BookingPage.html | 2 +- .../polygene/sample/rental/web/MainPage.html | 2 +- samples/rental/src/main/webapp/WEB-INF/web.xml | 2 +- samples/sql-support/build.gradle | 12 +- samples/swing/build.gradle | 4 +- src/bin-dist/README.txt | 4 +- src/javadoc/overview.html | 2 +- tests/performance/build.gradle | 20 +- .../AbstractEntityStorePerformanceTest.java | 4 +- .../PostgreSQLEntityStorePerformanceTest.java | 4 +- .../indexing/rdf/QueryPerformanceTest.java | 4 +- .../README-for-regression-reporting.txt | 2 +- tests/regression/build.gradle | 8 +- tools/envisage/build.gradle | 10 +- tools/envisage/dev-status.xml | 6 +- tools/envisage/src/docs/envisage.txt | 2 +- .../envisage/detail/DependencyPane.java | 12 +- .../envisage/detail/ImportedByPane.java | 4 +- .../detail/ServiceConfigurationPane.java | 8 +- .../envisage/detail/DependencyPane.properties | 12 +- .../envisage/detail/ImportedByPane.properties | 4 +- .../detail/ServiceConfigurationPane.properties | 8 +- tools/generator-zest/app/index.js | 50 +-- .../app/templates/Heroes/web.tmpl | 2 +- .../InfrastructureLayer/bootstrap.tmpl | 6 +- .../app/templates/StorageModule/bootstrap.tmpl | 12 +- .../app/templates/buildtool/gradle-app.tmpl | 8 +- .../templates/buildtool/gradle-bootstrap.tmpl | 14 +- .../app/templates/buildtool/gradle-rest.tmpl | 4 +- .../app/templates/buildtool/gradle-root.tmpl | 8 +- .../app/templates/buildtool/settings.tmpl | 2 +- tools/generator-zest/package.json | 2 +- tools/model-detail/build.gradle | 8 +- tools/model-detail/dev-status.xml | 6 +- tools/qidea/build.gradle | 6 +- .../plugin/idea/ZestApplicationComponent.java | 10 +- .../common/actions/ZestCreateActionGroup.java | 4 +- .../idea/common/inspections/AbstractFix.java | 2 +- .../common/inspections/AbstractInspection.java | 2 +- ...nsAnnotationDeclaredCorrectlyInspection.html | 2 +- .../resource/ZestResourceBundle.properties | 10 +- tools/shell/dev-status.xml | 6 +- tools/shell/src/dist/bin/zest-boot | 12 +- .../templates/default/files/app/build.gradle_ | 8 +- .../default/files/bootstrap/build.gradle_ | 14 +- .../etc/templates/default/files/build.gradle_ | 6 +- .../ng2-heroes/files/app/build.gradle_ | 8 +- .../ng2-heroes/files/bootstrap/build.gradle_ | 14 +- .../templates/ng2-heroes/files/build.gradle_ | 6 +- .../ng2-heroes/files/rest/build.gradle_ | 4 +- .../dist/etc/templates/null/files/build.gradle_ | 6 +- .../templates/restapp/files/app/build.gradle_ | 8 +- .../restapp/files/bootstrap/build.gradle_ | 14 +- .../etc/templates/restapp/files/build.gradle_ | 6 +- .../templates/restapp/files/rest/build.gradle_ | 4 +- .../etc/templates/singleton/files/build.gradle_ | 6 +- tools/shell/src/docs/quick-start.txt | 2 +- tools/shell/src/docs/shell.txt | 8 +- tools/shell/src/docs/use-boot.txt | 12 +- .../apache/polygene/tools/shell/FileUtils.java | 4 +- .../create/project/AbstractProjectCreator.java | 2 +- .../create/project/restapp/WebXmlWriter.java | 4 +- .../apache/polygene/tools/shell/TestHelper.java | 12 +- tutorials/cargo/build.gradle | 6 +- tutorials/composites/build.gradle | 8 +- tutorials/composites/src/docs/step1.txt | 10 +- tutorials/composites/src/docs/step2.txt | 4 +- tutorials/composites/src/docs/step3.txt | 10 +- tutorials/composites/src/docs/step4.txt | 4 +- tutorials/composites/src/docs/step5.txt | 8 +- tutorials/composites/src/docs/step6.txt | 8 +- tutorials/composites/src/docs/step7.txt | 8 +- tutorials/composites/src/docs/step8.txt | 6 +- tutorials/composites/src/docs/step9.txt | 6 +- .../composites/src/docs/tut-composites.txt | 4 +- .../tutorials/composites/tutorial2/package.html | 2 +- .../tutorials/composites/tutorial5/package.html | 4 +- .../composites/src/main/javadoc/overview.html | 2 +- tutorials/hello/build.gradle | 8 +- tutorials/introduction/build.gradle | 6 +- .../introduction/src/docs/state-modeling.txt | 10 +- .../introduction/src/docs/whats-an-object.txt | 10 +- tutorials/introduction/src/docs/zest-cop.txt | 2 +- tutorials/introduction/tenminutes/build.gradle | 6 +- .../tenminutes/src/docs/ten-minutes.txt | 12 +- .../introduction/thirtyminutes/build.gradle | 6 +- .../thirtyminutes/src/docs/thirty-minutes.txt | 20 +- tutorials/introduction/twominutes/build.gradle | 6 +- .../twominutes/src/docs/two-minutes.txt | 10 +- tutorials/services/build.gradle | 6 +- tutorials/services/src/docs/step3.txt | 2 +- tutorials/services/src/docs/tut-services.txt | 4 +- .../tutorials/services/step3/package.html | 2 +- 360 files changed, 1603 insertions(+), 1603 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/KEYS ---------------------------------------------------------------------- diff --git a/KEYS b/KEYS index 9b20046..a5d2f9d 100644 --- a/KEYS +++ b/KEYS @@ -26,7 +26,7 @@ Developers: Releases will be signed using one of the keys present in this file. This file will be available with the distributed Apache Polygene releases at: - https://dist.apache.org/repos/dist/zest/KEYS + https://dist.apache.org/repos/dist/polygene/KEYS ******************************************************************************** http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/README.txt ---------------------------------------------------------------------- diff --git a/README.txt b/README.txt index ee8cdd2..a27ea07 100644 --- a/README.txt +++ b/README.txt @@ -14,7 +14,7 @@ cool, new and challenging technology. We are especially interested in people willing to help improve the SDK, samples, tutorials, documentation and other supporting material. -Please see https://zest.apache.org for more information. +Please see https://polygene.apache.org for more information. Licensing @@ -38,7 +38,7 @@ If you need to go offline type `./gradlew goOffline` to ensure all needed dependencies are cached by Gradle. If you prefer to use a dependency management system, go to: -https://zest.apache.org/java/latest/howto-depend-on-zest.html +https://polygene.apache.org/java/latest/howto-depend-on-polygene.html Building Apache Polygene @@ -54,7 +54,7 @@ Here is how to run a full build with checks: ./gradlew check assemble Read the Polygene⢠Build System tutorial for more details: -https://zest.apache.org/java/latest/build-system.html +https://polygene.apache.org/java/latest/build-system.html Thank you for trying out Apache Polygene⢠and Composite Oriented Programming. http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/buildSrc/src/asciidoc/filters/devstatus/devstatus.py ---------------------------------------------------------------------- diff --git a/buildSrc/src/asciidoc/filters/devstatus/devstatus.py b/buildSrc/src/asciidoc/filters/devstatus/devstatus.py index 81bbc04..11abfa4 100755 --- a/buildSrc/src/asciidoc/filters/devstatus/devstatus.py +++ b/buildSrc/src/asciidoc/filters/devstatus/devstatus.py @@ -23,7 +23,7 @@ import sys import xml.dom.minidom PATH_PATTERN="%(source)s" -NS="http://zest.apache.org/schemas/2008/dev-status/1"; +NS="http://polygene.apache.org/schemas/2008/dev-status/1"; def configuration(indata): config = {} http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/buildSrc/src/main/groovy/org/apache/polygene/gradle/RootProjectPlugin.groovy ---------------------------------------------------------------------- diff --git a/buildSrc/src/main/groovy/org/apache/polygene/gradle/RootProjectPlugin.groovy b/buildSrc/src/main/groovy/org/apache/polygene/gradle/RootProjectPlugin.groovy index c05a584..78857ea 100644 --- a/buildSrc/src/main/groovy/org/apache/polygene/gradle/RootProjectPlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/polygene/gradle/RootProjectPlugin.groovy @@ -132,7 +132,7 @@ class RootProjectPlugin implements Plugin<Project> private static void configureJavadocs( Project project ) { - def zest = project.extensions.getByType( PolygeneExtension ) + def polygene = project.extensions.getByType( PolygeneExtension ) def releaseSpec = project.extensions.getByType( ReleaseSpecExtension ) project.tasks.create( TaskNames.JAVADOCS, Javadoc ) { Javadoc task -> task.group = TaskGroups.DOCUMENTATION @@ -184,7 +184,7 @@ class RootProjectPlugin implements Plugin<Project> task.description = 'Copy SDK public Javadoc to ../polygene-web' task.dependsOn TaskNames.JAVADOCS task.from 'build/docs/javadoc/' - if( zest.developmentVersion ) + if( polygene.developmentVersion ) { task.into( "$project.projectDir/../polygene-web/site/content/java/develop/javadocs/" ) } @@ -242,12 +242,12 @@ class RootProjectPlugin implements Plugin<Project> private static void configureReleaseTask( Project project ) { - def zest = project.extensions.getByType( PolygeneExtension ) + def polygene = project.extensions.getByType( PolygeneExtension ) def release = project.tasks.create( 'release' ) release.description = 'Builds, tests and uploads the release artifacts' release.group = TaskGroups.RELEASE release.doFirst { - if( zest.developmentVersion ) + if( polygene.developmentVersion ) { throw new GradleException( "Cannot release development version $project.version, use '-Dversion=X.Y.Z'" ) } http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/buildSrc/src/main/groovy/org/apache/polygene/gradle/doc/DocumentationTask.groovy ---------------------------------------------------------------------- diff --git a/buildSrc/src/main/groovy/org/apache/polygene/gradle/doc/DocumentationTask.groovy b/buildSrc/src/main/groovy/org/apache/polygene/gradle/doc/DocumentationTask.groovy index a043aa0..574f081 100644 --- a/buildSrc/src/main/groovy/org/apache/polygene/gradle/doc/DocumentationTask.groovy +++ b/buildSrc/src/main/groovy/org/apache/polygene/gradle/doc/DocumentationTask.groovy @@ -134,13 +134,13 @@ class DocumentationTask extends DefaultTask def void generateAsciidocAccordingToReleaseSpecification() { - def zest = project.extensions.getByType( PolygeneExtension ) + def polygene = project.extensions.getByType( PolygeneExtension ) project.copy { CopySpec spec -> spec.from docsDir spec.into tempAsciidocDir spec.include '**' } - if( zest.releaseVersion ) + if( polygene.releaseVersion ) { def licenseFile = new File( tempAsciidocDir, 'userguide/libraries.txt' ) def extensionsFile = new File( tempAsciidocDir, 'userguide/extensions.txt' ) http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/buildSrc/src/main/groovy/org/apache/polygene/gradle/doc/ManualPlugin.groovy ---------------------------------------------------------------------- diff --git a/buildSrc/src/main/groovy/org/apache/polygene/gradle/doc/ManualPlugin.groovy b/buildSrc/src/main/groovy/org/apache/polygene/gradle/doc/ManualPlugin.groovy index f6e9707..16aff3c 100644 --- a/buildSrc/src/main/groovy/org/apache/polygene/gradle/doc/ManualPlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/polygene/gradle/doc/ManualPlugin.groovy @@ -39,14 +39,14 @@ class ManualPlugin implements Plugin<Project> @Override void apply( final Project project ) { - def zest = project.extensions.getByType( PolygeneExtension ) + def polygene = project.extensions.getByType( PolygeneExtension ) project.tasks.create( TaskNames.WEBSITE, DocumentationTask ) { DocumentationTask task -> task.group = TaskGroups.DOCUMENTATION task.description = 'Generates documentation website' task.dependsOn project.rootProject.allprojects.findResults { Project p -> p.tasks.findByName AsciidocBuildInfoPlugin.TASK_NAME } - task.onlyIf { isAsciidocInstalled( project, zest ) } + task.onlyIf { isAsciidocInstalled( project, polygene ) } task.docName = 'website' task.docType = 'article' } @@ -54,8 +54,8 @@ class ManualPlugin implements Plugin<Project> task.group = TaskGroups.DOCUMENTATION task.description = 'Copy website to ../polygene-web' task.dependsOn TaskNames.WEBSITE - task.onlyIf { isAsciidocInstalled( project, zest ) } - if( zest.developmentVersion ) + task.onlyIf { isAsciidocInstalled( project, polygene ) } + if( polygene.developmentVersion ) { task.into "$project.rootProject.projectDir/../polygene-web/site/content/java/develop" } @@ -69,7 +69,7 @@ class ManualPlugin implements Plugin<Project> task.group = TaskGroups.RELEASE task.description = 'Copy website to ../polygene-web LATEST' task.dependsOn TaskNames.ARCHIVE_WEBSITE - task.onlyIf { zest.releaseVersion } + task.onlyIf { polygene.releaseVersion } task.from "$project.rootProject.projectDir/../polygene-web/site/content/java/$project.version/" task.into "$project.rootProject.projectDir/../polygene-web/site/content/java/latest/" } @@ -77,7 +77,7 @@ class ManualPlugin implements Plugin<Project> task.group = TaskGroups.DOCUMENTATION task.description = 'Generates all documentation' task.dependsOn TaskNames.COPY_WEBSITE - task.onlyIf { isAsciidocInstalled( project, zest ) } + task.onlyIf { isAsciidocInstalled( project, polygene ) } } } @@ -86,12 +86,12 @@ class ManualPlugin implements Plugin<Project> // Force when building a release version // Skip if skipAsciidocIfAbsent property is set // Skip if asciidoc is not found in PATH when building a development version - private static boolean isAsciidocInstalled( Project project, PolygeneExtension zest ) + private static boolean isAsciidocInstalled( Project project, PolygeneExtension polygene ) { if( asciidocInstalled == null ) { def skipAsciidocIfAbsent = project.findProperty 'skipAsciidocIfAbsent' - if( !skipAsciidocIfAbsent && zest.releaseVersion ) + if( !skipAsciidocIfAbsent && polygene.releaseVersion ) { project.logger.info 'Asciidoc tasks forced for building a release version, hope you have Asciidoc installed' asciidocInstalled = true http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/buildSrc/src/main/groovy/org/apache/polygene/gradle/publish/PublishingPlugin.groovy ---------------------------------------------------------------------- diff --git a/buildSrc/src/main/groovy/org/apache/polygene/gradle/publish/PublishingPlugin.groovy b/buildSrc/src/main/groovy/org/apache/polygene/gradle/publish/PublishingPlugin.groovy index 6d55b9d..12d5666 100644 --- a/buildSrc/src/main/groovy/org/apache/polygene/gradle/publish/PublishingPlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/polygene/gradle/publish/PublishingPlugin.groovy @@ -91,10 +91,10 @@ class PublishingPlugin implements Plugin<Project> private static Config configFor( Project project ) { - def zest = project.extensions.getByType( PolygeneExtension ) + def polygene = project.extensions.getByType( PolygeneExtension ) def config = new Config() - config.snapshots = zest.developmentVersion - config.releases = zest.releaseVersion + config.snapshots = polygene.developmentVersion + config.releases = polygene.releaseVersion config.signed = project.findProperty( 'uploadSigned' ) ?: config.releases config.releaseSpec = project.findProperty( 'uploadReleaseSpec' ) ?: config.releases config.wagon = project.findProperty( 'uploadWagon' ) ?: WAGON_HTTP http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/api/build.gradle ---------------------------------------------------------------------- diff --git a/core/api/build.gradle b/core/api/build.gradle index 96f6c5a..db05b19 100644 --- a/core/api/build.gradle +++ b/core/api/build.gradle @@ -21,9 +21,9 @@ jar { manifest { name = "Apache Polygene⢠Core API" } } dependencies { - testCompile zest.core.testsupport - testCompile zest.library( 'constraints' ) - testCompile zest.extension( 'valueserialization-orgjson' ) + testCompile polygene.core.testsupport + testCompile polygene.library( 'constraints' ) + testCompile polygene.extension( 'valueserialization-orgjson' ) - testRuntime zest.core.runtime + testRuntime polygene.core.runtime } http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/api/dev-status.xml ---------------------------------------------------------------------- diff --git a/core/api/dev-status.xml b/core/api/dev-status.xml index a2a7b18..3703137 100644 --- a/core/api/dev-status.xml +++ b/core/api/dev-status.xml @@ -18,10 +18,10 @@ ~ ~ --> -<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"; +<module xmlns="http://polygene.apache.org/schemas/2008/dev-status/1"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1 - http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd";> + xsi:schemaLocation="http://polygene.apache.org/schemas/2008/dev-status/1 + http://polygene.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/54b69c48/core/api/src/docs/application.txt ---------------------------------------------------------------------- diff --git a/core/api/src/docs/application.txt b/core/api/src/docs/application.txt index 5d9d715..19a4649 100644 --- a/core/api/src/docs/application.txt +++ b/core/api/src/docs/application.txt @@ -63,7 +63,7 @@ The full code looks like this; [snippet,java] ----------- -source=core/api/src/test/java/org/apache/zest/api/docsupport/ApplicationDocs.java +source=core/api/src/test/java/org/apache/polygene/api/docsupport/ApplicationDocs.java tag=application1 ----------- @@ -74,7 +74,7 @@ shows what is the actual required sequence to start up Polygene. [snippet,java] ----------- -source=core/bootstrap/src/main/java/org/apache/zest/bootstrap/SingletonAssembler.java +source=core/bootstrap/src/main/java/org/apache/polygene/bootstrap/SingletonAssembler.java tag=actual ----------- @@ -92,7 +92,7 @@ Module in the second index and any number of Assembler instances in the last ind [snippet,java] ----------- -source=core/api/src/test/java/org/apache/zest/api/docsupport/ApplicationDocs.java +source=core/api/src/test/java/org/apache/polygene/api/docsupport/ApplicationDocs.java tag=application2 ----------- @@ -107,7 +107,7 @@ free structure, as long as the rules for no cyclic reference of the Layers are k [snippet,java] ----------- -source=core/api/src/test/java/org/apache/zest/api/docsupport/ApplicationDocs.java +source=core/api/src/test/java/org/apache/polygene/api/docsupport/ApplicationDocs.java tag=application3 ----------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/api/src/docs/composition.txt ---------------------------------------------------------------------- diff --git a/core/api/src/docs/composition.txt b/core/api/src/docs/composition.txt index 6cb5492..1a60a3a 100644 --- a/core/api/src/docs/composition.txt +++ b/core/api/src/docs/composition.txt @@ -56,7 +56,7 @@ We can therefor get rid of a lot of additional types, and use Polygene-free inte [snippet,java] ----------- -source=core/api/src/test/java/org/apache/zest/api/docsupport/CompositionDocs.java +source=core/api/src/test/java/org/apache/polygene/api/docsupport/CompositionDocs.java tag=comp1 ----------- @@ -64,7 +64,7 @@ and declare it with; [snippet,java] ----------- -source=core/api/src/test/java/org/apache/zest/api/docsupport/CompositionDocs.java +source=core/api/src/test/java/org/apache/polygene/api/docsupport/CompositionDocs.java tag=comp2 ----------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/api/src/docs/concern.txt ---------------------------------------------------------------------- diff --git a/core/api/src/docs/concern.txt b/core/api/src/docs/concern.txt index 10e19ef..02354e3 100644 --- a/core/api/src/docs/concern.txt +++ b/core/api/src/docs/concern.txt @@ -58,21 +58,21 @@ of the JDBC Connection class; [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/concern/DocumentationSupport.java +source=core/api/src/test/java/org/apache/polygene/api/concern/DocumentationSupport.java tag=class -------------- We can also use an AppliesToFilter to define which methods should be wrapped with the concern, like this; [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/concern/DocumentationSupport.java +source=core/api/src/test/java/org/apache/polygene/api/concern/DocumentationSupport.java tag=filter -------------- And finally an example of how to use annotations to mark indvidual methods for being wrapped by the concern. [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/concern/DocumentationSupport.java +source=core/api/src/test/java/org/apache/polygene/api/concern/DocumentationSupport.java tag=annotation -------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/api/src/docs/configuration.txt ---------------------------------------------------------------------- diff --git a/core/api/src/docs/configuration.txt b/core/api/src/docs/configuration.txt index f3fb2d9..6a6d1e5 100644 --- a/core/api/src/docs/configuration.txt +++ b/core/api/src/docs/configuration.txt @@ -32,7 +32,7 @@ Example; [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/configuration/MailServiceConfiguration.java +source=core/api/src/test/java/org/apache/polygene/api/configuration/MailServiceConfiguration.java tag=configuration -------------- @@ -47,7 +47,7 @@ changes take effect. Example; [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/configuration/MailService.java +source=core/api/src/test/java/org/apache/polygene/api/configuration/MailService.java tag=read -------------- @@ -57,7 +57,7 @@ must be called. Example; [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/configuration/MailService.java +source=core/api/src/test/java/org/apache/polygene/api/configuration/MailService.java tag=write -------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/api/src/docs/decoratormixin.txt ---------------------------------------------------------------------- diff --git a/core/api/src/docs/decoratormixin.txt b/core/api/src/docs/decoratormixin.txt index 4c34637..6bfae61 100644 --- a/core/api/src/docs/decoratormixin.txt +++ b/core/api/src/docs/decoratormixin.txt @@ -30,7 +30,7 @@ the same model instance, so any changes to the model will notify the views. We start with the FooModel interface; [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/mixin/decoratorMixin/FooModel.java +source=core/api/src/test/java/org/apache/polygene/api/mixin/decoratorMixin/FooModel.java tag=plain -------------- @@ -39,7 +39,7 @@ and its implementation is not really relevant for this discussion. Each of the views looks like this; [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/mixin/decoratorMixin/View1.java +source=core/api/src/test/java/org/apache/polygene/api/mixin/decoratorMixin/View1.java tag=decorator -------------- @@ -51,7 +51,7 @@ FooModel with the DecoratorMixin. [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/mixin/decoratorMixin/FooModel.java +source=core/api/src/test/java/org/apache/polygene/api/mixin/decoratorMixin/FooModel.java tag=decorator -------------- @@ -60,7 +60,7 @@ do; [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/mixin/decoratorMixin/DecoratorMixinTest.java +source=core/api/src/test/java/org/apache/polygene/api/mixin/decoratorMixin/DecoratorMixinTest.java tag=create -------------- @@ -68,7 +68,7 @@ And there is nothing special in the assembly of this simple example; [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/mixin/decoratorMixin/DecoratorMixinTest.java +source=core/api/src/test/java/org/apache/polygene/api/mixin/decoratorMixin/DecoratorMixinTest.java tag=assembly -------------- @@ -76,6 +76,6 @@ This can now be validated in a small test; [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/mixin/decoratorMixin/DecoratorMixinTest.java +source=core/api/src/test/java/org/apache/polygene/api/mixin/decoratorMixin/DecoratorMixinTest.java tag=test -------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/api/src/docs/metrics.txt ---------------------------------------------------------------------- diff --git a/core/api/src/docs/metrics.txt b/core/api/src/docs/metrics.txt index c49ca2a..af3529e 100644 --- a/core/api/src/docs/metrics.txt +++ b/core/api/src/docs/metrics.txt @@ -28,7 +28,7 @@ constructor argument. [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/metrics/DocumentationSupport.java +source=core/api/src/test/java/org/apache/polygene/api/metrics/DocumentationSupport.java tag=common -------------- @@ -46,7 +46,7 @@ To create a Gauge, you do something like; [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/metrics/DocumentationSupport.java +source=core/api/src/test/java/org/apache/polygene/api/metrics/DocumentationSupport.java tag=gauge -------------- @@ -54,14 +54,14 @@ tag=gauge [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/metrics/DocumentationSupport.java +source=core/api/src/test/java/org/apache/polygene/api/metrics/DocumentationSupport.java tag=counter -------------- == Histogram == [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/metrics/DocumentationSupport.java +source=core/api/src/test/java/org/apache/polygene/api/metrics/DocumentationSupport.java tag=histogram -------------- @@ -69,7 +69,7 @@ tag=histogram [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/metrics/DocumentationSupport.java +source=core/api/src/test/java/org/apache/polygene/api/metrics/DocumentationSupport.java tag=meter -------------- @@ -79,7 +79,7 @@ critical sections, or even HTTP requests duration and similar. [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/metrics/DocumentationSupport.java +source=core/api/src/test/java/org/apache/polygene/api/metrics/DocumentationSupport.java tag=timer -------------- @@ -87,6 +87,6 @@ tag=timer [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/metrics/DocumentationSupport.java +source=core/api/src/test/java/org/apache/polygene/api/metrics/DocumentationSupport.java tag=healthcheck -------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/api/src/docs/mixin.txt ---------------------------------------------------------------------- diff --git a/core/api/src/docs/mixin.txt b/core/api/src/docs/mixin.txt index b95e710..cd7241c 100644 --- a/core/api/src/docs/mixin.txt +++ b/core/api/src/docs/mixin.txt @@ -23,7 +23,7 @@ the @Mixins annotation of a Composite declaration) implements one or more method Mixin Type can be very simple, like; [snippet,java] ----------- -source=core/api/src/test/java/org/apache/zest/api/mixin/BankAccount.java +source=core/api/src/test/java/org/apache/polygene/api/mixin/BankAccount.java tag=mixinType ----------- @@ -66,12 +66,12 @@ Mixins are declared as annotations on the composite interface. [snippet,java] ----------- -source=core/api/src/test/java/org/apache/zest/api/mixin/Something.java +source=core/api/src/test/java/org/apache/polygene/api/mixin/Something.java tag=something ----------- [snippet,java] ----------- -source=core/api/src/test/java/org/apache/zest/api/mixin/SomethingMixin.java +source=core/api/src/test/java/org/apache/polygene/api/mixin/SomethingMixin.java tag=something ----------- In the above sample, the SomethingMixin will be made part of the Something composite. @@ -81,17 +81,17 @@ the mixins required. [snippet,java] ----------- -source=core/api/src/test/java/org/apache/zest/api/mixin/Car.java +source=core/api/src/test/java/org/apache/polygene/api/mixin/Car.java tag=mixin ----------- [snippet,java] ----------- -source=core/api/src/test/java/org/apache/zest/api/mixin/Startable.java +source=core/api/src/test/java/org/apache/polygene/api/mixin/Startable.java tag=mixin ----------- [snippet,java] ----------- -source=core/api/src/test/java/org/apache/zest/api/mixin/Vehicle.java +source=core/api/src/test/java/org/apache/polygene/api/mixin/Vehicle.java tag=mixin ----------- @@ -101,22 +101,22 @@ which are ordinary mixins but are lacking some methods. This is simply done by d [snippet,java] ----------- -source=core/api/src/test/java/org/apache/zest/api/mixin/partial/Car.java +source=core/api/src/test/java/org/apache/polygene/api/mixin/partial/Car.java tag=partial ----------- [snippet,java] ----------- -source=core/api/src/test/java/org/apache/zest/api/mixin/partial/Vehicle.java +source=core/api/src/test/java/org/apache/polygene/api/mixin/partial/Vehicle.java tag=partial ----------- [snippet,java] ----------- -source=core/api/src/test/java/org/apache/zest/api/mixin/partial/SpeedLocation.java +source=core/api/src/test/java/org/apache/polygene/api/mixin/partial/SpeedLocation.java tag=partial ----------- [snippet,java] ----------- -source=core/api/src/test/java/org/apache/zest/api/mixin/partial/SpeedMixin.java +source=core/api/src/test/java/org/apache/polygene/api/mixin/partial/SpeedMixin.java tag=partial ----------- @@ -140,7 +140,7 @@ the Cargo interface like; [snippet,java] ----------- -source=core/api/src/test/java/org/apache/zest/api/mixin/privateMixin/Cargo.java +source=core/api/src/test/java/org/apache/polygene/api/mixin/privateMixin/Cargo.java tag=private ----------- @@ -150,12 +150,12 @@ probably do something like; [snippet,java] ----------- -source=core/api/src/test/java/org/apache/zest/api/mixin/privateMixin/CargoMixin.java +source=core/api/src/test/java/org/apache/polygene/api/mixin/privateMixin/CargoMixin.java tag=private ----------- [snippet,java] ----------- -source=core/api/src/test/java/org/apache/zest/api/mixin/privateMixin/CargoState.java +source=core/api/src/test/java/org/apache/polygene/api/mixin/privateMixin/CargoState.java tag=private ----------- @@ -177,7 +177,7 @@ interfaces and automatically included if needed. They also serve as excellent ex [snippet,java] ----------- -source=core/api/src/main/java/org/apache/zest/api/property/PropertyMixin.java +source=core/api/src/main/java/org/apache/polygene/api/property/PropertyMixin.java tag=actual ----------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/api/src/docs/servicecomposite.txt ---------------------------------------------------------------------- diff --git a/core/api/src/docs/servicecomposite.txt b/core/api/src/docs/servicecomposite.txt index b541c65..26c0d4f 100644 --- a/core/api/src/docs/servicecomposite.txt +++ b/core/api/src/docs/servicecomposite.txt @@ -52,7 +52,7 @@ by calling instantiateOnStartup(), this way; [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/service/DocumentationSupport.java +source=core/api/src/test/java/org/apache/polygene/api/service/DocumentationSupport.java tag=instantiateOnStartup -------------- @@ -67,7 +67,7 @@ The easiest way is to implement the ServiceActivation interface directly in the [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/service/DocumentationSupport.java +source=core/api/src/test/java/org/apache/polygene/api/service/DocumentationSupport.java tag=activation1 -------------- @@ -75,7 +75,7 @@ The activation code can also be moved outside the composite by using the Service [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/service/DocumentationSupport.java +source=core/api/src/test/java/org/apache/polygene/api/service/DocumentationSupport.java tag=activation2 -------------- @@ -83,7 +83,7 @@ Activators can be registered on Service assembly too, this way; [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/service/DocumentationSupport.java +source=core/api/src/test/java/org/apache/polygene/api/service/DocumentationSupport.java tag=activation3 -------------- @@ -100,7 +100,7 @@ instance. Services can also be arbitrarily tagged, via the ServiceDescriptor. Ex [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/service/DocumentationSupport.java +source=core/api/src/test/java/org/apache/polygene/api/service/DocumentationSupport.java tag=tag -------------- @@ -108,6 +108,6 @@ Tags are useful inside the application code to locate a particular service insta [snippet,java] -------------- -source=core/api/src/test/java/org/apache/zest/api/service/DocumentationSupport.java +source=core/api/src/test/java/org/apache/polygene/api/service/DocumentationSupport.java tag=UseTag -------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/api/src/docs/valuecomposite.txt ---------------------------------------------------------------------- diff --git a/core/api/src/docs/valuecomposite.txt b/core/api/src/docs/valuecomposite.txt index 8c59187..c3de8b5 100644 --- a/core/api/src/docs/valuecomposite.txt +++ b/core/api/src/docs/valuecomposite.txt @@ -83,7 +83,7 @@ Let's see how it works in practice. [snippet,java] ---- -source=core/api/src/test/java/org/apache/zest/api/value/DocumentationSupport.java +source=core/api/src/test/java/org/apache/polygene/api/value/DocumentationSupport.java tag=default ---- @@ -107,7 +107,7 @@ Let's see how to use the ValueSerialization Services. [snippet,java] ---- -source=core/api/src/test/java/org/apache/zest/api/value/DocumentationSupport.java +source=core/api/src/test/java/org/apache/polygene/api/value/DocumentationSupport.java tag=service ---- @@ -125,7 +125,7 @@ Many applications need to stream data. The ValueSerialization API support such u [snippet,java] ---- -source=core/api/src/test/java/org/apache/zest/api/value/DocumentationSupport.java +source=core/api/src/test/java/org/apache/polygene/api/value/DocumentationSupport.java tag=stream ---- http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/api/src/main/java/org/apache/polygene/api/service/qualifier/package.html ---------------------------------------------------------------------- diff --git a/core/api/src/main/java/org/apache/polygene/api/service/qualifier/package.html b/core/api/src/main/java/org/apache/polygene/api/service/qualifier/package.html index d37dc22..de38a6d 100644 --- a/core/api/src/main/java/org/apache/polygene/api/service/qualifier/package.html +++ b/core/api/src/main/java/org/apache/polygene/api/service/qualifier/package.html @@ -55,7 +55,7 @@ <li>{@link org.apache.polygene.api.service.qualifier.Available}</li> <li>{@link org.apache.polygene.api.service.qualifier.HasMetaInfo}</li> <li>{@link org.apache.polygene.api.service.qualifier.IdentifiedBy}</li> - <li>{@link org.apache.polygene.api.service.qualifier.Tagged}</li> + <li>{@link org.apache.polygeneF.api.service.qualifier.Tagged}</li> </ul> <p>See tests and API for more examples, and how to implement your own qualifiers.</p> </body> http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/api/src/test/java/org/apache/polygene/api/docsupport/ApplicationDocs.java ---------------------------------------------------------------------- diff --git a/core/api/src/test/java/org/apache/polygene/api/docsupport/ApplicationDocs.java b/core/api/src/test/java/org/apache/polygene/api/docsupport/ApplicationDocs.java index 58e4973..c6a6e78 100644 --- a/core/api/src/test/java/org/apache/polygene/api/docsupport/ApplicationDocs.java +++ b/core/api/src/test/java/org/apache/polygene/api/docsupport/ApplicationDocs.java @@ -38,7 +38,7 @@ public class ApplicationDocs { { // START SNIPPET: application1 - SingletonAssembler zest = new SingletonAssembler() + SingletonAssembler polygene = new SingletonAssembler() { public void assemble( ModuleAssembly assembly ) throws AssemblyException @@ -81,8 +81,8 @@ public class ApplicationDocs } } }; - Energy4Java zest = new Energy4Java(); - Application app = zest.newApplication( new ApplicationAssembler() + Energy4Java polygene = new Energy4Java(); + Application app = polygene.newApplication( new ApplicationAssembler() { @Override @@ -112,13 +112,13 @@ public class ApplicationDocs } // START SNIPPET: application3 - private static Energy4Java zest; + private static Energy4Java polygene; public static void main( String[] args ) throws Exception { - zest = new Energy4Java(); - ApplicationDescriptor model = zest.newApplicationModel( new ApplicationAssembler() + polygene = new Energy4Java(); + ApplicationDescriptor model = polygene.newApplicationModel( new ApplicationAssembler() { @Override public ApplicationAssembly assemble( ApplicationAssemblyFactory applicationFactory ) @@ -127,7 +127,7 @@ public class ApplicationDocs return createAssembly( applicationFactory ); } } ); - Application application = model.newInstance( zest.spi() ); + Application application = model.newInstance( polygene.spi() ); } private static ApplicationAssembly createAssembly( ApplicationAssemblyFactory factory ) http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/bootstrap/build.gradle ---------------------------------------------------------------------- diff --git a/core/bootstrap/build.gradle b/core/bootstrap/build.gradle index e565e10..ae37429 100644 --- a/core/bootstrap/build.gradle +++ b/core/bootstrap/build.gradle @@ -21,7 +21,7 @@ jar { manifest { name = "Apache Polygene⢠Core Bootstrap" } } dependencies { - compile zest.core.spi + compile polygene.core.spi - testRuntime zest.core.runtime + testRuntime polygene.core.runtime } http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/bootstrap/dev-status.xml ---------------------------------------------------------------------- diff --git a/core/bootstrap/dev-status.xml b/core/bootstrap/dev-status.xml index 994ff62..ba367e6 100644 --- a/core/bootstrap/dev-status.xml +++ b/core/bootstrap/dev-status.xml @@ -18,10 +18,10 @@ ~ ~ --> -<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"; +<module xmlns="http://polygene.apache.org/schemas/2008/dev-status/1"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1 - http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd";> + xsi:schemaLocation="http://polygene.apache.org/schemas/2008/dev-status/1 + http://polygene.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/54b69c48/core/bootstrap/src/docs/bootstrap.txt ---------------------------------------------------------------------- diff --git a/core/bootstrap/src/docs/bootstrap.txt b/core/bootstrap/src/docs/bootstrap.txt index ee18228..e20b995 100644 --- a/core/bootstrap/src/docs/bootstrap.txt +++ b/core/bootstrap/src/docs/bootstrap.txt @@ -55,7 +55,7 @@ include::../../build/docs/buildinfo/artifact.txt[] [snippet,java] -------------- -source=core/bootstrap/src/test/java/org/apache/zest/bootstrap/DocumentationSupport.java +source=core/bootstrap/src/test/java/org/apache/polygene/bootstrap/DocumentationSupport.java tag=objects -------------- @@ -64,7 +64,7 @@ tag=objects [snippet,java] -------------- -source=core/bootstrap/src/test/java/org/apache/zest/bootstrap/DocumentationSupport.java +source=core/bootstrap/src/test/java/org/apache/polygene/bootstrap/DocumentationSupport.java tag=transients -------------- @@ -73,7 +73,7 @@ tag=transients [snippet,java] -------------- -source=core/bootstrap/src/test/java/org/apache/zest/bootstrap/DocumentationSupport.java +source=core/bootstrap/src/test/java/org/apache/polygene/bootstrap/DocumentationSupport.java tag=values -------------- @@ -82,7 +82,7 @@ tag=values [snippet,java] -------------- -source=core/bootstrap/src/test/java/org/apache/zest/bootstrap/DocumentationSupport.java +source=core/bootstrap/src/test/java/org/apache/polygene/bootstrap/DocumentationSupport.java tag=entities -------------- @@ -91,7 +91,7 @@ tag=entities [snippet,java] -------------- -source=core/bootstrap/src/test/java/org/apache/zest/bootstrap/DocumentationSupport.java +source=core/bootstrap/src/test/java/org/apache/polygene/bootstrap/DocumentationSupport.java tag=services -------------- @@ -99,7 +99,7 @@ tag=services [snippet,java] -------------- -source=core/bootstrap/src/test/java/org/apache/zest/bootstrap/DocumentationSupport.java +source=core/bootstrap/src/test/java/org/apache/polygene/bootstrap/DocumentationSupport.java tag=tagged-services -------------- @@ -107,7 +107,7 @@ tag=tagged-services [snippet,java] -------------- -source=core/bootstrap/src/test/java/org/apache/zest/bootstrap/DocumentationSupport.java +source=core/bootstrap/src/test/java/org/apache/polygene/bootstrap/DocumentationSupport.java tag=imported-services -------------- @@ -115,7 +115,7 @@ tag=imported-services [snippet,java] -------------- -source=core/bootstrap/src/test/java/org/apache/zest/bootstrap/DocumentationSupport.java +source=core/bootstrap/src/test/java/org/apache/polygene/bootstrap/DocumentationSupport.java tag=properties-defaults -------------- @@ -138,7 +138,7 @@ such as; [snippet,java] -------------- -source=libraries/rest-server/src/test/java/org/apache/zest/library/rest/server/DocumentationSupport.java +source=libraries/rest-server/src/test/java/org/apache/polygene/library/rest/server/DocumentationSupport.java tag=UsingAssembler -------------- @@ -162,7 +162,7 @@ used like; [snippet,java] -------------- -source=extensions/entitystore-jdbm/src/test/java/org/apache/zest/entitystore/jdbm/DocumentationSupport.java +source=extensions/entitystore-jdbm/src/test/java/org/apache/polygene/entitystore/jdbm/DocumentationSupport.java tag=UsingAssembler -------------- @@ -216,7 +216,7 @@ Let's take a closer look at how it is put together. [snippet,java] -------------- -source=core/bootstrap/src/test/java/org/apache/zest/bootstrap/DocumentationSupport.java +source=core/bootstrap/src/test/java/org/apache/polygene/bootstrap/DocumentationSupport.java tag=singleton -------------- @@ -270,7 +270,7 @@ Let's look at an example; [snippet,java] -------------- -source=core/bootstrap/src/test/java/org/apache/zest/bootstrap/DocumentationSupport.java +source=core/bootstrap/src/test/java/org/apache/polygene/bootstrap/DocumentationSupport.java tag=pancake -------------- @@ -285,7 +285,7 @@ ApplicationAssemblyFactory, which is used to create an ApplicationAssembly descr [snippet,java] -------------- -source=core/bootstrap/src/test/java/org/apache/zest/bootstrap/DocumentationSupport.java +source=core/bootstrap/src/test/java/org/apache/polygene/bootstrap/DocumentationSupport.java tag=full -------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/SingletonAssembler.java ---------------------------------------------------------------------- diff --git a/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/SingletonAssembler.java b/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/SingletonAssembler.java index 18717dd..428d548 100644 --- a/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/SingletonAssembler.java +++ b/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/SingletonAssembler.java @@ -41,7 +41,7 @@ import org.apache.polygene.api.value.ValueBuilderFactory; public abstract class SingletonAssembler implements Assembler { - private Energy4Java zest; + private Energy4Java polygene; private Application applicationInstance; private final Module moduleInstance; @@ -59,8 +59,8 @@ public abstract class SingletonAssembler throws AssemblyException, ActivationException { // START SNIPPET: actual - zest = new Energy4Java(); - applicationInstance = zest.newApplication( + polygene = new Energy4Java(); + applicationInstance = polygene.newApplication( applicationFactory -> applicationFactory.newApplicationAssembly( SingletonAssembler.this ) ); @@ -84,7 +84,7 @@ public abstract class SingletonAssembler public final PolygeneAPI runtime() { - return zest.spi(); + return polygene.spi(); } public final Application application() http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/builder/ApplicationBuilder.java ---------------------------------------------------------------------- diff --git a/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/builder/ApplicationBuilder.java b/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/builder/ApplicationBuilder.java index 313be1e..3a064e5 100644 --- a/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/builder/ApplicationBuilder.java +++ b/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/builder/ApplicationBuilder.java @@ -103,8 +103,8 @@ public class ApplicationBuilder public Application newApplication() throws AssemblyException, ActivationException { - Energy4Java zest = new Energy4Java(); - ApplicationDescriptor model = zest.newApplicationModel( new ApplicationAssembler() + Energy4Java polygene = new Energy4Java(); + ApplicationDescriptor model = polygene.newApplicationModel( new ApplicationAssembler() { @Override public ApplicationAssembly assemble( ApplicationAssemblyFactory factory ) @@ -137,7 +137,7 @@ public class ApplicationBuilder return assembly; } } ); - Application application = model.newInstance( zest.api() ); + Application application = model.newInstance( polygene.api() ); for( ActivationEventListener activationListener : activationListeners ) { application.registerActivationEventListener( activationListener ); http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/layered/LayeredApplicationAssembler.java ---------------------------------------------------------------------- diff --git a/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/layered/LayeredApplicationAssembler.java b/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/layered/LayeredApplicationAssembler.java index 58e5a9e..d5edba0 100644 --- a/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/layered/LayeredApplicationAssembler.java +++ b/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/layered/LayeredApplicationAssembler.java @@ -39,7 +39,7 @@ import org.apache.polygene.bootstrap.LayerAssembly; public abstract class LayeredApplicationAssembler implements ApplicationAssembler { - protected final Energy4Java zest; + protected final Energy4Java polygene; protected final String name; protected final String version; @@ -56,15 +56,15 @@ public abstract class LayeredApplicationAssembler this.name = name; this.version = version; this.mode = mode; - zest = new Energy4Java(); + polygene = new Energy4Java(); } public void initialize() throws AssemblyException { - model = zest.newApplicationModel( this ); + model = polygene.newApplicationModel( this ); onModelCreated( model ); - instantiateApplication( zest, model ); + instantiateApplication( polygene, model ); } public ApplicationAssembly assembly() @@ -83,12 +83,12 @@ public abstract class LayeredApplicationAssembler * application = model.newInstance( polygene.spi() ); * </code></pre> * - * @param zest The Polygene runtime engine. + * @param polygene The Polygene runtime engine. * @param model The application model descriptor. */ - protected void instantiateApplication( Energy4Java zest, ApplicationDescriptor model ) + protected void instantiateApplication( Energy4Java polygene, ApplicationDescriptor model ) { - application = model.newInstance( zest.spi() ); + application = model.newInstance( polygene.spi() ); } /** http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/bootstrap/src/test/java/org/apache/polygene/bootstrap/DocumentationSupport.java ---------------------------------------------------------------------- diff --git a/core/bootstrap/src/test/java/org/apache/polygene/bootstrap/DocumentationSupport.java b/core/bootstrap/src/test/java/org/apache/polygene/bootstrap/DocumentationSupport.java index 08b61d1..a89629a 100644 --- a/core/bootstrap/src/test/java/org/apache/polygene/bootstrap/DocumentationSupport.java +++ b/core/bootstrap/src/test/java/org/apache/polygene/bootstrap/DocumentationSupport.java @@ -236,13 +236,13 @@ public class DocumentationSupport public static class PricingAssembler implements Assembler { public void assemble( ModuleAssembly module ) throws AssemblyException { } } public static class ProductAssembler implements Assembler { public void assemble( ModuleAssembly module ) throws AssemblyException { } } - private static Energy4Java zest; + private static Energy4Java polygene; // START SNIPPET: pancake public static void main( String[] args ) throws Exception { - zest = new Energy4Java(); + polygene = new Energy4Java(); Assembler[][][] assemblers = new Assembler[][][]{ { // View Layer { // Login Module @@ -282,14 +282,14 @@ public class DocumentationSupport } }; ApplicationDescriptor model = newApplication( assemblers ); - Application runtime = model.newInstance( zest.spi() ); + Application runtime = model.newInstance( polygene.spi() ); runtime.activate(); } private static ApplicationDescriptor newApplication( final Assembler[][][] assemblers ) throws AssemblyException { - return zest.newApplicationModel( new ApplicationAssembler() + return polygene.newApplicationModel( new ApplicationAssembler() { @Override @@ -321,7 +321,7 @@ public class DocumentationSupport public static class NeoAssembler implements Assembler{ NeoAssembler( String path ) {} public void assemble( ModuleAssembly module ) throws AssemblyException { } } // START SNIPPET: full - private static Energy4Java zest; + private static Energy4Java polygene; private static Application application; @@ -329,8 +329,8 @@ public class DocumentationSupport throws Exception { // Create a Polygene Runtime - zest = new Energy4Java(); - application = zest.newApplication( new ApplicationAssembler() + polygene = new Energy4Java(); + application = polygene.newApplication( new ApplicationAssembler() { @Override http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/runtime/build.gradle ---------------------------------------------------------------------- diff --git a/core/runtime/build.gradle b/core/runtime/build.gradle index 39d4cca..5324662 100644 --- a/core/runtime/build.gradle +++ b/core/runtime/build.gradle @@ -23,11 +23,11 @@ jar { manifest { name = "Apache Polygene⢠Core Runtime" } } dependencies { compileOnly libraries.osgi_core - compile zest.core.bootstrap + compile polygene.core.bootstrap compile libraries.asm compile libraries.asm_util compile libraries.asm_commons - testCompile zest.core.testsupport - testCompile zest.library( 'constraints' ) + testCompile polygene.core.testsupport + testCompile polygene.library( 'constraints' ) } http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/runtime/dev-status.xml ---------------------------------------------------------------------- diff --git a/core/runtime/dev-status.xml b/core/runtime/dev-status.xml index 994ff62..ba367e6 100644 --- a/core/runtime/dev-status.xml +++ b/core/runtime/dev-status.xml @@ -18,10 +18,10 @@ ~ ~ --> -<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"; +<module xmlns="http://polygene.apache.org/schemas/2008/dev-status/1"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1 - http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd";> + xsi:schemaLocation="http://polygene.apache.org/schemas/2008/dev-status/1 + http://polygene.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/54b69c48/core/runtime/src/docs/runtime.txt ---------------------------------------------------------------------- diff --git a/core/runtime/src/docs/runtime.txt b/core/runtime/src/docs/runtime.txt index 6caaa4a..57429fe 100644 --- a/core/runtime/src/docs/runtime.txt +++ b/core/runtime/src/docs/runtime.txt @@ -25,7 +25,7 @@ source=core/runtime/dev-status.xml -------------- First of all, your code should never, ever, have a dependency on Core Runtime. If you think you need this, you should -probably contact [email protected] mailing list and see if your usecase can either be solved in a existing way or +probably contact [email protected] mailing list and see if your usecase can either be solved in a existing way or perhaps that a new Core SPI Extension is needed. include::../../build/docs/buildinfo/artifact.txt[] @@ -42,12 +42,12 @@ To do this, add the +AssemblyHelper+ implementation instance as +metaInfo+ to th We think this is so rare, that the +AssemblyHelper+ class will remain in the +core/runtime+ module and has not been promoted to the +core/bootstrap+ module. If you plan to use this feature, please contact the Polygene development -team at [email protected]+ to ensure we can make this a better supported, backed by real usecases. +team at [email protected]+ to ensure we can make this a better supported, backed by real usecases. Fictitious example of using a hypothetical Dalvik capable classloader; [source,java] -------------- -source=core/runtime/src/test/java/org/apache/zest/runtime/bootstrap/docs/DocumentationSupport.java +source=core/runtime/src/test/java/org/apache/polygene/runtime/bootstrap/docs/DocumentationSupport.java tag=customAssemblyHelper -------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/runtime/src/main/java/org/apache/polygene/runtime/composite/FragmentClassLoader.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/composite/FragmentClassLoader.java b/core/runtime/src/main/java/org/apache/polygene/runtime/composite/FragmentClassLoader.java index 774bea7..440e023 100644 --- a/core/runtime/src/main/java/org/apache/polygene/runtime/composite/FragmentClassLoader.java +++ b/core/runtime/src/main/java/org/apache/polygene/runtime/composite/FragmentClassLoader.java @@ -313,7 +313,7 @@ public class FragmentClassLoader } // Call method - mv.visitMethodInsn( INVOKEINTERFACE, "org/apache/zest/api/composite/CompositeInvoker", + mv.visitMethodInsn( INVOKEINTERFACE, "org/apache/polygene/api/composite/CompositeInvoker", "invokeComposite", "(Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object;", true ); http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/runtime/src/main/java/org/apache/polygene/runtime/composite/TransientClassLoader.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/composite/TransientClassLoader.java b/core/runtime/src/main/java/org/apache/polygene/runtime/composite/TransientClassLoader.java index c909e33..9f63677 100644 --- a/core/runtime/src/main/java/org/apache/polygene/runtime/composite/TransientClassLoader.java +++ b/core/runtime/src/main/java/org/apache/polygene/runtime/composite/TransientClassLoader.java @@ -161,7 +161,7 @@ import static org.objectweb.asm.Type.getInternalName; ClassWriter cw = new ClassWriter( ClassWriter.COMPUTE_MAXS ); // Class definition start - cw.visit( JDK_VERSION, ACC_PUBLIC + ACC_SUPER, classSlash, null, baseClassSlash, new String[] { "org/apache/zest/api/composite/Composite" } ); + cw.visit( JDK_VERSION, ACC_PUBLIC + ACC_SUPER, classSlash, null, baseClassSlash, new String[] { "org/apache/polygene/api/composite/Composite" } ); // Composite reference { @@ -283,7 +283,7 @@ import static org.objectweb.asm.Type.getInternalName; } // Call method - mv.visitMethodInsn( INVOKEINTERFACE, "org/apache/zest/api/composite/CompositeInvoker", + mv.visitMethodInsn( INVOKEINTERFACE, "org/apache/polygene/api/composite/CompositeInvoker", "invokeComposite", "(Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object;", true ); http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/runtime/src/test/java/org/apache/polygene/regression/qi78/IssueTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/regression/qi78/IssueTest.java b/core/runtime/src/test/java/org/apache/polygene/regression/qi78/IssueTest.java index db2a409..7e96d69 100644 --- a/core/runtime/src/test/java/org/apache/polygene/regression/qi78/IssueTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/regression/qi78/IssueTest.java @@ -38,9 +38,9 @@ public class IssueTest public void testLayersCanBeCreatedInOrderDifferentFromTheirDependency() throws AssemblyException { - Energy4Java zest = new Energy4Java(); + Energy4Java polygene = new Energy4Java(); - Application app = zest.newApplication( new ApplicationAssembler() + Application app = polygene.newApplication( new ApplicationAssembler() { public ApplicationAssembly assemble( ApplicationAssemblyFactory applicationFactory ) throws AssemblyException http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/runtime/src/test/java/org/apache/polygene/regression/qi94/IssueTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/regression/qi94/IssueTest.java b/core/runtime/src/test/java/org/apache/polygene/regression/qi94/IssueTest.java index 31df201..6a60093 100644 --- a/core/runtime/src/test/java/org/apache/polygene/regression/qi94/IssueTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/regression/qi94/IssueTest.java @@ -50,7 +50,7 @@ public class IssueTest try { EntityBuilder<Item> builder = uow.newEntityBuilder( Item.class ); - assertEquals( ItemType.class, zest.api() + assertEquals( ItemType.class, polygene.api() .entityDescriptorFor( builder.instance() ) .state() .getAssociationByName( "typeOfItem" ) http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/runtime/src/test/java/org/apache/polygene/runtime/association/AssociationEqualityTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/association/AssociationEqualityTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/association/AssociationEqualityTest.java index 2c1594e..8f1e294 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/association/AssociationEqualityTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/association/AssociationEqualityTest.java @@ -93,14 +93,14 @@ public class AssociationEqualityTest AnEntity anEntity = uow.newEntity( AnEntity.class ); SomeWithAssociations some = buildSomeWithAssociation( anEntity ); - AssociationDescriptor someAssocDesc = zest.api().associationDescriptorFor( some.anEntity() ); - AssociationDescriptor someManyAssocDesc = zest.api().associationDescriptorFor( some.manyEntities() ); - AssociationDescriptor someNamedAssocDesc = zest.api().associationDescriptorFor( some.namedEntities() ); + AssociationDescriptor someAssocDesc = polygene.api().associationDescriptorFor( some.anEntity() ); + AssociationDescriptor someManyAssocDesc = polygene.api().associationDescriptorFor( some.manyEntities() ); + AssociationDescriptor someNamedAssocDesc = polygene.api().associationDescriptorFor( some.namedEntities() ); SomeWithAssociations some2 = buildSomeWithAssociation( anEntity ); - AssociationDescriptor some2AssocDesc = zest.api().associationDescriptorFor( some2.anEntity() ); - AssociationDescriptor some2ManyAssocDesc = zest.api().associationDescriptorFor( some2.manyEntities() ); - AssociationDescriptor some2NamedAssocDesc = zest.api().associationDescriptorFor( some2.namedEntities() ); + AssociationDescriptor some2AssocDesc = polygene.api().associationDescriptorFor( some2.anEntity() ); + AssociationDescriptor some2ManyAssocDesc = polygene.api().associationDescriptorFor( some2.manyEntities() ); + AssociationDescriptor some2NamedAssocDesc = polygene.api().associationDescriptorFor( some2.namedEntities() ); assertThat( "AssociationDescriptor equal", someAssocDesc, @@ -134,14 +134,14 @@ public class AssociationEqualityTest try { SomeWithAssociations some = buildSomeWithAssociation( uow.newEntity( AnEntity.class ) ); - AssociationDescriptor someAssocDesc = zest.api().associationDescriptorFor( some.anEntity() ); - AssociationDescriptor someManyAssocDesc = zest.api().associationDescriptorFor( some.manyEntities() ); - AssociationDescriptor someNamedAssocDesc = zest.api().associationDescriptorFor( some.namedEntities() ); + AssociationDescriptor someAssocDesc = polygene.api().associationDescriptorFor( some.anEntity() ); + AssociationDescriptor someManyAssocDesc = polygene.api().associationDescriptorFor( some.manyEntities() ); + AssociationDescriptor someNamedAssocDesc = polygene.api().associationDescriptorFor( some.namedEntities() ); SomeWithAssociations some2 = buildSomeWithAssociation( uow.newEntity( AnEntity.class ) ); - AssociationDescriptor some2AssocDesc = zest.api().associationDescriptorFor( some2.anEntity() ); - AssociationDescriptor some2ManyAssocDesc = zest.api().associationDescriptorFor( some2.manyEntities() ); - AssociationDescriptor some2NamedAssocDesc = zest.api().associationDescriptorFor( some2.namedEntities() ); + AssociationDescriptor some2AssocDesc = polygene.api().associationDescriptorFor( some2.anEntity() ); + AssociationDescriptor some2ManyAssocDesc = polygene.api().associationDescriptorFor( some2.manyEntities() ); + AssociationDescriptor some2NamedAssocDesc = polygene.api().associationDescriptorFor( some2.namedEntities() ); assertThat( "AssociationDescriptor equal", someAssocDesc, @@ -177,14 +177,14 @@ public class AssociationEqualityTest AnEntity anEntity = uow.newEntity( AnEntity.class ); SomeWithAssociations some = buildSomeWithAssociation( anEntity ); - AssociationDescriptor someAssocDesc = zest.api().associationDescriptorFor( some.anEntity() ); - AssociationDescriptor someManyAssocDesc = zest.api().associationDescriptorFor( some.manyEntities() ); - AssociationDescriptor someNamedAssocDesc = zest.api().associationDescriptorFor( some.namedEntities() ); + AssociationDescriptor someAssocDesc = polygene.api().associationDescriptorFor( some.anEntity() ); + AssociationDescriptor someManyAssocDesc = polygene.api().associationDescriptorFor( some.manyEntities() ); + AssociationDescriptor someNamedAssocDesc = polygene.api().associationDescriptorFor( some.namedEntities() ); OtherWithAssociations other = buildOtherWithAssociation( anEntity ); - AssociationDescriptor otherAssocDesc = zest.api().associationDescriptorFor( other.anEntity() ); - AssociationDescriptor otherManyAssocDesc = zest.api().associationDescriptorFor( other.manyEntities() ); - AssociationDescriptor otherNamedAssocDesc = zest.api().associationDescriptorFor( other.namedEntities() ); + AssociationDescriptor otherAssocDesc = polygene.api().associationDescriptorFor( other.anEntity() ); + AssociationDescriptor otherManyAssocDesc = polygene.api().associationDescriptorFor( other.manyEntities() ); + AssociationDescriptor otherNamedAssocDesc = polygene.api().associationDescriptorFor( other.namedEntities() ); assertThat( "AssociationDescriptor not equal", someAssocDesc, http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/runtime/src/test/java/org/apache/polygene/runtime/bootstrap/docs/DocumentationSupport.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/bootstrap/docs/DocumentationSupport.java b/core/runtime/src/test/java/org/apache/polygene/runtime/bootstrap/docs/DocumentationSupport.java index a5020b5..3c80414 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/bootstrap/docs/DocumentationSupport.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/bootstrap/docs/DocumentationSupport.java @@ -32,7 +32,7 @@ import org.apache.polygene.runtime.composite.FragmentClassLoader; public class DocumentationSupport { // START SNIPPET: customAssemblyHelper - private static Energy4Java zest; + private static Energy4Java polygene; private static Application application; @@ -40,8 +40,8 @@ public class DocumentationSupport throws Exception { // Create a Polygene Runtime - zest = new Energy4Java(); - application = zest.newApplication( new ApplicationAssembler() + polygene = new Energy4Java(); + application = polygene.newApplication( new ApplicationAssembler() { @Override http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/runtime/src/test/java/org/apache/polygene/runtime/constraints/ConstraintsTest.properties ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/constraints/ConstraintsTest.properties b/core/runtime/src/test/java/org/apache/polygene/runtime/constraints/ConstraintsTest.properties index d48d750..5f3fd7a 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/constraints/ConstraintsTest.properties +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/constraints/ConstraintsTest.properties @@ -18,9 +18,9 @@ # # -zest.constraint.ConstraintsTest$MyOneComposite=Message1 +polygene.constraint.ConstraintsTest$MyOneComposite=Message1 -zest.constraint.NotNull=Message2 +polygene.constraint.NotNull=Message2 -zest.constraint.ConstraintsTest$MyOneComposite.doSomething=Message3 +polygene.constraint.ConstraintsTest$MyOneComposite.doSomething=Message3 http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/runtime/src/test/java/org/apache/polygene/runtime/entity/EntityVisibilityTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/entity/EntityVisibilityTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/entity/EntityVisibilityTest.java index fb00a0d..642bb14 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/entity/EntityVisibilityTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/entity/EntityVisibilityTest.java @@ -50,7 +50,7 @@ public class EntityVisibilityTest public static final Identity TEST_IDENTITY = new StringIdentity( "123" ); - private Energy4Java zest; + private Energy4Java polygene; private Module module; private Application app; private UnitOfWorkFactory uowf; @@ -59,7 +59,7 @@ public class EntityVisibilityTest public void setup() throws Exception { - zest = new Energy4Java(); + polygene = new Energy4Java(); Assembler[][][] assemblers = new Assembler[][][] { @@ -82,7 +82,7 @@ public class EntityVisibilityTest } } }; - app = zest.newApplication( new ApplicationAssemblerAdapter( assemblers ) + app = polygene.newApplication( new ApplicationAssemblerAdapter( assemblers ) { } ); app.activate(); http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/runtime/src/test/java/org/apache/polygene/runtime/objects/ObjectVisibilityTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/objects/ObjectVisibilityTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/objects/ObjectVisibilityTest.java index d410b6d..45691e8 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/objects/ObjectVisibilityTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/objects/ObjectVisibilityTest.java @@ -50,7 +50,7 @@ public class ObjectVisibilityTest public static final Identity TEST_IDENTITY = new StringIdentity( "123" ); - private Energy4Java zest; + private Energy4Java polygene; private Module module; private UnitOfWorkFactory uowf; private Application app; @@ -59,7 +59,7 @@ public class ObjectVisibilityTest public void setup() throws Exception { - zest = new Energy4Java(); + polygene = new Energy4Java(); Assembler[][][] assemblers = new Assembler[][][] { @@ -82,7 +82,7 @@ public class ObjectVisibilityTest } } }; - app = zest.newApplication( new ApplicationAssemblerAdapter( assemblers ) + app = polygene.newApplication( new ApplicationAssemblerAdapter( assemblers ) { } ); app.activate();
