polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject [53/81] [abbrv] zest-java git commit: ZEST-195 ; Replace all "zest" with "polygene"
Date Sat, 17 Dec 2016 10:28:29 GMT
http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/samples/forum/build.gradle
----------------------------------------------------------------------
diff --git a/samples/forum/build.gradle b/samples/forum/build.gradle
index d217f9d..2cde092 100644
--- a/samples/forum/build.gradle
+++ b/samples/forum/build.gradle
@@ -25,18 +25,18 @@ description = "Sample of how to build a web forum"
 jar { manifest { name = "Apache Polygene™ Sample - Forum" } }
 
 dependencies {
-  compile zest.core.bootstrap
-  compile zest.library( 'rest-server' )
-  compile zest.library( 'fileconfig' )
-  compile zest.extension( 'valueserialization-orgjson' )
-  compile zest.extension( 'entitystore-memory' )
-  compile zest.extension( 'entitystore-file' )
-  compile zest.extension( 'indexing-rdf' )
+  compile polygene.core.bootstrap
+  compile polygene.library( 'rest-server' )
+  compile polygene.library( 'fileconfig' )
+  compile polygene.extension( 'valueserialization-orgjson' )
+  compile polygene.extension( 'entitystore-memory' )
+  compile polygene.extension( 'entitystore-file' )
+  compile polygene.extension( 'indexing-rdf' )
   compile libraries.servlet_api
 
-  runtime zest.core.runtime
+  runtime polygene.core.runtime
 
-  testCompile zest.core.testsupport
+  testCompile polygene.core.testsupport
 
   testRuntime libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/samples/rental/build.gradle
----------------------------------------------------------------------
diff --git a/samples/rental/build.gradle b/samples/rental/build.gradle
index 67eb96b..88adfc4 100644
--- a/samples/rental/build.gradle
+++ b/samples/rental/build.gradle
@@ -28,15 +28,15 @@ description = "Sample of implementation of a Car Rental application."
 // To run in an embedded Jetty use:
 //      ../../gradlew appRun
 // And then go to:
-//      http://localhost:8080/org.apache.zest.sample.rental/rental/main
+//      http://localhost:8080/org.apache.polygene.sample.rental/rental/main
 
 jar { manifest { name = "Apache Polygene™ Sample - Car Rental" } }
 
 dependencies {
-  compile zest.core.bootstrap
-  compile zest.extension( 'valueserialization-orgjson' )
+  compile polygene.core.bootstrap
+  compile polygene.extension( 'valueserialization-orgjson' )
 
   providedCompile libraries.servlet_api
 
-  runtime zest.core.runtime
+  runtime polygene.core.runtime
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/samples/rental/src/main/java/org/apache/polygene/sample/rental/web/QuikitServlet.java
----------------------------------------------------------------------
diff --git a/samples/rental/src/main/java/org/apache/polygene/sample/rental/web/QuikitServlet.java b/samples/rental/src/main/java/org/apache/polygene/sample/rental/web/QuikitServlet.java
index 8db1714..4eec4af 100644
--- a/samples/rental/src/main/java/org/apache/polygene/sample/rental/web/QuikitServlet.java
+++ b/samples/rental/src/main/java/org/apache/polygene/sample/rental/web/QuikitServlet.java
@@ -86,8 +86,8 @@ public class QuikitServlet
 
             ApplicationAssembler assembler = createApplicationAssembler( config );
 
-            Energy4Java zest = new Energy4Java();
-            application = zest.newApplication( assembler );
+            Energy4Java polygene = new Energy4Java();
+            application = polygene.newApplication( assembler );
             application.activate();
             Module module = application.findModule( "WebLayer", "PagesModule" );
             finder = module;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/samples/rental/src/main/resources/org/apache/polygene/sample/rental/web/BookingPage.html
----------------------------------------------------------------------
diff --git a/samples/rental/src/main/resources/org/apache/polygene/sample/rental/web/BookingPage.html b/samples/rental/src/main/resources/org/apache/polygene/sample/rental/web/BookingPage.html
index 49863aa..3c1b5b8 100644
--- a/samples/rental/src/main/resources/org/apache/polygene/sample/rental/web/BookingPage.html
+++ b/samples/rental/src/main/resources/org/apache/polygene/sample/rental/web/BookingPage.html
@@ -18,7 +18,7 @@
   ~
   -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"
-      xmlns:qi="http://zest.apache.org/ns/2009/quikit"
+      xmlns:qi="http://polygene.apache.org/ns/2009/quikit"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.w3.org/1999/xhtml
                           http://www.w3.org/2002/08/xhtml/xhtml1-strict.xsd">

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/samples/rental/src/main/resources/org/apache/polygene/sample/rental/web/MainPage.html
----------------------------------------------------------------------
diff --git a/samples/rental/src/main/resources/org/apache/polygene/sample/rental/web/MainPage.html b/samples/rental/src/main/resources/org/apache/polygene/sample/rental/web/MainPage.html
index 95145e8..895a36c 100644
--- a/samples/rental/src/main/resources/org/apache/polygene/sample/rental/web/MainPage.html
+++ b/samples/rental/src/main/resources/org/apache/polygene/sample/rental/web/MainPage.html
@@ -19,7 +19,7 @@
   ~
   -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"
-      xmlns:qi="http://zest.apache.org/ns/2009/quikit"
+      xmlns:qi="http://polygene.apache.org/ns/2009/quikit"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.w3.org/1999/xhtml
                           http://www.w3.org/2002/08/xhtml/xhtml1-strict.xsd">

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/samples/rental/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/samples/rental/src/main/webapp/WEB-INF/web.xml b/samples/rental/src/main/webapp/WEB-INF/web.xml
index d02fb4f..02e4228 100644
--- a/samples/rental/src/main/webapp/WEB-INF/web.xml
+++ b/samples/rental/src/main/webapp/WEB-INF/web.xml
@@ -29,7 +29,7 @@
     <servlet-name>QuikitServlet</servlet-name>
     <servlet-class>org.apache.polygene.sample.rental.web.QuikitServlet</servlet-class>
     <init-param>
-      <param-name>zest-assembler</param-name>
+      <param-name>polygene-assembler</param-name>
       <param-value>org.apache.polygene.sample.rental.web.assembly.RentalApplicationAssembler</param-value>
     </init-param>
     <load-on-startup>1</load-on-startup>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/samples/sql-support/build.gradle
----------------------------------------------------------------------
diff --git a/samples/sql-support/build.gradle b/samples/sql-support/build.gradle
index 30c9106..6e3c607 100644
--- a/samples/sql-support/build.gradle
+++ b/samples/sql-support/build.gradle
@@ -26,13 +26,13 @@ jar { manifest { name = "Apache Polygene™ Sample - SQL Support" } }
 
 dependencies {
 
-  compile zest.core.bootstrap
-  compile zest.library( 'sql-dbcp' )
-  compile zest.extension( 'entitystore-preferences' )
-  compile zest.extension( 'entitystore-sql' )
-  compile zest.extension( 'indexing-sql' )
+  compile polygene.core.bootstrap
+  compile polygene.library( 'sql-dbcp' )
+  compile polygene.extension( 'entitystore-preferences' )
+  compile polygene.extension( 'entitystore-sql' )
+  compile polygene.extension( 'indexing-sql' )
 
-  runtime zest.core.runtime
+  runtime polygene.core.runtime
   runtime libraries.postgres
   runtime libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/samples/swing/build.gradle
----------------------------------------------------------------------
diff --git a/samples/swing/build.gradle b/samples/swing/build.gradle
index 7bc8288..2bf5c10 100644
--- a/samples/swing/build.gradle
+++ b/samples/swing/build.gradle
@@ -25,8 +25,8 @@ description = "Sample of how to use the Swing bindings."
 jar { manifest { name = "Apache Polygene™ Sample - Swing Bindings" } }
 
 dependencies {
-  compile zest.core.bootstrap
-  runtime zest.core.runtime
+  compile polygene.core.bootstrap
+  runtime polygene.core.runtime
 }
 
 task( runSwingSample, dependsOn: 'classes', type: JavaExec ) {

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/src/bin-dist/README.txt
----------------------------------------------------------------------
diff --git a/src/bin-dist/README.txt b/src/bin-dist/README.txt
index 474b7c5..b2d104d 100644
--- a/src/bin-dist/README.txt
+++ b/src/bin-dist/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
@@ -40,7 +40,7 @@ distribution's root, you'll find both Maven (go-offline.pom) and Gradle
 needed dependencies jars. Instructions are given into theses files.
 
 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
 
 
 Thank you for trying out Apache Polygene™ and Composite Oriented Programming.

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/src/javadoc/overview.html
----------------------------------------------------------------------
diff --git a/src/javadoc/overview.html b/src/javadoc/overview.html
index 70fe140..9530721 100644
--- a/src/javadoc/overview.html
+++ b/src/javadoc/overview.html
@@ -21,6 +21,6 @@
     <body>
         <h3>Welcome to the Apache Polygene™ (Java Edition) SDK Javadoc.</h3>
         <p>Apache Polygene™ is a framework for domain centric application development, including evolved concepts from AOP, DI and DDD.</p>
-        <p><a href="https://zest.apache.org" target="_blank">zest.apache.org</a></p>
+        <p><a href="https://polygene.apache.org" target="_blank">polygene.apache.org</a></p>
     </body>
 </html>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tests/performance/build.gradle
----------------------------------------------------------------------
diff --git a/tests/performance/build.gradle b/tests/performance/build.gradle
index 006420d..8124869 100644
--- a/tests/performance/build.gradle
+++ b/tests/performance/build.gradle
@@ -24,20 +24,20 @@ jar { manifest { name = "Apache Polygene™ Tests - Performance" } }
 apply plugin: PerformanceTestsPlugin
 
 dependencies {
-  compile zest.core.bootstrap
+  compile polygene.core.bootstrap
   compile libraries.junit
   compile libraries.slf4j_api
 
-  perfCompile zest.core.testsupport
-  perfCompile zest.library( 'sql-dbcp' )
-  perfCompile zest.extension( 'valueserialization-orgjson' )
-  perfCompile zest.extension( 'entitystore-memory' )
-  perfCompile zest.extension( 'entitystore-jdbm' )
-  perfCompile zest.extension( 'entitystore-sql' )
-  perfCompile zest.extension( 'cache-ehcache' )
-  perfCompile zest.extension( 'indexing-rdf' )
+  perfCompile polygene.core.testsupport
+  perfCompile polygene.library( 'sql-dbcp' )
+  perfCompile polygene.extension( 'valueserialization-orgjson' )
+  perfCompile polygene.extension( 'entitystore-memory' )
+  perfCompile polygene.extension( 'entitystore-jdbm' )
+  perfCompile polygene.extension( 'entitystore-sql' )
+  perfCompile polygene.extension( 'cache-ehcache' )
+  perfCompile polygene.extension( 'indexing-rdf' )
   perfCompile libraries.derby
 
-  perfRuntime zest.core.runtime
+  perfRuntime polygene.core.runtime
   perfRuntime libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tests/performance/src/main/java/org/apache/polygene/test/performance/entitystore/AbstractEntityStorePerformanceTest.java
----------------------------------------------------------------------
diff --git a/tests/performance/src/main/java/org/apache/polygene/test/performance/entitystore/AbstractEntityStorePerformanceTest.java b/tests/performance/src/main/java/org/apache/polygene/test/performance/entitystore/AbstractEntityStorePerformanceTest.java
index a6372ba..9dfb9c3 100644
--- a/tests/performance/src/main/java/org/apache/polygene/test/performance/entitystore/AbstractEntityStorePerformanceTest.java
+++ b/tests/performance/src/main/java/org/apache/polygene/test/performance/entitystore/AbstractEntityStorePerformanceTest.java
@@ -315,7 +315,7 @@ public abstract class AbstractEntityStorePerformanceTest
     private void createPolygeneRuntime( Assembler testSetup )
         throws Exception
     {
-        Energy4Java zest = new Energy4Java();
+        Energy4Java polygene = new Energy4Java();
         Assembler[][][] assemblers = new Assembler[][][]
             {
                 {
@@ -324,7 +324,7 @@ public abstract class AbstractEntityStorePerformanceTest
                     }
                 }
             };
-        application = zest.newApplication( new ApplicationAssemblerAdapter( assemblers )
+        application = polygene.newApplication( new ApplicationAssemblerAdapter( assemblers )
         {
         } );
         application.activate();

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tests/performance/src/perf/java/org/apache/zest/test/performance/entitystore/sql/PostgreSQLEntityStorePerformanceTest.java
----------------------------------------------------------------------
diff --git a/tests/performance/src/perf/java/org/apache/zest/test/performance/entitystore/sql/PostgreSQLEntityStorePerformanceTest.java b/tests/performance/src/perf/java/org/apache/zest/test/performance/entitystore/sql/PostgreSQLEntityStorePerformanceTest.java
index 9c1d1d8..e0c2bcc 100644
--- a/tests/performance/src/perf/java/org/apache/zest/test/performance/entitystore/sql/PostgreSQLEntityStorePerformanceTest.java
+++ b/tests/performance/src/perf/java/org/apache/zest/test/performance/entitystore/sql/PostgreSQLEntityStorePerformanceTest.java
@@ -103,7 +103,7 @@ public class PostgreSQLEntityStorePerformanceTest
         finally
         {
 
-            Energy4Java zest = new Energy4Java();
+            Energy4Java polygene = new Energy4Java();
             Assembler[][][] assemblers = new Assembler[][][]
             {
                 {
@@ -112,7 +112,7 @@ public class PostgreSQLEntityStorePerformanceTest
                     }
                 }
             };
-            Application application = zest.newApplication( new ApplicationAssemblerAdapter( assemblers )
+            Application application = polygene.newApplication( new ApplicationAssemblerAdapter( assemblers )
             {
             } );
             application.activate();

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tests/performance/src/perf/java/org/apache/zest/test/performance/indexing/rdf/QueryPerformanceTest.java
----------------------------------------------------------------------
diff --git a/tests/performance/src/perf/java/org/apache/zest/test/performance/indexing/rdf/QueryPerformanceTest.java b/tests/performance/src/perf/java/org/apache/zest/test/performance/indexing/rdf/QueryPerformanceTest.java
index c0f8305..a8e54ee 100644
--- a/tests/performance/src/perf/java/org/apache/zest/test/performance/indexing/rdf/QueryPerformanceTest.java
+++ b/tests/performance/src/perf/java/org/apache/zest/test/performance/indexing/rdf/QueryPerformanceTest.java
@@ -133,8 +133,8 @@ public class QueryPerformanceTest
     public void setup()
         throws Exception
     {
-        Energy4Java zest = new Energy4Java();
-        application = zest.newApplication( this );
+        Energy4Java polygene = new Energy4Java();
+        application = polygene.newApplication( this );
         module = application.findModule( LAYER_DOMAIN, MODULE_DOMAIN );
         application.activate();
         indexingDataDir = module.findService( RdfIndexingService.class ).get().dataDir();

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tests/regression/README-for-regression-reporting.txt
----------------------------------------------------------------------
diff --git a/tests/regression/README-for-regression-reporting.txt b/tests/regression/README-for-regression-reporting.txt
index 8d8bf13..a558433 100644
--- a/tests/regression/README-for-regression-reporting.txt
+++ b/tests/regression/README-for-regression-reporting.txt
@@ -10,7 +10,7 @@ Regression Test reporting follows the following steps;
 
 4. Commit and push this to the 'origin develop' branch.
 
-5. Ping the community on the dev@zest.apache.org mailing list.
+5. Ping the community on the dev@polygene.apache.org mailing list.
 
 
 Once the reported problem has been solved, the test will be moved to the sub-project's unit test area.

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tests/regression/build.gradle
----------------------------------------------------------------------
diff --git a/tests/regression/build.gradle b/tests/regression/build.gradle
index 4b4f4ca..895be0f 100644
--- a/tests/regression/build.gradle
+++ b/tests/regression/build.gradle
@@ -23,12 +23,12 @@ description = "Apache Polygene™ Regression Tests are added by community member
 jar { manifest { name = "Apache Polygene™ Tests - Regression" } }
 
 dependencies {
-  compile zest.core.testsupport
-  compile zest.library( 'logging' )
-  compile zest.extension( 'entitystore-jdbm' )
+  compile polygene.core.testsupport
+  compile polygene.library( 'logging' )
+  compile polygene.extension( 'entitystore-jdbm' )
   compile libraries.slf4j_api
   compile libraries.junit
 
-  runtime zest.core.runtime
+  runtime polygene.core.runtime
   runtime libraries.logback
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/envisage/build.gradle
----------------------------------------------------------------------
diff --git a/tools/envisage/build.gradle b/tools/envisage/build.gradle
index a74d63d..1ed01f5 100644
--- a/tools/envisage/build.gradle
+++ b/tools/envisage/build.gradle
@@ -25,16 +25,16 @@ description = "Visualizer of a Apache Polygene™ Application Structure."
 jar { manifest { name = "Apache Polygene™ Envisage" } }
 
 dependencies {
-  compile zest.core.bootstrap
-  compile zest.tool( 'model-detail' )
+  compile polygene.core.bootstrap
+  compile polygene.tool( 'model-detail' )
   compile libraries.jgoodies_looks
   compile libraries.pdfbox
   compile libraries.prefuse
 
-  runtime zest.core.runtime
+  runtime polygene.core.runtime
 
-  testCompile zest.core.testsupport
-  testCompile zest.extension( 'indexing-rdf' )
+  testCompile polygene.core.testsupport
+  testCompile polygene.extension( 'indexing-rdf' )
 
   testRuntime libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/envisage/dev-status.xml
----------------------------------------------------------------------
diff --git a/tools/envisage/dev-status.xml b/tools/envisage/dev-status.xml
index 40dade2..e124151 100644
--- a/tools/envisage/dev-status.xml
+++ b/tools/envisage/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>
     <!--none,early,beta,stable,mature-->
     <codebase>stable</codebase>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/envisage/src/docs/envisage.txt
----------------------------------------------------------------------
diff --git a/tools/envisage/src/docs/envisage.txt b/tools/envisage/src/docs/envisage.txt
index b6c01b6..4aecf37 100644
--- a/tools/envisage/src/docs/envisage.txt
+++ b/tools/envisage/src/docs/envisage.txt
@@ -29,7 +29,7 @@ Envisage can be easily used directly and prior your Application activation:
 
 [snippet,java]
 ----
-source=tools/envisage/src/test/java/org/apache/zest/envisage/school/EnvisageSchoolSample.java
+source=tools/envisage/src/test/java/org/apache/polygene/envisage/school/EnvisageSchoolSample.java
 tag=envisage
 ----
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/envisage/src/main/java/org/apache/polygene/envisage/detail/DependencyPane.java
----------------------------------------------------------------------
diff --git a/tools/envisage/src/main/java/org/apache/polygene/envisage/detail/DependencyPane.java b/tools/envisage/src/main/java/org/apache/polygene/envisage/detail/DependencyPane.java
index f39c34f..6dcafad 100644
--- a/tools/envisage/src/main/java/org/apache/polygene/envisage/detail/DependencyPane.java
+++ b/tools/envisage/src/main/java/org/apache/polygene/envisage/detail/DependencyPane.java
@@ -283,7 +283,7 @@ import org.apache.polygene.tools.model.descriptor.ObjectDetailDescriptor;
         splitPane.setRightComponent( detailPane );
         detailPane.setBorder( BorderFactory.createTitledBorder( BorderFactory.createEmptyBorder( 8, 8, 8, 8 ), null ) );
         final JLabel label1 = new JLabel();
-        this.$$$loadLabelText$$$( label1, ResourceBundle.getBundle( "org/apache/zest/envisage/detail/DependencyPane" ).getString( "CTL_ClassName.Text" ) );
+        this.$$$loadLabelText$$$( label1, ResourceBundle.getBundle( "org/apache/polygene/envisage/detail/DependencyPane" ).getString( "CTL_ClassName.Text" ) );
         GridBagConstraints gbc;
         gbc = new GridBagConstraints();
         gbc.gridx = 0;
@@ -303,14 +303,14 @@ import org.apache.polygene.tools.model.descriptor.ObjectDetailDescriptor;
         gbc.fill = GridBagConstraints.VERTICAL;
         detailPane.add( spacer2, gbc );
         final JLabel label2 = new JLabel();
-        this.$$$loadLabelText$$$( label2, ResourceBundle.getBundle( "org/apache/zest/envisage/detail/DependencyPane" ).getString( "CTL_Optional.Text" ) );
+        this.$$$loadLabelText$$$( label2, ResourceBundle.getBundle( "org/apache/polygene/envisage/detail/DependencyPane" ).getString( "CTL_Optional.Text" ) );
         gbc = new GridBagConstraints();
         gbc.gridx = 0;
         gbc.gridy = 2;
         gbc.anchor = GridBagConstraints.EAST;
         detailPane.add( label2, gbc );
         final JLabel label3 = new JLabel();
-        this.$$$loadLabelText$$$( label3, ResourceBundle.getBundle( "org/apache/zest/envisage/detail/DependencyPane" ).getString( "CTL_Annotation.Text" ) );
+        this.$$$loadLabelText$$$( label3, ResourceBundle.getBundle( "org/apache/polygene/envisage/detail/DependencyPane" ).getString( "CTL_Annotation.Text" ) );
         gbc = new GridBagConstraints();
         gbc.gridx = 0;
         gbc.gridy = 4;
@@ -335,7 +335,7 @@ import org.apache.polygene.tools.model.descriptor.ObjectDetailDescriptor;
         gbc.fill = GridBagConstraints.VERTICAL;
         detailPane.add( spacer5, gbc );
         final JLabel label4 = new JLabel();
-        this.$$$loadLabelText$$$( label4, ResourceBundle.getBundle( "org/apache/zest/envisage/detail/DependencyPane" ).getString( "CTL_InjectionType.Text" ) );
+        this.$$$loadLabelText$$$( label4, ResourceBundle.getBundle( "org/apache/polygene/envisage/detail/DependencyPane" ).getString( "CTL_InjectionType.Text" ) );
         gbc = new GridBagConstraints();
         gbc.gridx = 0;
         gbc.gridy = 10;
@@ -377,7 +377,7 @@ import org.apache.polygene.tools.model.descriptor.ObjectDetailDescriptor;
         gbc.fill = GridBagConstraints.VERTICAL;
         detailPane.add( spacer6, gbc );
         final JLabel label5 = new JLabel();
-        this.$$$loadLabelText$$$( label5, ResourceBundle.getBundle( "org/apache/zest/envisage/detail/DependencyPane" ).getString( "CTL_Injection.Text" ) );
+        this.$$$loadLabelText$$$( label5, ResourceBundle.getBundle( "org/apache/polygene/envisage/detail/DependencyPane" ).getString( "CTL_Injection.Text" ) );
         gbc = new GridBagConstraints();
         gbc.gridx = 0;
         gbc.gridy = 8;
@@ -399,7 +399,7 @@ import org.apache.polygene.tools.model.descriptor.ObjectDetailDescriptor;
         gbc.fill = GridBagConstraints.VERTICAL;
         detailPane.add( spacer7, gbc );
         final JLabel label6 = new JLabel();
-        this.$$$loadLabelText$$$( label6, ResourceBundle.getBundle( "org/apache/zest/envisage/detail/DependencyPane" ).getString( "CTL_InjectedServices.Text" ) );
+        this.$$$loadLabelText$$$( label6, ResourceBundle.getBundle( "org/apache/polygene/envisage/detail/DependencyPane" ).getString( "CTL_InjectedServices.Text" ) );
         gbc = new GridBagConstraints();
         gbc.gridx = 0;
         gbc.gridy = 12;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/envisage/src/main/java/org/apache/polygene/envisage/detail/ImportedByPane.java
----------------------------------------------------------------------
diff --git a/tools/envisage/src/main/java/org/apache/polygene/envisage/detail/ImportedByPane.java b/tools/envisage/src/main/java/org/apache/polygene/envisage/detail/ImportedByPane.java
index 07e72ba..ec6646f 100644
--- a/tools/envisage/src/main/java/org/apache/polygene/envisage/detail/ImportedByPane.java
+++ b/tools/envisage/src/main/java/org/apache/polygene/envisage/detail/ImportedByPane.java
@@ -91,7 +91,7 @@ import org.apache.polygene.tools.model.descriptor.ImportedServiceDetailDescripto
         contentPane = new JPanel();
         contentPane.setLayout( new GridBagLayout() );
         final JLabel label1 = new JLabel();
-        this.$$$loadLabelText$$$( label1, ResourceBundle.getBundle( "org/apache/zest/envisage/detail/ImportedByPane" ).getString( "CTL_Name.Text" ) );
+        this.$$$loadLabelText$$$( label1, ResourceBundle.getBundle( "org/apache/polygene/envisage/detail/ImportedByPane" ).getString( "CTL_Name.Text" ) );
         GridBagConstraints gbc;
         gbc = new GridBagConstraints();
         gbc.gridx = 0;
@@ -118,7 +118,7 @@ import org.apache.polygene.tools.model.descriptor.ImportedServiceDetailDescripto
         gbc.anchor = GridBagConstraints.WEST;
         contentPane.add( nameLabel, gbc );
         final JLabel label2 = new JLabel();
-        this.$$$loadLabelText$$$( label2, ResourceBundle.getBundle( "org/apache/zest/envisage/detail/ImportedByPane" ).getString( "CTL_Class.Text" ) );
+        this.$$$loadLabelText$$$( label2, ResourceBundle.getBundle( "org/apache/polygene/envisage/detail/ImportedByPane" ).getString( "CTL_Class.Text" ) );
         gbc = new GridBagConstraints();
         gbc.gridx = 0;
         gbc.gridy = 3;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/envisage/src/main/java/org/apache/polygene/envisage/detail/ServiceConfigurationPane.java
----------------------------------------------------------------------
diff --git a/tools/envisage/src/main/java/org/apache/polygene/envisage/detail/ServiceConfigurationPane.java b/tools/envisage/src/main/java/org/apache/polygene/envisage/detail/ServiceConfigurationPane.java
index c822625..69eb8fc 100644
--- a/tools/envisage/src/main/java/org/apache/polygene/envisage/detail/ServiceConfigurationPane.java
+++ b/tools/envisage/src/main/java/org/apache/polygene/envisage/detail/ServiceConfigurationPane.java
@@ -194,7 +194,7 @@ import org.apache.polygene.tools.model.util.DescriptorUtilities;
         contentPane = new JPanel();
         contentPane.setLayout( new GridBagLayout() );
         final JLabel label1 = new JLabel();
-        this.$$$loadLabelText$$$( label1, ResourceBundle.getBundle( "org/apache/zest/envisage/detail/ServiceConfigurationPane" ).getString( "CTL_Name.Text" ) );
+        this.$$$loadLabelText$$$( label1, ResourceBundle.getBundle( "org/apache/polygene/envisage/detail/ServiceConfigurationPane" ).getString( "CTL_Name.Text" ) );
         GridBagConstraints gbc;
         gbc = new GridBagConstraints();
         gbc.gridx = 0;
@@ -228,7 +228,7 @@ import org.apache.polygene.tools.model.util.DescriptorUtilities;
         gbc.fill = GridBagConstraints.VERTICAL;
         contentPane.add( spacer3, gbc );
         final JLabel label2 = new JLabel();
-        this.$$$loadLabelText$$$( label2, ResourceBundle.getBundle( "org/apache/zest/envisage/detail/ServiceConfigurationPane" ).getString( "CTL_Class.Text" ) );
+        this.$$$loadLabelText$$$( label2, ResourceBundle.getBundle( "org/apache/polygene/envisage/detail/ServiceConfigurationPane" ).getString( "CTL_Class.Text" ) );
         gbc = new GridBagConstraints();
         gbc.gridx = 0;
         gbc.gridy = 3;
@@ -249,7 +249,7 @@ import org.apache.polygene.tools.model.util.DescriptorUtilities;
         gbc.fill = GridBagConstraints.VERTICAL;
         contentPane.add( spacer4, gbc );
         linkButton = new JButton();
-        this.$$$loadButtonText$$$( linkButton, ResourceBundle.getBundle( "org/apache/zest/envisage/detail/ServiceConfigurationPane" ).getString( "CTL_Link.Text" ) );
+        this.$$$loadButtonText$$$( linkButton, ResourceBundle.getBundle( "org/apache/polygene/envisage/detail/ServiceConfigurationPane" ).getString( "CTL_Link.Text" ) );
         gbc = new GridBagConstraints();
         gbc.gridx = 2;
         gbc.gridy = 7;
@@ -262,7 +262,7 @@ import org.apache.polygene.tools.model.util.DescriptorUtilities;
         gbc.fill = GridBagConstraints.VERTICAL;
         contentPane.add( spacer5, gbc );
         final JLabel label3 = new JLabel();
-        this.$$$loadLabelText$$$( label3, ResourceBundle.getBundle( "org/apache/zest/envisage/detail/ServiceConfigurationPane" ).getString( "CTL_Type.Text" ) );
+        this.$$$loadLabelText$$$( label3, ResourceBundle.getBundle( "org/apache/polygene/envisage/detail/ServiceConfigurationPane" ).getString( "CTL_Type.Text" ) );
         gbc = new GridBagConstraints();
         gbc.gridx = 0;
         gbc.gridy = 5;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/envisage/src/main/resources/org/apache/polygene/envisage/detail/DependencyPane.properties
----------------------------------------------------------------------
diff --git a/tools/envisage/src/main/resources/org/apache/polygene/envisage/detail/DependencyPane.properties b/tools/envisage/src/main/resources/org/apache/polygene/envisage/detail/DependencyPane.properties
index de083b0..4c1ec6d 100644
--- a/tools/envisage/src/main/resources/org/apache/polygene/envisage/detail/DependencyPane.properties
+++ b/tools/envisage/src/main/resources/org/apache/polygene/envisage/detail/DependencyPane.properties
@@ -18,11 +18,11 @@
 #
 #
 
-CTL_ClassName.Text = [CTL_ClassName.Text / org/apache/zest/envisage/detail/DependencyPane]
-CTL_Optional.Text = [CTL_Optional.Text / org/apache/zest/envisage/detail/DependencyPane]
-CTL_Annotation.Text = [CTL_Annotation.Text / org/apache/zest/envisage/detail/DependencyPane]
-CTL_Injection.Text = [CTL_Injection.Text / org/apache/zest/envisage/detail/DependencyPane]
+CTL_ClassName.Text = [CTL_ClassName.Text / org/apache/polygene/envisage/detail/DependencyPane]
+CTL_Optional.Text = [CTL_Optional.Text / org/apache/polygene/envisage/detail/DependencyPane]
+CTL_Annotation.Text = [CTL_Annotation.Text / org/apache/polygene/envisage/detail/DependencyPane]
+CTL_Injection.Text = [CTL_Injection.Text / org/apache/polygene/envisage/detail/DependencyPane]
 CTL_InjectionClass.Text = Class:
-CTL_InjectionType.Text = [CTL_InjectionType.Text / org/apache/zest/envisage/detail/DependencyPane]
+CTL_InjectionType.Text = [CTL_InjectionType.Text / org/apache/polygene/envisage/detail/DependencyPane]
 CTL_InjectionTypeRaw.Text = Raw:
-CTL_InjectedServices.Text=[CTL_InjectedServices.Text / org/apache/zest/envisage/detail/DependencyPane]
\ No newline at end of file
+CTL_InjectedServices.Text=[CTL_InjectedServices.Text / org/apache/polygene/envisage/detail/DependencyPane]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/envisage/src/main/resources/org/apache/polygene/envisage/detail/ImportedByPane.properties
----------------------------------------------------------------------
diff --git a/tools/envisage/src/main/resources/org/apache/polygene/envisage/detail/ImportedByPane.properties b/tools/envisage/src/main/resources/org/apache/polygene/envisage/detail/ImportedByPane.properties
index 821791c..5f22b36 100644
--- a/tools/envisage/src/main/resources/org/apache/polygene/envisage/detail/ImportedByPane.properties
+++ b/tools/envisage/src/main/resources/org/apache/polygene/envisage/detail/ImportedByPane.properties
@@ -18,5 +18,5 @@
 #
 #
 
-CTL_Name.Text=[CTL_Name.Text / org/apache/zest/envisage/detail/ImportedByPane]
-CTL_Class.Text=[CTL_Class.Text / org/apache/zest/envisage/detail/ImportedByPane]
\ No newline at end of file
+CTL_Name.Text=[CTL_Name.Text / org/apache/polygene/envisage/detail/ImportedByPane]
+CTL_Class.Text=[CTL_Class.Text / org/apache/polygene/envisage/detail/ImportedByPane]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/envisage/src/main/resources/org/apache/polygene/envisage/detail/ServiceConfigurationPane.properties
----------------------------------------------------------------------
diff --git a/tools/envisage/src/main/resources/org/apache/polygene/envisage/detail/ServiceConfigurationPane.properties b/tools/envisage/src/main/resources/org/apache/polygene/envisage/detail/ServiceConfigurationPane.properties
index 75912bc..10aa0b4 100644
--- a/tools/envisage/src/main/resources/org/apache/polygene/envisage/detail/ServiceConfigurationPane.properties
+++ b/tools/envisage/src/main/resources/org/apache/polygene/envisage/detail/ServiceConfigurationPane.properties
@@ -18,7 +18,7 @@
 #
 #
 
-CTL_Name.Text=[CTL_Name.Text / org/apache/zest/envisage/detail/ServiceConfigurationPane]
-CTL_Class.Text=[CTL_Class.Text / org/apache/zest/envisage/detail/ServiceConfigurationPane]
-CTL_Type.Text=[CTL_Type.Text / org/apache/zest/envisage/detail/ServiceConfigurationPane]
-CTL_Link.Text=[CTL_Link.Text / org/apache/zest/envisage/detail/ServiceConfigurationPane]
\ No newline at end of file
+CTL_Name.Text=[CTL_Name.Text / org/apache/polygene/envisage/detail/ServiceConfigurationPane]
+CTL_Class.Text=[CTL_Class.Text / org/apache/polygene/envisage/detail/ServiceConfigurationPane]
+CTL_Type.Text=[CTL_Type.Text / org/apache/polygene/envisage/detail/ServiceConfigurationPane]
+CTL_Link.Text=[CTL_Link.Text / org/apache/polygene/envisage/detail/ServiceConfigurationPane]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/generator-zest/app/index.js
----------------------------------------------------------------------
diff --git a/tools/generator-zest/app/index.js b/tools/generator-zest/app/index.js
index a009882..73f44e6 100644
--- a/tools/generator-zest/app/index.js
+++ b/tools/generator-zest/app/index.js
@@ -20,7 +20,7 @@
 
 var generators = require( 'yeoman-generator' );
 
-var zest = {};
+var polygene = {};
 
 module.exports = generators.Base.extend(
     {
@@ -133,12 +133,12 @@ module.exports = generators.Base.extend(
                         this.log( 'Caching:', answers.caching );
                         this.log( 'Serialization:', answers.serialization );
                         this.log( 'Features:', answers.features );
-                        zest = answers;
-                        zest.javaPackageDir = zest.packagename.replace( '.', '/' );
-                        zest.singletonApp = false;
+                        polygene = answers;
+                        polygene.javaPackageDir = polygene.packagename.replace( '.', '/' );
+                        polygene.singletonApp = false;
                         if( hasFeature( 'sample (heroes) web application' ) )
                         {
-                            zest.features.push( 'rest api' );
+                            polygene.features.push( 'rest api' );
                         }
                     }.bind( this )
             );
@@ -146,16 +146,16 @@ module.exports = generators.Base.extend(
 
         writing: function ()
         {
-            copyPolygeneBootstrap( this, "config", "ConfigurationLayer", !zest.singeltonApp );
-            copyPolygeneBootstrap( this, "infrastructure", "InfrastructureLayer", !zest.singeltonApp );
-            copyPolygeneBootstrap( this, "domain", "DomainLayer", !zest.singeltonApp );
-            copyPolygeneBootstrap( this, "connectivity", "ConnectivityLayer", !zest.singeltonApp );
+            copyPolygeneBootstrap( this, "config", "ConfigurationLayer", !polygene.singeltonApp );
+            copyPolygeneBootstrap( this, "infrastructure", "InfrastructureLayer", !polygene.singeltonApp );
+            copyPolygeneBootstrap( this, "domain", "DomainLayer", !polygene.singeltonApp );
+            copyPolygeneBootstrap( this, "connectivity", "ConnectivityLayer", !polygene.singeltonApp );
 
             copyPolygeneBootstrap( this, "config", "ConfigModule", true );
 
             copyPolygeneBootstrap( this, "infrastructure", "FileConfigurationModule", true );
 
-            copyEntityStore( this, zest.entitystore );
+            copyEntityStore( this, polygene.entitystore );
 
             copyPolygeneBootstrap( this, "infrastructure", "RdfIndexingModule", hasIndexing( 'Rdf' ) );
             copyPolygeneBootstrap( this, "infrastructure", "ElasticSearchIndexingModule", hasIndexing( 'Elasticsearch' ) );
@@ -202,7 +202,7 @@ function copyPolygeneBootstrap( ctx, layer, moduleName, condition )
     {
         copyTemplate( ctx,
                       moduleName + '/bootstrap.tmpl',
-                      'bootstrap/src/main/java/' + zest.javaPackageDir + '/bootstrap/' + layer + '/' + moduleName + '.java' );
+                      'bootstrap/src/main/java/' + polygene.javaPackageDir + '/bootstrap/' + layer + '/' + moduleName + '.java' );
     }
 }
 
@@ -210,7 +210,7 @@ function copyEntityStore( ctx, entityStoreName )
 {
     copyTemplate( ctx,
                   'StorageModule/bootstrap.tmpl',
-                  'bootstrap/src/main/java/' + zest.javaPackageDir + '/bootstrap/infrastructure/' + entityStoreName + 'StorageModule.java' );
+                  'bootstrap/src/main/java/' + polygene.javaPackageDir + '/bootstrap/infrastructure/' + entityStoreName + 'StorageModule.java' );
 }
 
 function copyPolygeneApp( ctx, name, condition )
@@ -219,11 +219,11 @@ function copyPolygeneApp( ctx, name, condition )
     {
         copyTemplate( ctx,
                       name + '/bootstrap.tmpl',
-                      'bootstrap/src/main/java/' + zest.javaPackageDir + '/bootstrap/' + name + 'ApplicationAssembler.java' );
+                      'bootstrap/src/main/java/' + polygene.javaPackageDir + '/bootstrap/' + name + 'ApplicationAssembler.java' );
 
         copyTemplate( ctx,
                       name + '/app.tmpl',
-                      'app/src/main/java/' + zest.javaPackageDir + '/app/' + name + '.java' );
+                      'app/src/main/java/' + polygene.javaPackageDir + '/app/' + name + '.java' );
 
         copyTemplate( ctx,
                       name + '/webapp/',
@@ -237,7 +237,7 @@ function copyPolygeneDomain( ctx, model, module, clazz, condition )
     {
         copyTemplate( ctx,
                       module + '/' + clazz + '.tmpl',
-                      'model/src/main/java/' + zest.javaPackageDir + '/model/' + model + '/' + clazz + '.java' );
+                      'model/src/main/java/' + polygene.javaPackageDir + '/model/' + model + '/' + clazz + '.java' );
     }
 }
 
@@ -249,15 +249,15 @@ function copyRestFeature( ctx, condition )
 
         copyTemplate( ctx,
                       'RestApiModule/SimpleEnroler.tmpl',
-                      'rest/src/main/java/' + zest.javaPackageDir + '/rest/security/SimpleEnroler.java' );
+                      'rest/src/main/java/' + polygene.javaPackageDir + '/rest/security/SimpleEnroler.java' );
 
         copyTemplate( ctx,
                       'RestApiModule/SimpleVerifier.tmpl',
-                      'rest/src/main/java/' + zest.javaPackageDir + '/rest/security/SimpleVerifier.java' );
+                      'rest/src/main/java/' + polygene.javaPackageDir + '/rest/security/SimpleVerifier.java' );
 
         copyTemplate( ctx,
                       'RestApiModule/HardcodedSecurityRepositoryMixin.tmpl',
-                      'model/src/main/java/' + zest.javaPackageDir + '/model/security/HardcodedSecurityRepositoryMixin.java' );
+                      'model/src/main/java/' + polygene.javaPackageDir + '/model/security/HardcodedSecurityRepositoryMixin.java' );
     }
 }
 
@@ -276,39 +276,39 @@ function copyTemplate( ctx, from, to )
         ctx.templatePath( from ),
         ctx.destinationPath( to ),
         {
-            packageName: zest.packagename,
+            packageName: polygene.packagename,
             hasFeature: hasFeature,
             hasEntityStore: hasEntityStore,
             hasIndexing: hasIndexing,
             hasCaching: hasCaching,
-            zest: zest
+            polygene: polygene
         }
     );
 }
 
 function hasEntityStore( esType )
 {
-    return zest.entitystore === esType;
+    return polygene.entitystore === esType;
 }
 
 function hasIndexing( indexingType )
 {
-    return zest.indexing === indexingType;
+    return polygene.indexing === indexingType;
 }
 
 function hasCaching( cachingType )
 {
-    return zest.caching === cachingType;
+    return polygene.caching === cachingType;
 }
 
 function hasSerialization( serializer )
 {
-    return zest.serialization === serializer;
+    return polygene.serialization === serializer;
 }
 
 function hasFeature( feature )
 {
-    return zest.features.indexOf( feature ) >= 0;
+    return polygene.features.indexOf( feature ) >= 0;
 }
 
 function firstUpper( text )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/generator-zest/app/templates/Heroes/web.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-zest/app/templates/Heroes/web.tmpl b/tools/generator-zest/app/templates/Heroes/web.tmpl
index df3ee53..dda4f37 100644
--- a/tools/generator-zest/app/templates/Heroes/web.tmpl
+++ b/tools/generator-zest/app/templates/Heroes/web.tmpl
@@ -23,7 +23,7 @@
          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
          version="2.5">
 
-  <display-name><%= zest.name %></display-name>
+  <display-name><%= polygene.name %></display-name>
 
 
   <servlet>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/generator-zest/app/templates/InfrastructureLayer/bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-zest/app/templates/InfrastructureLayer/bootstrap.tmpl b/tools/generator-zest/app/templates/InfrastructureLayer/bootstrap.tmpl
index ca538ca..a1206a9 100644
--- a/tools/generator-zest/app/templates/InfrastructureLayer/bootstrap.tmpl
+++ b/tools/generator-zest/app/templates/InfrastructureLayer/bootstrap.tmpl
@@ -47,9 +47,9 @@ public class InfrastructureLayer extends LayeredLayerAssembler
     {
         createModule( layer, FileConfigurationModule.class );
 
-        new <%= zest.entitystore %>StorageModule( configModule ).assemble( layer, layer.module( <%= zest.entitystore %>StorageModule.NAME ) );
-        new <%= zest.indexing %>IndexingModule( configModule ).assemble( layer, layer.module( <%= zest.indexing %>IndexingModule.NAME ) );
-        new <%= zest.serialization %>SerializationModule( typeFinder ).assemble( layer, layer.module( <%= zest.serialization %>SerializationModule.NAME ) );
+        new <%= polygene.entitystore %>StorageModule( configModule ).assemble( layer, layer.module( <%= polygene.entitystore %>StorageModule.NAME ) );
+        new <%= polygene.indexing %>IndexingModule( configModule ).assemble( layer, layer.module( <%= polygene.indexing %>IndexingModule.NAME ) );
+        new <%= polygene.serialization %>SerializationModule( typeFinder ).assemble( layer, layer.module( <%= polygene.serialization %>SerializationModule.NAME ) );
         return layer;
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/generator-zest/app/templates/StorageModule/bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-zest/app/templates/StorageModule/bootstrap.tmpl b/tools/generator-zest/app/templates/StorageModule/bootstrap.tmpl
index cbcbb7c..467fadd 100644
--- a/tools/generator-zest/app/templates/StorageModule/bootstrap.tmpl
+++ b/tools/generator-zest/app/templates/StorageModule/bootstrap.tmpl
@@ -24,15 +24,15 @@ import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.LayerAssembly;
 import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.bootstrap.layered.ModuleAssembler;
-import org.apache.polygene.entitystore.<%- zest.entitystore.toLowerCase() %>.assembly.<%- zest.entitystore %>EntityStoreAssembler;
+import org.apache.polygene.entitystore.<%- polygene.entitystore.toLowerCase() %>.assembly.<%- polygene.entitystore %>EntityStoreAssembler;
 
-public class <%- zest.entitystore %>StorageModule
+public class <%- polygene.entitystore %>StorageModule
     implements ModuleAssembler
 {
-    public static final String NAME = "<%- zest.entitystore %> Storage Module";
+    public static final String NAME = "<%- polygene.entitystore %> Storage Module";
     private final ModuleAssembly configModule;
 
-    public <%- zest.entitystore %>StorageModule( ModuleAssembly configModule )
+    public <%- polygene.entitystore %>StorageModule( ModuleAssembly configModule )
     {
         this.configModule = configModule;
     }
@@ -41,10 +41,10 @@ public class <%- zest.entitystore %>StorageModule
     public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
         throws AssemblyException
     {
-        new <%- zest.entitystore %>EntityStoreAssembler()
+        new <%- polygene.entitystore %>EntityStoreAssembler()
             .visibleIn( Visibility.application  )
             .withConfig( configModule, Visibility.application )
-            .identifiedBy( "<%- zest.entitystore %>store" )
+            .identifiedBy( "<%- polygene.entitystore %>store" )
             .assemble( module );
         return module;
     }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/generator-zest/app/templates/buildtool/gradle-app.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-zest/app/templates/buildtool/gradle-app.tmpl b/tools/generator-zest/app/templates/buildtool/gradle-app.tmpl
index c80f7b3..f307e8b 100644
--- a/tools/generator-zest/app/templates/buildtool/gradle-app.tmpl
+++ b/tools/generator-zest/app/templates/buildtool/gradle-app.tmpl
@@ -28,14 +28,14 @@ dependencies {
   compile project( ":model" )
   compile project( ":rest" )
 
-  compile "org.apache.polygene.core:org.apache.polygene.core.spi:$zestVersion"
-  compile "org.apache.polygene.core:org.apache.polygene.core.bootstrap:$zestVersion"
-  compile "org.apache.polygene.library:org.apache.polygene.library.servlet:$zestVersion"
+  compile "org.apache.polygene.core:org.apache.polygene.core.spi:$polygeneVersion"
+  compile "org.apache.polygene.core:org.apache.polygene.core.bootstrap:$polygeneVersion"
+  compile "org.apache.polygene.library:org.apache.polygene.library.servlet:$polygeneVersion"
 
   compile "javax.servlet:servlet-api:2.5"
   compile "org.restlet.jee:org.restlet:2.3.4"
 
-  runtime "org.apache.polygene.core:org.apache.polygene.core.runtime:$zestVersion"
+  runtime "org.apache.polygene.core:org.apache.polygene.core.runtime:$polygeneVersion"
   runtime "org.restlet.jee:org.restlet.ext.servlet:2.3.4"
 
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/generator-zest/app/templates/buildtool/gradle-bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-zest/app/templates/buildtool/gradle-bootstrap.tmpl b/tools/generator-zest/app/templates/buildtool/gradle-bootstrap.tmpl
index 3baa75b..3261944 100644
--- a/tools/generator-zest/app/templates/buildtool/gradle-bootstrap.tmpl
+++ b/tools/generator-zest/app/templates/buildtool/gradle-bootstrap.tmpl
@@ -21,16 +21,16 @@ dependencies {
   compile project( ":model" )
   compile project( ":rest" )
 
-  compile "org.apache.polygene.core:org.apache.polygene.core.spi:$zestVersion"
-  compile "org.apache.polygene.core:org.apache.polygene.core.bootstrap:$zestVersion"
+  compile "org.apache.polygene.core:org.apache.polygene.core.spi:$polygeneVersion"
+  compile "org.apache.polygene.core:org.apache.polygene.core.bootstrap:$polygeneVersion"
 
 
-  compile "org.apache.polygene.library:org.apache.polygene.library.fileconfig:$zestVersion"
+  compile "org.apache.polygene.library:org.apache.polygene.library.fileconfig:$polygeneVersion"
 <% if( hasFeature( 'rest api' ) ) { %>
-  compile "org.apache.polygene.library:org.apache.polygene.library.restlet:$zestVersion"
+  compile "org.apache.polygene.library:org.apache.polygene.library.restlet:$polygeneVersion"
 <% } %>
-  compile "org.apache.polygene.extension:org.apache.polygene.extension.entitystore-<%= zest.entitystore.toLowerCase() %>:$zestVersion"
-  compile "org.apache.polygene.extension:org.apache.polygene.extension.indexing-<%= zest.indexing.toLowerCase() %>:$zestVersion"
-  compile "org.apache.polygene.extension:org.apache.polygene.extension.valueserialization-<%= zest.serialization.toLowerCase() %>:$zestVersion"
+  compile "org.apache.polygene.extension:org.apache.polygene.extension.entitystore-<%= polygene.entitystore.toLowerCase() %>:$polygeneVersion"
+  compile "org.apache.polygene.extension:org.apache.polygene.extension.indexing-<%= polygene.indexing.toLowerCase() %>:$polygeneVersion"
+  compile "org.apache.polygene.extension:org.apache.polygene.extension.valueserialization-<%= polygene.serialization.toLowerCase() %>:$polygeneVersion"
 
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/generator-zest/app/templates/buildtool/gradle-rest.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-zest/app/templates/buildtool/gradle-rest.tmpl b/tools/generator-zest/app/templates/buildtool/gradle-rest.tmpl
index 0d4a80b..5c389c2 100644
--- a/tools/generator-zest/app/templates/buildtool/gradle-rest.tmpl
+++ b/tools/generator-zest/app/templates/buildtool/gradle-rest.tmpl
@@ -21,7 +21,7 @@
 dependencies {
   compile project( ":model" )
 
-  compile "org.apache.polygene.core:org.apache.polygene.core.api:$zestVersion"
-  compile "org.apache.polygene.library:org.apache.polygene.library.restlet:$zestVersion"
+  compile "org.apache.polygene.core:org.apache.polygene.core.api:$polygeneVersion"
+  compile "org.apache.polygene.library:org.apache.polygene.library.restlet:$polygeneVersion"
 
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/generator-zest/app/templates/buildtool/gradle-root.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-zest/app/templates/buildtool/gradle-root.tmpl b/tools/generator-zest/app/templates/buildtool/gradle-root.tmpl
index d197669..c1960ba 100644
--- a/tools/generator-zest/app/templates/buildtool/gradle-root.tmpl
+++ b/tools/generator-zest/app/templates/buildtool/gradle-root.tmpl
@@ -21,7 +21,7 @@
 version = 1.0
 
 rootProject.ext {
-  zestVersion = 0
+  polygeneVersion = 0
 }
 
 allprojects() {
@@ -34,13 +34,13 @@ allprojects() {
     mavenLocal()
     mavenCentral()
     maven { name 'restlet-repo'; url 'http://maven.restlet.org/' }
-<% if( zest.entitystore == 'Jdbm' ) { -%>
+<% if( polygene.entitystore == 'Jdbm' ) { -%>
     maven { name 'clojure-repo'; url 'http://clojars.org/repo/' }
 <% } -%>
   }
 
   dependencies {
-    compile "org.apache.polygene.core:org.apache.polygene.core.api:$zestVersion"
-    testCompile "org.apache.polygene.core:org.apache.polygene.core.testsupport:$zestVersion"
+    compile "org.apache.polygene.core:org.apache.polygene.core.api:$polygeneVersion"
+    testCompile "org.apache.polygene.core:org.apache.polygene.core.testsupport:$polygeneVersion"
   }
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/generator-zest/app/templates/buildtool/settings.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-zest/app/templates/buildtool/settings.tmpl b/tools/generator-zest/app/templates/buildtool/settings.tmpl
index a5c128d..3016193 100644
--- a/tools/generator-zest/app/templates/buildtool/settings.tmpl
+++ b/tools/generator-zest/app/templates/buildtool/settings.tmpl
@@ -22,7 +22,7 @@ include 'app',
         'model',
         'rest'
 
-rootProject.name = '<%= zest.entitystore %>'
+rootProject.name = '<%= polygene.entitystore %>'
 
 validateProject(rootProject, "")
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/generator-zest/package.json
----------------------------------------------------------------------
diff --git a/tools/generator-zest/package.json b/tools/generator-zest/package.json
index 43cb59e..25e2d02 100644
--- a/tools/generator-zest/package.json
+++ b/tools/generator-zest/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "generator-zest",
+  "name": "generator-polygene",
   "version": "0.1.0",
   "description": "",
   "files": [

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/model-detail/build.gradle
----------------------------------------------------------------------
diff --git a/tools/model-detail/build.gradle b/tools/model-detail/build.gradle
index 2df83e1..65ac7b1 100644
--- a/tools/model-detail/build.gradle
+++ b/tools/model-detail/build.gradle
@@ -23,12 +23,12 @@ description = "Detailled Model of a Apache Polygene™ Application Structure."
 jar { manifest { name = "Apache Polygene™ Model Detail" }}
 
 dependencies {
-  compile zest.core.bootstrap
+  compile polygene.core.bootstrap
 
-  runtime zest.core.runtime
+  runtime polygene.core.runtime
 
-  testCompile zest.core.testsupport
-  testCompile zest.extension( 'indexing-rdf' )
+  testCompile polygene.core.testsupport
+  testCompile polygene.extension( 'indexing-rdf' )
 
   testRuntime libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/model-detail/dev-status.xml
----------------------------------------------------------------------
diff --git a/tools/model-detail/dev-status.xml b/tools/model-detail/dev-status.xml
index 40dade2..e124151 100644
--- a/tools/model-detail/dev-status.xml
+++ b/tools/model-detail/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>
     <!--none,early,beta,stable,mature-->
     <codebase>stable</codebase>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/qidea/build.gradle
----------------------------------------------------------------------
diff --git a/tools/qidea/build.gradle b/tools/qidea/build.gradle
index 2e9b77e..2383515 100644
--- a/tools/qidea/build.gradle
+++ b/tools/qidea/build.gradle
@@ -23,11 +23,11 @@ description = "IntelliJ IDEA Plugin for Apache Polygene™ development."
 jar { manifest { name = "Apache Polygene™ IDEA plugin" }}
 
 dependencies {
-  compile zest.core.bootstrap
+  compile polygene.core.bootstrap
 
-  runtime zest.core.runtime
+  runtime polygene.core.runtime
 
-  testCompile zest.core.testsupport
+  testCompile polygene.core.testsupport
 
   testRuntime libraries.logback
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/ZestApplicationComponent.java
----------------------------------------------------------------------
diff --git a/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/ZestApplicationComponent.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/ZestApplicationComponent.java
index 116027c..42d1104 100644
--- a/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/ZestApplicationComponent.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/ZestApplicationComponent.java
@@ -53,11 +53,11 @@ public final class PolygeneApplicationComponent
         "GenericConcernOf.java"
     };
 
-    private final PolygeneFacetType zestFacetType;
+    private final PolygeneFacetType polygeneFacetType;
 
     public PolygeneApplicationComponent()
     {
-        zestFacetType = new PolygeneFacetType();
+        polygeneFacetType = new PolygeneFacetType();
     }
 
     @NotNull
@@ -75,7 +75,7 @@ public final class PolygeneApplicationComponent
     private void registerFacet()
     {
         FacetTypeRegistry facetTypeRegistry = FacetTypeRegistry.getInstance();
-        facetTypeRegistry.registerFacetType( zestFacetType );
+        facetTypeRegistry.registerFacetType( polygeneFacetType );
     }
 
     private void registerIntentions()
@@ -92,7 +92,7 @@ public final class PolygeneApplicationComponent
     private void unregisterFacet()
     {
         FacetTypeRegistry facetTypeRegistry = FacetTypeRegistry.getInstance();
-        facetTypeRegistry.unregisterFacetType( zestFacetType );
+        facetTypeRegistry.unregisterFacetType( polygeneFacetType );
     }
 
     public final Class[] getInspectionClasses()
@@ -117,7 +117,7 @@ public final class PolygeneApplicationComponent
     public final FileTemplateGroupDescriptor getFileTemplatesDescriptor()
     {
         FileTemplateGroupDescriptor group = new FileTemplateGroupDescriptor(
-            message( "zest.file.template.group.title" ), null
+            message( "polygene.file.template.group.title" ), null
         );
 
         FileTypeManager fileTypeManager = FileTypeManager.getInstance();

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/actions/ZestCreateActionGroup.java
----------------------------------------------------------------------
diff --git a/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/actions/ZestCreateActionGroup.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/actions/ZestCreateActionGroup.java
index e0350bd..d53e0e1 100644
--- a/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/actions/ZestCreateActionGroup.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/actions/ZestCreateActionGroup.java
@@ -37,8 +37,8 @@ public final class PolygeneCreateActionGroup extends DefaultActionGroup
 {
     public PolygeneCreateActionGroup()
     {
-        super( message( "zest.action.group.title" ), true );
-        getTemplatePresentation().setDescription( message( "zest.action.group.description" ) );
+        super( message( "polygene.action.group.title" ), true );
+        getTemplatePresentation().setDescription( message( "polygene.action.group.description" ) );
     }
 
     public void update( AnActionEvent e )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/inspections/AbstractFix.java
----------------------------------------------------------------------
diff --git a/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/inspections/AbstractFix.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/inspections/AbstractFix.java
index f135464..1369766 100644
--- a/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/inspections/AbstractFix.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/inspections/AbstractFix.java
@@ -46,6 +46,6 @@ public abstract class AbstractFix
     @NotNull
     public final String getFamilyName()
     {
-        return message( "zest.quick.fixes.family.name" );
+        return message( "polygene.quick.fixes.family.name" );
     }
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/inspections/AbstractInspection.java
----------------------------------------------------------------------
diff --git a/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/inspections/AbstractInspection.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/inspections/AbstractInspection.java
index d2176c9..178d258 100644
--- a/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/inspections/AbstractInspection.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/inspections/AbstractInspection.java
@@ -32,7 +32,7 @@ import static com.intellij.codeHighlighting.HighlightDisplayLevel.ERROR;
  */
 public abstract class AbstractInspection extends BaseJavaLocalInspectionTool
 {
-    private static final String ZEST_IDEA_INSPECTIONS_NAME = "zest.inspections.name";
+    private static final String ZEST_IDEA_INSPECTIONS_NAME = "polygene.inspections.name";
 
     @Nls @NotNull public String getGroupDisplayName()
     {

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/qidea/src/main/resources/inspectionDescriptions/ConcernsAnnotationDeclaredCorrectlyInspection.html
----------------------------------------------------------------------
diff --git a/tools/qidea/src/main/resources/inspectionDescriptions/ConcernsAnnotationDeclaredCorrectlyInspection.html b/tools/qidea/src/main/resources/inspectionDescriptions/ConcernsAnnotationDeclaredCorrectlyInspection.html
index c008984..db2cda2 100644
--- a/tools/qidea/src/main/resources/inspectionDescriptions/ConcernsAnnotationDeclaredCorrectlyInspection.html
+++ b/tools/qidea/src/main/resources/inspectionDescriptions/ConcernsAnnotationDeclaredCorrectlyInspection.html
@@ -37,7 +37,7 @@
 -->
 <body>
 <font face="verdana" size="-1">This inspection reports any @Concerns declarations value that does not implement
-    [org.apache.zest.composite.ConcernOf] class.
+    [org.apache.polygene.composite.ConcernOf] class.
 </font>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/qidea/src/main/resources/org/apache/zest/ide/plugin/idea/common/resource/ZestResourceBundle.properties
----------------------------------------------------------------------
diff --git a/tools/qidea/src/main/resources/org/apache/zest/ide/plugin/idea/common/resource/ZestResourceBundle.properties b/tools/qidea/src/main/resources/org/apache/zest/ide/plugin/idea/common/resource/ZestResourceBundle.properties
index 8767678..8c5f29b 100644
--- a/tools/qidea/src/main/resources/org/apache/zest/ide/plugin/idea/common/resource/ZestResourceBundle.properties
+++ b/tools/qidea/src/main/resources/org/apache/zest/ide/plugin/idea/common/resource/ZestResourceBundle.properties
@@ -21,11 +21,11 @@
 # *****************************************************************************
 # Common
 # *****************************************************************************
-zest.quick.fixes.family.name=Polygene
-zest.action.group.title=Polygene
-zest.action.group.description=Polygene
-zest.inspections.name=Polygene issues
-zest.file.template.group.title=Polygene
+polygene.quick.fixes.family.name=Polygene
+polygene.action.group.title=Polygene
+polygene.action.group.description=Polygene
+polygene.inspections.name=Polygene issues
+polygene.file.template.group.title=Polygene
 
 # *****************************************************************************
 # Concern

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/shell/dev-status.xml
----------------------------------------------------------------------
diff --git a/tools/shell/dev-status.xml b/tools/shell/dev-status.xml
index 360ab9c..01d0c15 100644
--- a/tools/shell/dev-status.xml
+++ b/tools/shell/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>
     <!--none,early,beta,stable,mature-->
     <codebase>beta</codebase>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/shell/src/dist/bin/zest-boot
----------------------------------------------------------------------
diff --git a/tools/shell/src/dist/bin/zest-boot b/tools/shell/src/dist/bin/zest-boot
index cea4593..5a86955 100644
--- a/tools/shell/src/dist/bin/zest-boot
+++ b/tools/shell/src/dist/bin/zest-boot
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 #
-# This files copies itself to $HOME/bin, renames itself to "zest"
+# This files copies itself to $HOME/bin, renames itself to "polygene"
 # and from then on pretends to be the tools.shell script.
 #
 
@@ -25,13 +25,13 @@ JARNAME=org.apache.polygene.tool.shell-@version@.jar
 MYNAME=`basename $0`
 
 # check if it is executing as boot script or regular script.
-if [ "$MYNAME" == "zest-boot" ] ; then
+if [ "$MYNAME" == "polygene-boot" ] ; then
     mkdir $HOME/bin >/dev/null 2>&1
-    cp $0 $HOME/bin/zest
+    cp $0 $HOME/bin/polygene
     if [ -f $HOME/bin/$JARNAME ] ; then
         echo "JAR file exists."
     else
-        JAR_URL=http://repo1.maven.org/maven2/org/apache/zest/$JARNAME
+        JAR_URL=http://repo1.maven.org/maven2/org/apache/polygene/$JARNAME
 
         # check for wget
         WGET=`which wget`
@@ -47,7 +47,7 @@ if [ "$MYNAME" == "zest-boot" ] ; then
                 curl --output $HOME/bin/ $JAR_URL
             fi
         else
-            wget --output-document=$HOME/bin/ $HOME/bin/zest $JAR_URL
+            wget --output-document=$HOME/bin/ $HOME/bin/polygene $JAR_URL
         fi
     fi
 else
@@ -73,7 +73,7 @@ else
     # Restore the current directory
     cd $CWD
 
-    java -Dzest.home=$ZESTPATH -jar $ZESTPATH/$JARFILE "$@"
+    java -Dpolygene.home=$ZESTPATH -jar $ZESTPATH/$JARFILE "$@"
 fi
 
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/shell/src/dist/etc/templates/default/files/app/build.gradle_
----------------------------------------------------------------------
diff --git a/tools/shell/src/dist/etc/templates/default/files/app/build.gradle_ b/tools/shell/src/dist/etc/templates/default/files/app/build.gradle_
index 3ee3081..1fed99b 100644
--- a/tools/shell/src/dist/etc/templates/default/files/app/build.gradle_
+++ b/tools/shell/src/dist/etc/templates/default/files/app/build.gradle_
@@ -9,14 +9,14 @@ dependencies {
   compile project( ":model" )
   compile project( ":rest" )
 
-  compile "org.apache.polygene.core:org.apache.polygene.core.spi:$zestVersion"
-  compile "org.apache.polygene.core:org.apache.polygene.core.bootstrap:$zestVersion"
-  compile "org.apache.polygene.library:org.apache.polygene.library.servlet:$zestVersion"
+  compile "org.apache.polygene.core:org.apache.polygene.core.spi:$polygeneVersion"
+  compile "org.apache.polygene.core:org.apache.polygene.core.bootstrap:$polygeneVersion"
+  compile "org.apache.polygene.library:org.apache.polygene.library.servlet:$polygeneVersion"
 
   compile "javax.servlet:servlet-api:2.5"
   compile "org.restlet.jee:org.restlet:2.3.4"
 
-  runtime "org.apache.polygene.core:org.apache.polygene.core.runtime:$zestVersion"
+  runtime "org.apache.polygene.core:org.apache.polygene.core.runtime:$polygeneVersion"
   runtime "org.restlet.jee:org.restlet.ext.servlet:2.3.4"
 
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/shell/src/dist/etc/templates/default/files/bootstrap/build.gradle_
----------------------------------------------------------------------
diff --git a/tools/shell/src/dist/etc/templates/default/files/bootstrap/build.gradle_ b/tools/shell/src/dist/etc/templates/default/files/bootstrap/build.gradle_
index d8cd5ae..37ddd9e 100644
--- a/tools/shell/src/dist/etc/templates/default/files/bootstrap/build.gradle_
+++ b/tools/shell/src/dist/etc/templates/default/files/bootstrap/build.gradle_
@@ -3,14 +3,14 @@ dependencies {
   compile project( ":model" )
   compile project( ":rest" )
 
-  compile "org.apache.polygene.core:org.apache.polygene.core.spi:$zestVersion"
-  compile "org.apache.polygene.core:org.apache.polygene.core.bootstrap:$zestVersion"
+  compile "org.apache.polygene.core:org.apache.polygene.core.spi:$polygeneVersion"
+  compile "org.apache.polygene.core:org.apache.polygene.core.bootstrap:$polygeneVersion"
 
 
-  compile "org.apache.polygene.library:org.apache.polygene.library.fileconfig:$zestVersion"
-  compile "org.apache.polygene.library:org.apache.polygene.library.restlet:$zestVersion"
-  compile "org.apache.polygene.extension:org.apache.polygene.extension.entitystore-file:$zestVersion"
-  compile "org.apache.polygene.extension:org.apache.polygene.extension.indexing-rdf:$zestVersion"
-  compile "org.apache.polygene.extension:org.apache.polygene.extension.valueserialization-jackson:$zestVersion"
+  compile "org.apache.polygene.library:org.apache.polygene.library.fileconfig:$polygeneVersion"
+  compile "org.apache.polygene.library:org.apache.polygene.library.restlet:$polygeneVersion"
+  compile "org.apache.polygene.extension:org.apache.polygene.extension.entitystore-file:$polygeneVersion"
+  compile "org.apache.polygene.extension:org.apache.polygene.extension.indexing-rdf:$polygeneVersion"
+  compile "org.apache.polygene.extension:org.apache.polygene.extension.valueserialization-jackson:$polygeneVersion"
 
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/shell/src/dist/etc/templates/default/files/build.gradle_
----------------------------------------------------------------------
diff --git a/tools/shell/src/dist/etc/templates/default/files/build.gradle_ b/tools/shell/src/dist/etc/templates/default/files/build.gradle_
index 2def6b6..c5b2044 100644
--- a/tools/shell/src/dist/etc/templates/default/files/build.gradle_
+++ b/tools/shell/src/dist/etc/templates/default/files/build.gradle_
@@ -2,7 +2,7 @@
 version = 1.0
 
 rootProject.ext {
-  zestVersion = @version@
+  polygeneVersion = @version@
 }
 
 allprojects() {
@@ -16,8 +16,8 @@ allprojects() {
   }
 
   dependencies {
-    compile "org.apache.polygene.core:org.apache.polygene.core.api:$zestVersion"
-    testCompile "org.apache.polygene.core:org.apache.polygene.core.testsupport:$zestVersion"
+    compile "org.apache.polygene.core:org.apache.polygene.core.api:$polygeneVersion"
+    testCompile "org.apache.polygene.core:org.apache.polygene.core.testsupport:$polygeneVersion"
   }
 }
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/shell/src/dist/etc/templates/ng2-heroes/files/app/build.gradle_
----------------------------------------------------------------------
diff --git a/tools/shell/src/dist/etc/templates/ng2-heroes/files/app/build.gradle_ b/tools/shell/src/dist/etc/templates/ng2-heroes/files/app/build.gradle_
index 3ee3081..1fed99b 100644
--- a/tools/shell/src/dist/etc/templates/ng2-heroes/files/app/build.gradle_
+++ b/tools/shell/src/dist/etc/templates/ng2-heroes/files/app/build.gradle_
@@ -9,14 +9,14 @@ dependencies {
   compile project( ":model" )
   compile project( ":rest" )
 
-  compile "org.apache.polygene.core:org.apache.polygene.core.spi:$zestVersion"
-  compile "org.apache.polygene.core:org.apache.polygene.core.bootstrap:$zestVersion"
-  compile "org.apache.polygene.library:org.apache.polygene.library.servlet:$zestVersion"
+  compile "org.apache.polygene.core:org.apache.polygene.core.spi:$polygeneVersion"
+  compile "org.apache.polygene.core:org.apache.polygene.core.bootstrap:$polygeneVersion"
+  compile "org.apache.polygene.library:org.apache.polygene.library.servlet:$polygeneVersion"
 
   compile "javax.servlet:servlet-api:2.5"
   compile "org.restlet.jee:org.restlet:2.3.4"
 
-  runtime "org.apache.polygene.core:org.apache.polygene.core.runtime:$zestVersion"
+  runtime "org.apache.polygene.core:org.apache.polygene.core.runtime:$polygeneVersion"
   runtime "org.restlet.jee:org.restlet.ext.servlet:2.3.4"
 
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/shell/src/dist/etc/templates/ng2-heroes/files/bootstrap/build.gradle_
----------------------------------------------------------------------
diff --git a/tools/shell/src/dist/etc/templates/ng2-heroes/files/bootstrap/build.gradle_ b/tools/shell/src/dist/etc/templates/ng2-heroes/files/bootstrap/build.gradle_
index d8cd5ae..37ddd9e 100644
--- a/tools/shell/src/dist/etc/templates/ng2-heroes/files/bootstrap/build.gradle_
+++ b/tools/shell/src/dist/etc/templates/ng2-heroes/files/bootstrap/build.gradle_
@@ -3,14 +3,14 @@ dependencies {
   compile project( ":model" )
   compile project( ":rest" )
 
-  compile "org.apache.polygene.core:org.apache.polygene.core.spi:$zestVersion"
-  compile "org.apache.polygene.core:org.apache.polygene.core.bootstrap:$zestVersion"
+  compile "org.apache.polygene.core:org.apache.polygene.core.spi:$polygeneVersion"
+  compile "org.apache.polygene.core:org.apache.polygene.core.bootstrap:$polygeneVersion"
 
 
-  compile "org.apache.polygene.library:org.apache.polygene.library.fileconfig:$zestVersion"
-  compile "org.apache.polygene.library:org.apache.polygene.library.restlet:$zestVersion"
-  compile "org.apache.polygene.extension:org.apache.polygene.extension.entitystore-file:$zestVersion"
-  compile "org.apache.polygene.extension:org.apache.polygene.extension.indexing-rdf:$zestVersion"
-  compile "org.apache.polygene.extension:org.apache.polygene.extension.valueserialization-jackson:$zestVersion"
+  compile "org.apache.polygene.library:org.apache.polygene.library.fileconfig:$polygeneVersion"
+  compile "org.apache.polygene.library:org.apache.polygene.library.restlet:$polygeneVersion"
+  compile "org.apache.polygene.extension:org.apache.polygene.extension.entitystore-file:$polygeneVersion"
+  compile "org.apache.polygene.extension:org.apache.polygene.extension.indexing-rdf:$polygeneVersion"
+  compile "org.apache.polygene.extension:org.apache.polygene.extension.valueserialization-jackson:$polygeneVersion"
 
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/shell/src/dist/etc/templates/ng2-heroes/files/build.gradle_
----------------------------------------------------------------------
diff --git a/tools/shell/src/dist/etc/templates/ng2-heroes/files/build.gradle_ b/tools/shell/src/dist/etc/templates/ng2-heroes/files/build.gradle_
index 2def6b6..c5b2044 100644
--- a/tools/shell/src/dist/etc/templates/ng2-heroes/files/build.gradle_
+++ b/tools/shell/src/dist/etc/templates/ng2-heroes/files/build.gradle_
@@ -2,7 +2,7 @@
 version = 1.0
 
 rootProject.ext {
-  zestVersion = @version@
+  polygeneVersion = @version@
 }
 
 allprojects() {
@@ -16,8 +16,8 @@ allprojects() {
   }
 
   dependencies {
-    compile "org.apache.polygene.core:org.apache.polygene.core.api:$zestVersion"
-    testCompile "org.apache.polygene.core:org.apache.polygene.core.testsupport:$zestVersion"
+    compile "org.apache.polygene.core:org.apache.polygene.core.api:$polygeneVersion"
+    testCompile "org.apache.polygene.core:org.apache.polygene.core.testsupport:$polygeneVersion"
   }
 }
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/shell/src/dist/etc/templates/ng2-heroes/files/rest/build.gradle_
----------------------------------------------------------------------
diff --git a/tools/shell/src/dist/etc/templates/ng2-heroes/files/rest/build.gradle_ b/tools/shell/src/dist/etc/templates/ng2-heroes/files/rest/build.gradle_
index 6e02dfe..f2630ea 100644
--- a/tools/shell/src/dist/etc/templates/ng2-heroes/files/rest/build.gradle_
+++ b/tools/shell/src/dist/etc/templates/ng2-heroes/files/rest/build.gradle_
@@ -2,7 +2,7 @@
 dependencies {
   compile project( ":model" )
 
-  compile "org.apache.polygene.core:org.apache.polygene.core.api:$zestVersion"
-  compile "org.apache.polygene.library:org.apache.polygene.library.restlet:$zestVersion"
+  compile "org.apache.polygene.core:org.apache.polygene.core.api:$polygeneVersion"
+  compile "org.apache.polygene.library:org.apache.polygene.library.restlet:$polygeneVersion"
 
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/shell/src/dist/etc/templates/null/files/build.gradle_
----------------------------------------------------------------------
diff --git a/tools/shell/src/dist/etc/templates/null/files/build.gradle_ b/tools/shell/src/dist/etc/templates/null/files/build.gradle_
index c7e539c..549574f 100644
--- a/tools/shell/src/dist/etc/templates/null/files/build.gradle_
+++ b/tools/shell/src/dist/etc/templates/null/files/build.gradle_
@@ -2,7 +2,7 @@
 version = 1.0
 
 rootProject.ext {
-  zestVersion = @version@
+  polygeneVersion = @version@
 }
 
 allprojects() {
@@ -15,8 +15,8 @@ allprojects() {
   }
 
   dependencies {
-    compile "org.apache.polygene.core:org.apache.polygene.core.api:$zestVersion"
-    testCompile "org.apache.polygene.core:org.apache.polygene.core.testsupport:$zestVersion"
+    compile "org.apache.polygene.core:org.apache.polygene.core.api:$polygeneVersion"
+    testCompile "org.apache.polygene.core:org.apache.polygene.core.testsupport:$polygeneVersion"
   }
 }
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/shell/src/dist/etc/templates/restapp/files/app/build.gradle_
----------------------------------------------------------------------
diff --git a/tools/shell/src/dist/etc/templates/restapp/files/app/build.gradle_ b/tools/shell/src/dist/etc/templates/restapp/files/app/build.gradle_
index 3ee3081..1fed99b 100644
--- a/tools/shell/src/dist/etc/templates/restapp/files/app/build.gradle_
+++ b/tools/shell/src/dist/etc/templates/restapp/files/app/build.gradle_
@@ -9,14 +9,14 @@ dependencies {
   compile project( ":model" )
   compile project( ":rest" )
 
-  compile "org.apache.polygene.core:org.apache.polygene.core.spi:$zestVersion"
-  compile "org.apache.polygene.core:org.apache.polygene.core.bootstrap:$zestVersion"
-  compile "org.apache.polygene.library:org.apache.polygene.library.servlet:$zestVersion"
+  compile "org.apache.polygene.core:org.apache.polygene.core.spi:$polygeneVersion"
+  compile "org.apache.polygene.core:org.apache.polygene.core.bootstrap:$polygeneVersion"
+  compile "org.apache.polygene.library:org.apache.polygene.library.servlet:$polygeneVersion"
 
   compile "javax.servlet:servlet-api:2.5"
   compile "org.restlet.jee:org.restlet:2.3.4"
 
-  runtime "org.apache.polygene.core:org.apache.polygene.core.runtime:$zestVersion"
+  runtime "org.apache.polygene.core:org.apache.polygene.core.runtime:$polygeneVersion"
   runtime "org.restlet.jee:org.restlet.ext.servlet:2.3.4"
 
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/shell/src/dist/etc/templates/restapp/files/bootstrap/build.gradle_
----------------------------------------------------------------------
diff --git a/tools/shell/src/dist/etc/templates/restapp/files/bootstrap/build.gradle_ b/tools/shell/src/dist/etc/templates/restapp/files/bootstrap/build.gradle_
index d8cd5ae..37ddd9e 100644
--- a/tools/shell/src/dist/etc/templates/restapp/files/bootstrap/build.gradle_
+++ b/tools/shell/src/dist/etc/templates/restapp/files/bootstrap/build.gradle_
@@ -3,14 +3,14 @@ dependencies {
   compile project( ":model" )
   compile project( ":rest" )
 
-  compile "org.apache.polygene.core:org.apache.polygene.core.spi:$zestVersion"
-  compile "org.apache.polygene.core:org.apache.polygene.core.bootstrap:$zestVersion"
+  compile "org.apache.polygene.core:org.apache.polygene.core.spi:$polygeneVersion"
+  compile "org.apache.polygene.core:org.apache.polygene.core.bootstrap:$polygeneVersion"
 
 
-  compile "org.apache.polygene.library:org.apache.polygene.library.fileconfig:$zestVersion"
-  compile "org.apache.polygene.library:org.apache.polygene.library.restlet:$zestVersion"
-  compile "org.apache.polygene.extension:org.apache.polygene.extension.entitystore-file:$zestVersion"
-  compile "org.apache.polygene.extension:org.apache.polygene.extension.indexing-rdf:$zestVersion"
-  compile "org.apache.polygene.extension:org.apache.polygene.extension.valueserialization-jackson:$zestVersion"
+  compile "org.apache.polygene.library:org.apache.polygene.library.fileconfig:$polygeneVersion"
+  compile "org.apache.polygene.library:org.apache.polygene.library.restlet:$polygeneVersion"
+  compile "org.apache.polygene.extension:org.apache.polygene.extension.entitystore-file:$polygeneVersion"
+  compile "org.apache.polygene.extension:org.apache.polygene.extension.indexing-rdf:$polygeneVersion"
+  compile "org.apache.polygene.extension:org.apache.polygene.extension.valueserialization-jackson:$polygeneVersion"
 
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/shell/src/dist/etc/templates/restapp/files/build.gradle_
----------------------------------------------------------------------
diff --git a/tools/shell/src/dist/etc/templates/restapp/files/build.gradle_ b/tools/shell/src/dist/etc/templates/restapp/files/build.gradle_
index 2def6b6..c5b2044 100644
--- a/tools/shell/src/dist/etc/templates/restapp/files/build.gradle_
+++ b/tools/shell/src/dist/etc/templates/restapp/files/build.gradle_
@@ -2,7 +2,7 @@
 version = 1.0
 
 rootProject.ext {
-  zestVersion = @version@
+  polygeneVersion = @version@
 }
 
 allprojects() {
@@ -16,8 +16,8 @@ allprojects() {
   }
 
   dependencies {
-    compile "org.apache.polygene.core:org.apache.polygene.core.api:$zestVersion"
-    testCompile "org.apache.polygene.core:org.apache.polygene.core.testsupport:$zestVersion"
+    compile "org.apache.polygene.core:org.apache.polygene.core.api:$polygeneVersion"
+    testCompile "org.apache.polygene.core:org.apache.polygene.core.testsupport:$polygeneVersion"
   }
 }
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/shell/src/dist/etc/templates/restapp/files/rest/build.gradle_
----------------------------------------------------------------------
diff --git a/tools/shell/src/dist/etc/templates/restapp/files/rest/build.gradle_ b/tools/shell/src/dist/etc/templates/restapp/files/rest/build.gradle_
index 6e02dfe..f2630ea 100644
--- a/tools/shell/src/dist/etc/templates/restapp/files/rest/build.gradle_
+++ b/tools/shell/src/dist/etc/templates/restapp/files/rest/build.gradle_
@@ -2,7 +2,7 @@
 dependencies {
   compile project( ":model" )
 
-  compile "org.apache.polygene.core:org.apache.polygene.core.api:$zestVersion"
-  compile "org.apache.polygene.library:org.apache.polygene.library.restlet:$zestVersion"
+  compile "org.apache.polygene.core:org.apache.polygene.core.api:$polygeneVersion"
+  compile "org.apache.polygene.library:org.apache.polygene.library.restlet:$polygeneVersion"
 
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/shell/src/dist/etc/templates/singleton/files/build.gradle_
----------------------------------------------------------------------
diff --git a/tools/shell/src/dist/etc/templates/singleton/files/build.gradle_ b/tools/shell/src/dist/etc/templates/singleton/files/build.gradle_
index c7e539c..549574f 100644
--- a/tools/shell/src/dist/etc/templates/singleton/files/build.gradle_
+++ b/tools/shell/src/dist/etc/templates/singleton/files/build.gradle_
@@ -2,7 +2,7 @@
 version = 1.0
 
 rootProject.ext {
-  zestVersion = @version@
+  polygeneVersion = @version@
 }
 
 allprojects() {
@@ -15,8 +15,8 @@ allprojects() {
   }
 
   dependencies {
-    compile "org.apache.polygene.core:org.apache.polygene.core.api:$zestVersion"
-    testCompile "org.apache.polygene.core:org.apache.polygene.core.testsupport:$zestVersion"
+    compile "org.apache.polygene.core:org.apache.polygene.core.api:$polygeneVersion"
+    testCompile "org.apache.polygene.core:org.apache.polygene.core.testsupport:$polygeneVersion"
   }
 }
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/shell/src/docs/quick-start.txt
----------------------------------------------------------------------
diff --git a/tools/shell/src/docs/quick-start.txt b/tools/shell/src/docs/quick-start.txt
index de07cc2..b22db2c 100644
--- a/tools/shell/src/docs/quick-start.txt
+++ b/tools/shell/src/docs/quick-start.txt
@@ -41,7 +41,7 @@ source=tools/shell/src/docs/use-boot.txt
 tag=boot-quick
 ----
 
-The boot script will place the the +zest+ script and the accompanying
+The boot script will place the the +polygene+ script and the accompanying
 jar file into the $HOME/bin directory, which should already be on your PATH.
 
 == Create a small Project ==

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/shell/src/docs/shell.txt
----------------------------------------------------------------------
diff --git a/tools/shell/src/docs/shell.txt b/tools/shell/src/docs/shell.txt
index 4d7be84..9ebc47c 100644
--- a/tools/shell/src/docs/shell.txt
+++ b/tools/shell/src/docs/shell.txt
@@ -19,7 +19,7 @@
 
 [[tools-shell,Command Line Shell]]
 = Polygene Shell =
-If you have installed the Polygene SDK, there is a +bin/zest+ command line script,
+If you have installed the Polygene SDK, there is a +bin/polygene+ command line script,
 which has sub-functions in it. This list of commands will slowly grow
 for various purposes of doing software development with Apache Polygene.
 
@@ -36,7 +36,7 @@ might want to create. Full list of types to follow below. The command
 takes at least 3 additional arguments;
 
 ---------------------------
-zest create-project type name package
+polygene create-project type name package
 ---------------------------
 
 A directory called _name_ will be created in the current directory, and all
@@ -66,8 +66,8 @@ Module in that layer. In Polygene, all applications must have at least one Layer
 This is useful for really small applications or demos, not expected to become large in the future. It is
 also currently required that the infrastructure is configuration free, otherwise it is not possible to set up.
 
-The template will configure the File EntityStore and RDF Indexing subsystems, hardcoded to the +zest/store+ and
-+zest/index+ respectively in the current directory where the application is started. This may not be suitable, in
+The template will configure the File EntityStore and RDF Indexing subsystems, hardcoded to the +polygene/store+ and
++polygene/index+ respectively in the current directory where the application is started. This may not be suitable, in
 which case you should look at the <<tools-shell-create-project-default>> template.
 
 [[tools-shell-create-project-default,Create Default Project]]

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/tools/shell/src/docs/use-boot.txt
----------------------------------------------------------------------
diff --git a/tools/shell/src/docs/use-boot.txt b/tools/shell/src/docs/use-boot.txt
index e1e22ae..c2a1e6a 100644
--- a/tools/shell/src/docs/use-boot.txt
+++ b/tools/shell/src/docs/use-boot.txt
@@ -21,24 +21,24 @@ THIS FILE CONTAINS SNIPPETS for quick-start.txt and shell.txt. DO NOT INCLUDE IN
 
 
 START SNIPPET: boot-quick
-wget http://zest.apache.org/latest/shell/zest-boot
-sh zest-boot
+wget http://polygene.apache.org/latest/shell/polygene-boot
+sh polygene-boot
 END SNIPPET: boot-quick
 
 START SNIPPET: boot-sdk
-wget http://zest.apache.org/latest/shell/zest-boot
-sh zest-boot sdk
+wget http://polygene.apache.org/latest/shell/polygene-boot
+sh polygene-boot sdk
 END SNIPPET: boot-sdk
 
 START SNIPPET: create-singleton
-zest create-project singleton com.acme.quick quickstart
+polygene create-project singleton com.acme.quick quickstart
 cd quickstart
 ./gradlew assemble
 ./gradlew run
 END SNIPPET: create-singleton
 
 START SNIPPET: create-ngheroes
-zest create-project ng-heroes com.acme.heroes heroes
+polygene create-project ng-heroes com.acme.heroes heroes
 cd heroes
 ./gradlew assemble
 ./gradlew run


Mime
View raw message