polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject [67/80] zest-java git commit: Tightening everything up after massive namespace change. Removal of practically all "Qi4j" names and references.
Date Thu, 30 Jul 2015 19:49:06 GMT
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/manual/src/docs/tutorials/howto-writing-docs.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/tutorials/howto-writing-docs.txt b/manual/src/docs/tutorials/howto-writing-docs.txt
index d578e57..ea348e5 100644
--- a/manual/src/docs/tutorials/howto-writing-docs.txt
+++ b/manual/src/docs/tutorials/howto-writing-docs.txt
@@ -322,8 +322,8 @@ For other highlighters we could add see http://alexgorbatchev.com/SyntaxHighligh
 
 Common attributes you can use in documents:
 
-* \{qi4j-revnumber} - rendered as "{qi4j-revnumber}"
-* \{qi4j-importdir} - rendered as "{qi4j-importdir}"
+* \{zest-revnumber} - rendered as "{zest-revnumber}"
+* \{zest-importdir} - rendered as "{zest-importdir}"
 
 These can substitute part of URLs that point to for example APIdocs or source code.
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/manual/src/docs/userguide/docinfo.xml
----------------------------------------------------------------------
diff --git a/manual/src/docs/userguide/docinfo.xml b/manual/src/docs/userguide/docinfo.xml
index c970145..d3033e7 100644
--- a/manual/src/docs/userguide/docinfo.xml
+++ b/manual/src/docs/userguide/docinfo.xml
@@ -15,13 +15,13 @@
   limitations under the License.
 -->
 <authorgroup>
-  <corpauthor>The Qi4j Community
+  <corpauthor>The Apache Zest Community
   </corpauthor>
 </authorgroup>
 
 <copyright>
 <year>2011</year>
-<holder>Qi4j Community</holder>
+<holder>The Apache Zest Community</holder>
 </copyright>
 
 <legalnotice>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/manual/src/docs/userguide/index.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/userguide/index.txt b/manual/src/docs/userguide/index.txt
index 683dee0..fbd031c 100644
--- a/manual/src/docs/userguide/index.txt
+++ b/manual/src/docs/userguide/index.txt
@@ -19,9 +19,9 @@
 
 = Zest™ v{revnumber} User Guide =
 
-:qi4j-version: {revnumber}
-:qi4j-buildnumber: {revnumber}
-:qi4j-git-tag: {gitversion}
+:zest-version: {revnumber}
+:zest-buildnumber: {revnumber}
+:zest-git-tag: {gitversion}
 
 
 :leveloffset: {level2}

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/manual/src/docs/userguide/preface.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/userguide/preface.txt b/manual/src/docs/userguide/preface.txt
index 668d5b1..04869c9 100644
--- a/manual/src/docs/userguide/preface.txt
+++ b/manual/src/docs/userguide/preface.txt
@@ -20,7 +20,7 @@
 [[preface, Preface]]
 = Preface =
 
-This is the reference manual for Zest™ version {qi4j-version}, written by members of the Zest™ Community.
+This is the reference manual for Zest™ version {zest-version}, written by members of the Zest™ Community.
 
 The main parts of the manual are:
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/manual/src/docs/website/resources/css/qi4j.css
----------------------------------------------------------------------
diff --git a/manual/src/docs/website/resources/css/qi4j.css b/manual/src/docs/website/resources/css/qi4j.css
deleted file mode 100644
index d302aae..0000000
--- a/manual/src/docs/website/resources/css/qi4j.css
+++ /dev/null
@@ -1,824 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-span.remark
-{
-    background: yellow;
-}
-
-td p
-{
-    margin: 0.125em 0;
-}
-
-#disqus_thread
-{
-    max-width: 40em;
-}
-
-body #toolbar_item command_help
-{
-    /* display: none !important; */
-}
-
-pre {
-    max-width: 55em;
-    overflow: scroll;
-}
-
-.syntaxhighlighter a,
-.syntaxhighlighter div,
-.syntaxhighlighter code,
-.syntaxhighlighter table,
-.syntaxhighlighter table td,
-.syntaxhighlighter table tr,
-.syntaxhighlighter table tbody,
-.syntaxhighlighter table thead,
-.syntaxhighlighter table caption,
-.syntaxhighlighter textarea
-{
-    font-size: 12px !important;
-    font-family: Consolas, Monaco, "Bitstream Vera Sans Mono", monospace !important;
-    line-height: 14px !important;
-}
-
-.syntaxhighlighter {
-    background-color: rgba(11,117,188,0.1) !important;
-    /*
-    overflow: visible !important;
-    */
-    border: 1px solid #0b75bc;
-    padding: 8px;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    border-radius: 5px;
-}
-
-.syntaxhighlighter .line.alt1 {
-    background-color: rgba(11,117,188,0.05) !important;
-}
-.syntaxhighlighter .line.alt2 {
-    background-color:  rgba(11,117,188,0.1)  !important;
-}
-
-html
-{
-    text-align: center;
-}
-
-html body
-{
-    background: url("bg.png");
-    margin: 0 auto;
-    text-align: left;
-}
-
-div.navheader, div.navfooter {
-    padding: 0 5%;
-}
-
-body, div.navheader th, div.navheader td, div.navfooter td
-{
-    font-family: Georgia, "Times New Roman", Times, serif;
-    color: #4c4c4c;
-}
-
-a {
-    color: #0b75bc;
-}
-
-a:hover {
-    text-decoration: none;
-}
-
-a:visited {
-    color: #0b75bc;
-    /* color: #08568a; */
-}
-
-hr {
-    border-color: #0b75bc;
-    border-style: solid;
-}
-
-.navheader a {
-    color: #acacac;
-    text-decoration: none;
-    font-family: Helvetica, Arial, sans-serif;
-}
-
-.navheader a:hover, .navfooter a:hover {
-    text-decoration: underline;
-}
-
-h1, h2, h3, h4, h5, h6,
-div.toc p b,
-div.important th, div.info th, div.tip th,
-div.warning th, div.note th, div.caution th,
-p.legalnotice-title,
-div.refnamediv p,
-div.sidebar p.title,
-th,
-div.table-contents td p span.strong strong,
-tr.question td b p
-{
-    color: #0b75bc;
-    font-family: Helvetica, Arial, sans-serif;
-    text-shadow: 0 1px 0 #fff;
-}
-
-
-.book, .chapter, .part {
-    width:90%;
-    margin: 0 auto;
-}
-
-td p strong
-{
-    font-size: 1.067em;
-}
-
-tr.question td b p
-{
-    font-size: 1em;
-    margin: 0.5em 0 0 0;
-}
-
-tr.question td
-{
-    padding: 0;
-}
-
-tr.answer td, tr.answer td p
-{
-    padding-top: 0;
-}
-
-tr.answer td
-{
-    padding-left: 1em;
-}
-
-div.navheader
-{
-    height: 50px;
-    background: url(../../../../resources/css/navHead_bg.png) repeat-x;
-}
-
-div.navheader hr
-{
-    display: none;
-}
-
-div.refentry body h2.title, div.refentry body h1.title, div.refentry div.refnamediv p,
-body > div.section h1, body > div.section h2,
-body > div.part h1, body > div.part h2,
-body > div.chapter h1, body > div.chapter h2,
-body > div.book h1,
-body > div.preface h2,
-body > div.appendix h2
-{
-    border-bottom: none;
-    margin-top: 2.2em;
-    margin-bottom: .7em;
-}
-
-div.legalnotice
-{
-    padding-top: 3em;
-}
-
-p.legalnotice-title b
-{
-    font-size: 1.5em;
-    font-style: normal;
-    font-weight: bold;
-}
-
-p.legalnotice-title
-{
-    margin-bottom: 2em;
-}
-
-body > div.book h1.title
-{
-    margin-top: 0.5em;
-    padding-top: 0;
-    margin-bottom: 0;
-}
-
-div.part h1.title
-{
-    margin-top: 1.5em;
-}
-
-.book div.titlepage {
-    position: absolute;
-    top: 40px;
-    background: url(logo.png) no-repeat left top;
-    min-height: 250px;
-    padding-left: 150px;
-}
-
-.book div.titlepage .authorgroup {
-    font-size: 150%;
-}
-
-.book div.titlepage hr {
-    display: none;
-}
-
-div.titlepage h3.corpauthor
-{
-}
-
-div.refnamediv
-{
-    padding-top: 24px;
-    margin-bottom: 24px;
-}
-
-div.refsynopsisdiv h2, div.refsect1 h2
-{
-    border-bottom: none;
-}
-
-div.titlepage h3.corpauthor a.ulink, div.titlepage h3.corpauthor a.ulink:link,
-div.titlepage h3.corpauthor a.ulink:visited, div.titlepage h3.corpauthor a.ulink:hover
-div.titlepage h3.corpauthor a.ulink:focus, div.titlepage h3.corpauthor a.ulink:active
-{
-    color: #dddddd;
-    text-decoration: none;
-    font-style: normal;
-    padding-left: 0.6em;
-}
-
-div.refnamediv h2
-{
-    display: none;
-}
-
-div.refnamediv p
-{
-    font-size: 1em;
-    font-weight: bold;
-    margin-top: 3em;
-    margin-bottom: 2em;
-    width: 60%;
-    line-height: 1.2;
-}
-
-p, li, dt, div.navheader th, div.navheader td, div.navfooter td
-{
-    font-family: Georgia, "Times New Roman", Times, serif;
-    font-size: .9375em;
-    text-shadow: 0 1px 0 #fff;
-}
-
-p, ul, ol
-{
-    margin-top: 0;
-    margin-bottom: 1em;
-}
-
-li p
-{
-    margin-bottom: 0.5em;
-}
-
-div.list-of-figures p, div.list-of-tables p
-{
-    margin-top: 1.5em;
-}
-
-div.list-of-figures p b, div.list-of-tables p b, div.sidebar p b
-{
-    font-style: normal;
-    font-weight: bold;
-}
-
-div.toc
-{
-    margin-bottom: 1em;
-}
-
-.book .toc {
-    margin-top: 220px;
-}
-
-div.toc p {
-    width: 100%;
-    font-family: Helvetica, Arial, sans-serif;
-    color: #0b75bc;
-    font-size: 120%;
-    border-bottom: 1px solid #0b75bc;
-}
-
-div.toc a, div.toc a:visited {
-    color: #0b75bc;
-}
-
-div.toc dt {
-    margin-bottom: 8px;
-}
-
-div.toc dl dl {
-    margin: 5px 0;
-}
-
-p.copyright
-{
-    margin: 0;
-    padding: 10px 0 5px 0;
-    text-align: center;
-    max-width: 100%;
-    background: #0b75bc url(../../../../resources/css/copyright_bg.png) repeat-x top;
-    color: #fff;
-    text-shadow: none;
-    border-bottom: 1px solid #095e96;
-}
-
-.titlepage p.copyright {
-    background: none;
-    border: none;
-    text-align: left;
-    color: #0b75bc;
-}
-
-code.literal
-{
-    font-family: Consolas, Monaco, monospace;
-    font-size: .9375em;
-}
-
-td code.literal
-{
-    font-size: .8em;
-}
-
-li
-{
-    line-height: 1.3em;
-}
-
-p
-{
-    line-height: 1.6em;
-}
-
-.toc p {
-    max-width: 100%;
-}
-
-ul, ol
-{
-    max-width: 38em;
-}
-
-div.sidebar
-{
-    max-width: 30em;
-    padding: 0.67em 1em;
-    background: #c1d5d9 url("../../../../resources/css/content-bg.png") repeat-x;
-}
-
-div.sidebar p.title
-{
-    margin: 0;
-}
-
-div.sidebar ul
-{
-    margin-top: 0.3em;
-    margin-bottom: 0.3em;
-}
-
-p b, div.figure p.title b, div.table p.title b
-{
-    font-style: italic;
-    font-weight: normal;
-}
-
-/* BEGIN SIDE NOTES */
-div.important, div.info, div.tip, div.note,
-div.warning, div.caution
-{
-    float: right;
-    max-width: 20em;
-    margin: 1em 0 1em 1em !important;
-    padding: 1em !important;
-    font-size: 0.9em;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    border-radius: 5px;
-}
-div.important, div.info, div.tip, div.note
-{
-    background-color:  rgba(11, 117, 188, 0.1) !important;
-    border: 1px solid #0b75bc;
-}
-div.warning
-{
-    background-color:  rgba(188, 117, 11, 0.1) !important;
-    border: 1px solid #bc750b;
-}
-div.caution
-{
-    background-color:  rgba(188, 11, 11, 0.1) !important;
-    border: 1px solid #bc0b0b;
-}
-div.important h3, div.info h3, div.tip h3, div.note h3,
-div.warning h3, div.caution h3
-{
-    margin: 0 0 0.5em 0 !important;
-    line-height: 50px;
-    padding-right: 55px;
-    background-position: top right !important;
-    background-repeat: no-repeat !important;
-}
-div.important h3
-{
-    background-image: url("important.png");
-}
-div.info h3, div.tip h3
-{
-    background-image: url("tip.png");
-}
-div.note h3
-{
-    background-image: url("note.png");
-}
-div.warning h3
-{
-    background-image: url("warning.png");
-    color: #bc750b;
-}
-div.caution h3
-{
-    background-image: url("caution.png");
-    color: #bc0b0b;
-}
-div.important p, div.info p, div.tip p, div.note p,
-div.warning p, div.caution p
-{
-    margin: 0 0 0.5em 0 !important;
-}
-/* END SIDE NOTES */
-
-
-div.table, div.informaltable
-{
-    width: 100%;
-    clear: both;
-}
-div.table div.table-contents, div.informaltable div.table-contents
-{
-    background-color: rgba(11,117,188,0.1) !important;
-    border: 1px solid #0b75bc;
-    padding: 8px;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    border-radius: 5px;
-}
-
-div.table table, div.informaltable table
-{
-    width: 100%;
-    border: none;
-    border-collapse: collapse;
-}
-
-td, th
-{
-    padding: 2px 4px;
-}
-
-div.table table, div.informaltable table,
-div.table table th, div.informaltable table th,
-div.table table td, div.informaltable table td,
-div.table table tr, div.informaltable table tr,
-div.table table tbody, div.informaltable table tbody,
-div.table table thead, div.informaltable table thead,
-div.table table tfoot, div.informaltable table tfoot
-{
-    font-size: 15px;
-    text-align: center;
-}
-div.table table td,
-div.informaltable table td,
-div.table table th,
-div.informaltable table th
-{
-    border: 1px solid #3D8AC9;
-}
-div.table table tr:first-child th,
-div.informaltable table tr:first-child th
-{
-  border-top: 0;
-}
-div.table table tr:last-child td,
-div.informaltable table tr:last-child td
-{
-  border-bottom: 0;
-}
-div.table table tr td:first-child,
-div.informaltable table tr td:first-child,
-div.table table tr th:first-child,
-div.informaltable table tr th:first-child
-{
-  border-left: 0;
-}
-div.table table tr td:last-child,
-div.informaltable table tr td:last-child,
-div.table table tr th:last-child,
-div.informaltable table tr th:last-child
-{
-  border-right: 0;
-}
-
-div.queryresult table tbody td p code.literal
-{
-    color: #000000;
-}
-
-div.queryresult table thead tr,
-div.queryresult table tfoot tr
-{
-    background: #cad9dc;
-}
-
-div.queryresult table tbody
-{
-    background: #d1dee1;
-}
-
-div.queryresult table tbody tr.evenresult
-{
-    background: #dfe8eb;
-}
-
-div.queryresult table thead th
-{
-    font-size: 0.9375em;
-}
-
-div.queryresult table tfoot th
-{
-    font-size: 0.8125em;
-    font-weight: normal;
-}
-
-div.table table th, div.informaltable table th
-{
-    color: #3D8AC9;
-}
-div.table-contents td p span.strong strong
-{
-    color: #333333;
-}
-
-div.informaltable span.strong strong
-{
-    font-weight: normal;
-    font-style: italic;
-}
-
-div.informalfigure a img, div.figure a img
-{
-    border: none;
-}
-
-/* additional styles for slides */
-
-div.slide h1
-{
-    margin-top: 40px;
-    margin-bottom: 1em;
-    color: white;
-    border-bottom: none;
-}
-
-div.slide p, div.slide li
-{
-    font-size: 1.25em;
-}
-
-.navfooter{
-    background: #0b75bc;
-    border: 1px solid #0b75bc;
-    border-top: 1px solid #3c91c9;
-}
-
-.navfooter a {
-    color: #fff;
-    color: rgba(255,255,255,0.8);
-    text-decoration: none;
-    text-shadow: none;
-    font-family: Helvetica, Arial, sans-serif;
-}
-
-h1 { font-size: 1.8em; margin-bottom: 1em; }
-h2 { font-size: 1.6em; margin-bottom: 1em; }
-h3 { font-size: 1.4em; margin-bottom: 1em; }
-h4 { font-size: 1.2em; margin-bottom: 0.5em; }
-h5 { font-size: 1em; margin-bottom: 0.5em; }
-
-.devstatus-code-none {
-    border: solid black 2px;
-    margin-right: 5px !important;
-    display: block;
-    float: right;
-    width: 4em;
-    font-size: 10pt !important;
-    font-weight: bolder;
-    font-family: "Courier New", "Courier", monospace !important;
-    background-color: #f08080;
-    text-align: center;
-    text-shadow: none  !important;
-}
-
-.devstatus-code-early {
-    border: solid black 2px;
-    margin-right: 5px !important;
-    display: block;
-    float: right;
-    width: 4em;
-    font-size: 10pt !important;
-    font-weight: bolder;
-    font-family: "Courier New", "Courier", monospace !important;
-    background-color: orange;
-    text-align: center;
-    text-shadow: none  !important;
-}
-.devstatus-code-beta {
-    border: solid black 2px;
-    margin-right: 5px !important;
-    display: block;
-    float: right;
-    width: 4em;
-    font-size: 10pt !important;
-    font-weight: bold;
-    font-family: "Courier New", "Courier", monospace !important;
-    background-color: yellow;
-    text-align: center;
-    text-shadow: none  !important;
-}
-.devstatus-code-stable {
-    border: solid black 2px;
-    margin-right: 5px !important;
-    display: block;
-    float: right;
-    width: 4em;
-    font-size: 10pt !important;
-    font-weight: bolder;
-    font-family: "Courier New", "Courier", monospace !important;
-    background-color: #adff2f;
-    text-align: center;
-    text-shadow: none  !important;
-}
-.devstatus-code-mature {
-    border: solid black 2px;
-    margin-right: 5px !important;
-    display: block;
-    float: right;
-    width: 4em;
-    font-size: 10pt !important;
-    font-weight: bolder;
-    font-family: "Courier New", "Courier", monospace !important;
-    background-color: #7cfc00;
-    text-align: center;
-    text-shadow: none  !important;
-}
-
-.devstatus-docs-none {
-    border: solid black 2px;
-    margin-right: 5px !important;
-    display: block;
-    float: right;
-    width: 4em;
-    font-size: 10pt !important;
-    font-weight: bolder;
-    font-family: "Courier New", "Courier", monospace !important;
-    background-color: #f08080;
-    text-align: center;
-    text-shadow: none  !important;
-}
-
-.devstatus-docs-brief {
-    border: solid black 2px;
-    margin-right: 5px !important;
-    display: block;
-    float: right;
-    width: 4em;
-    font-size: 10pt !important;
-    font-weight: bolder;
-    font-family: "Courier New", "Courier", monospace !important;
-    background-color: yellow;
-    text-align: center;
-    text-shadow: none  !important;
-}
-.devstatus-docs-good {
-    border: solid black 2px;
-    margin-right: 5px !important;
-    display: block;
-    float: right;
-    width: 4em;
-    font-size: 10pt !important;
-    font-weight: bolder;
-    font-family: "Courier New", "Courier", monospace !important;
-    background-color: #adff2f;
-    text-align: center;
-    text-shadow: none  !important;
-}
-.devstatus-docs-complete {
-    border: solid black 2px;
-    margin-right: 5px !important;
-    display: block;
-    float: right;
-    width: 4em;
-    font-size: 10pt !important;
-    font-weight: bolder;
-    font-family: "Courier New", "Courier", monospace !important;
-    background-color: #7cfc00;
-    text-align: center;
-    text-shadow: none  !important;
-}
-
-.devstatus-tests-none {
-    border: solid black 2px;
-    margin-right: 5px !important;
-    display: block;
-    float: right;
-    width: 4em;
-    font-size: 10pt !important;
-    font-weight: bolder;
-    font-family: "Courier New", "Courier", monospace !important;
-    background-color: #f08080;
-    text-align: center;
-    text-shadow: none  !important;
-}
-
-.devstatus-tests-some {
-    border: solid black 2px;
-    margin-right: 5px !important;
-    display: block;
-    float: right;
-    width: 4em;
-
-    font-size: 10pt !important;
-    font-weight: bolder;
-    font-family: "Courier New", "Courier", monospace !important;
-    background-color: yellow;
-    text-align: center;
-    text-shadow: none  !important;
-}
-.devstatus-tests-good {
-    border: solid black 2px;
-    margin-right: 5px !important;
-    display: block;
-    float: right;
-    width: 4em;
-    font-size: 10pt !important;
-    font-weight: bolder;
-    font-family: "Courier New", "Courier", monospace !important;
-    background-color: #adff2f;
-    text-align: center;
-    text-shadow: none  !important;
-}
-
-.devstatus-tests-complete {
-    border: solid black 2px;
-    margin-right: 5px !important;
-    display: block;
-    float: right;
-    width: 4em;
-    font-size: 10pt !important;
-    font-weight: bolder;
-    font-family: "Courier New", "Courier", monospace !important;
-    background-color: #7cfc00;
-    text-align: center;
-    text-shadow: none  !important;
-}
-
-
-.section .variablelist dt .term {
-    font-weight: bolder;
-    font-family: Consolas, Monaco, monospace;
-    background: #DEDEDE;
-}

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/manual/src/docs/website/resources/css/zest.css
----------------------------------------------------------------------
diff --git a/manual/src/docs/website/resources/css/zest.css b/manual/src/docs/website/resources/css/zest.css
new file mode 100644
index 0000000..d302aae
--- /dev/null
+++ b/manual/src/docs/website/resources/css/zest.css
@@ -0,0 +1,824 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+span.remark
+{
+    background: yellow;
+}
+
+td p
+{
+    margin: 0.125em 0;
+}
+
+#disqus_thread
+{
+    max-width: 40em;
+}
+
+body #toolbar_item command_help
+{
+    /* display: none !important; */
+}
+
+pre {
+    max-width: 55em;
+    overflow: scroll;
+}
+
+.syntaxhighlighter a,
+.syntaxhighlighter div,
+.syntaxhighlighter code,
+.syntaxhighlighter table,
+.syntaxhighlighter table td,
+.syntaxhighlighter table tr,
+.syntaxhighlighter table tbody,
+.syntaxhighlighter table thead,
+.syntaxhighlighter table caption,
+.syntaxhighlighter textarea
+{
+    font-size: 12px !important;
+    font-family: Consolas, Monaco, "Bitstream Vera Sans Mono", monospace !important;
+    line-height: 14px !important;
+}
+
+.syntaxhighlighter {
+    background-color: rgba(11,117,188,0.1) !important;
+    /*
+    overflow: visible !important;
+    */
+    border: 1px solid #0b75bc;
+    padding: 8px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    border-radius: 5px;
+}
+
+.syntaxhighlighter .line.alt1 {
+    background-color: rgba(11,117,188,0.05) !important;
+}
+.syntaxhighlighter .line.alt2 {
+    background-color:  rgba(11,117,188,0.1)  !important;
+}
+
+html
+{
+    text-align: center;
+}
+
+html body
+{
+    background: url("bg.png");
+    margin: 0 auto;
+    text-align: left;
+}
+
+div.navheader, div.navfooter {
+    padding: 0 5%;
+}
+
+body, div.navheader th, div.navheader td, div.navfooter td
+{
+    font-family: Georgia, "Times New Roman", Times, serif;
+    color: #4c4c4c;
+}
+
+a {
+    color: #0b75bc;
+}
+
+a:hover {
+    text-decoration: none;
+}
+
+a:visited {
+    color: #0b75bc;
+    /* color: #08568a; */
+}
+
+hr {
+    border-color: #0b75bc;
+    border-style: solid;
+}
+
+.navheader a {
+    color: #acacac;
+    text-decoration: none;
+    font-family: Helvetica, Arial, sans-serif;
+}
+
+.navheader a:hover, .navfooter a:hover {
+    text-decoration: underline;
+}
+
+h1, h2, h3, h4, h5, h6,
+div.toc p b,
+div.important th, div.info th, div.tip th,
+div.warning th, div.note th, div.caution th,
+p.legalnotice-title,
+div.refnamediv p,
+div.sidebar p.title,
+th,
+div.table-contents td p span.strong strong,
+tr.question td b p
+{
+    color: #0b75bc;
+    font-family: Helvetica, Arial, sans-serif;
+    text-shadow: 0 1px 0 #fff;
+}
+
+
+.book, .chapter, .part {
+    width:90%;
+    margin: 0 auto;
+}
+
+td p strong
+{
+    font-size: 1.067em;
+}
+
+tr.question td b p
+{
+    font-size: 1em;
+    margin: 0.5em 0 0 0;
+}
+
+tr.question td
+{
+    padding: 0;
+}
+
+tr.answer td, tr.answer td p
+{
+    padding-top: 0;
+}
+
+tr.answer td
+{
+    padding-left: 1em;
+}
+
+div.navheader
+{
+    height: 50px;
+    background: url(../../../../resources/css/navHead_bg.png) repeat-x;
+}
+
+div.navheader hr
+{
+    display: none;
+}
+
+div.refentry body h2.title, div.refentry body h1.title, div.refentry div.refnamediv p,
+body > div.section h1, body > div.section h2,
+body > div.part h1, body > div.part h2,
+body > div.chapter h1, body > div.chapter h2,
+body > div.book h1,
+body > div.preface h2,
+body > div.appendix h2
+{
+    border-bottom: none;
+    margin-top: 2.2em;
+    margin-bottom: .7em;
+}
+
+div.legalnotice
+{
+    padding-top: 3em;
+}
+
+p.legalnotice-title b
+{
+    font-size: 1.5em;
+    font-style: normal;
+    font-weight: bold;
+}
+
+p.legalnotice-title
+{
+    margin-bottom: 2em;
+}
+
+body > div.book h1.title
+{
+    margin-top: 0.5em;
+    padding-top: 0;
+    margin-bottom: 0;
+}
+
+div.part h1.title
+{
+    margin-top: 1.5em;
+}
+
+.book div.titlepage {
+    position: absolute;
+    top: 40px;
+    background: url(logo.png) no-repeat left top;
+    min-height: 250px;
+    padding-left: 150px;
+}
+
+.book div.titlepage .authorgroup {
+    font-size: 150%;
+}
+
+.book div.titlepage hr {
+    display: none;
+}
+
+div.titlepage h3.corpauthor
+{
+}
+
+div.refnamediv
+{
+    padding-top: 24px;
+    margin-bottom: 24px;
+}
+
+div.refsynopsisdiv h2, div.refsect1 h2
+{
+    border-bottom: none;
+}
+
+div.titlepage h3.corpauthor a.ulink, div.titlepage h3.corpauthor a.ulink:link,
+div.titlepage h3.corpauthor a.ulink:visited, div.titlepage h3.corpauthor a.ulink:hover
+div.titlepage h3.corpauthor a.ulink:focus, div.titlepage h3.corpauthor a.ulink:active
+{
+    color: #dddddd;
+    text-decoration: none;
+    font-style: normal;
+    padding-left: 0.6em;
+}
+
+div.refnamediv h2
+{
+    display: none;
+}
+
+div.refnamediv p
+{
+    font-size: 1em;
+    font-weight: bold;
+    margin-top: 3em;
+    margin-bottom: 2em;
+    width: 60%;
+    line-height: 1.2;
+}
+
+p, li, dt, div.navheader th, div.navheader td, div.navfooter td
+{
+    font-family: Georgia, "Times New Roman", Times, serif;
+    font-size: .9375em;
+    text-shadow: 0 1px 0 #fff;
+}
+
+p, ul, ol
+{
+    margin-top: 0;
+    margin-bottom: 1em;
+}
+
+li p
+{
+    margin-bottom: 0.5em;
+}
+
+div.list-of-figures p, div.list-of-tables p
+{
+    margin-top: 1.5em;
+}
+
+div.list-of-figures p b, div.list-of-tables p b, div.sidebar p b
+{
+    font-style: normal;
+    font-weight: bold;
+}
+
+div.toc
+{
+    margin-bottom: 1em;
+}
+
+.book .toc {
+    margin-top: 220px;
+}
+
+div.toc p {
+    width: 100%;
+    font-family: Helvetica, Arial, sans-serif;
+    color: #0b75bc;
+    font-size: 120%;
+    border-bottom: 1px solid #0b75bc;
+}
+
+div.toc a, div.toc a:visited {
+    color: #0b75bc;
+}
+
+div.toc dt {
+    margin-bottom: 8px;
+}
+
+div.toc dl dl {
+    margin: 5px 0;
+}
+
+p.copyright
+{
+    margin: 0;
+    padding: 10px 0 5px 0;
+    text-align: center;
+    max-width: 100%;
+    background: #0b75bc url(../../../../resources/css/copyright_bg.png) repeat-x top;
+    color: #fff;
+    text-shadow: none;
+    border-bottom: 1px solid #095e96;
+}
+
+.titlepage p.copyright {
+    background: none;
+    border: none;
+    text-align: left;
+    color: #0b75bc;
+}
+
+code.literal
+{
+    font-family: Consolas, Monaco, monospace;
+    font-size: .9375em;
+}
+
+td code.literal
+{
+    font-size: .8em;
+}
+
+li
+{
+    line-height: 1.3em;
+}
+
+p
+{
+    line-height: 1.6em;
+}
+
+.toc p {
+    max-width: 100%;
+}
+
+ul, ol
+{
+    max-width: 38em;
+}
+
+div.sidebar
+{
+    max-width: 30em;
+    padding: 0.67em 1em;
+    background: #c1d5d9 url("../../../../resources/css/content-bg.png") repeat-x;
+}
+
+div.sidebar p.title
+{
+    margin: 0;
+}
+
+div.sidebar ul
+{
+    margin-top: 0.3em;
+    margin-bottom: 0.3em;
+}
+
+p b, div.figure p.title b, div.table p.title b
+{
+    font-style: italic;
+    font-weight: normal;
+}
+
+/* BEGIN SIDE NOTES */
+div.important, div.info, div.tip, div.note,
+div.warning, div.caution
+{
+    float: right;
+    max-width: 20em;
+    margin: 1em 0 1em 1em !important;
+    padding: 1em !important;
+    font-size: 0.9em;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    border-radius: 5px;
+}
+div.important, div.info, div.tip, div.note
+{
+    background-color:  rgba(11, 117, 188, 0.1) !important;
+    border: 1px solid #0b75bc;
+}
+div.warning
+{
+    background-color:  rgba(188, 117, 11, 0.1) !important;
+    border: 1px solid #bc750b;
+}
+div.caution
+{
+    background-color:  rgba(188, 11, 11, 0.1) !important;
+    border: 1px solid #bc0b0b;
+}
+div.important h3, div.info h3, div.tip h3, div.note h3,
+div.warning h3, div.caution h3
+{
+    margin: 0 0 0.5em 0 !important;
+    line-height: 50px;
+    padding-right: 55px;
+    background-position: top right !important;
+    background-repeat: no-repeat !important;
+}
+div.important h3
+{
+    background-image: url("important.png");
+}
+div.info h3, div.tip h3
+{
+    background-image: url("tip.png");
+}
+div.note h3
+{
+    background-image: url("note.png");
+}
+div.warning h3
+{
+    background-image: url("warning.png");
+    color: #bc750b;
+}
+div.caution h3
+{
+    background-image: url("caution.png");
+    color: #bc0b0b;
+}
+div.important p, div.info p, div.tip p, div.note p,
+div.warning p, div.caution p
+{
+    margin: 0 0 0.5em 0 !important;
+}
+/* END SIDE NOTES */
+
+
+div.table, div.informaltable
+{
+    width: 100%;
+    clear: both;
+}
+div.table div.table-contents, div.informaltable div.table-contents
+{
+    background-color: rgba(11,117,188,0.1) !important;
+    border: 1px solid #0b75bc;
+    padding: 8px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    border-radius: 5px;
+}
+
+div.table table, div.informaltable table
+{
+    width: 100%;
+    border: none;
+    border-collapse: collapse;
+}
+
+td, th
+{
+    padding: 2px 4px;
+}
+
+div.table table, div.informaltable table,
+div.table table th, div.informaltable table th,
+div.table table td, div.informaltable table td,
+div.table table tr, div.informaltable table tr,
+div.table table tbody, div.informaltable table tbody,
+div.table table thead, div.informaltable table thead,
+div.table table tfoot, div.informaltable table tfoot
+{
+    font-size: 15px;
+    text-align: center;
+}
+div.table table td,
+div.informaltable table td,
+div.table table th,
+div.informaltable table th
+{
+    border: 1px solid #3D8AC9;
+}
+div.table table tr:first-child th,
+div.informaltable table tr:first-child th
+{
+  border-top: 0;
+}
+div.table table tr:last-child td,
+div.informaltable table tr:last-child td
+{
+  border-bottom: 0;
+}
+div.table table tr td:first-child,
+div.informaltable table tr td:first-child,
+div.table table tr th:first-child,
+div.informaltable table tr th:first-child
+{
+  border-left: 0;
+}
+div.table table tr td:last-child,
+div.informaltable table tr td:last-child,
+div.table table tr th:last-child,
+div.informaltable table tr th:last-child
+{
+  border-right: 0;
+}
+
+div.queryresult table tbody td p code.literal
+{
+    color: #000000;
+}
+
+div.queryresult table thead tr,
+div.queryresult table tfoot tr
+{
+    background: #cad9dc;
+}
+
+div.queryresult table tbody
+{
+    background: #d1dee1;
+}
+
+div.queryresult table tbody tr.evenresult
+{
+    background: #dfe8eb;
+}
+
+div.queryresult table thead th
+{
+    font-size: 0.9375em;
+}
+
+div.queryresult table tfoot th
+{
+    font-size: 0.8125em;
+    font-weight: normal;
+}
+
+div.table table th, div.informaltable table th
+{
+    color: #3D8AC9;
+}
+div.table-contents td p span.strong strong
+{
+    color: #333333;
+}
+
+div.informaltable span.strong strong
+{
+    font-weight: normal;
+    font-style: italic;
+}
+
+div.informalfigure a img, div.figure a img
+{
+    border: none;
+}
+
+/* additional styles for slides */
+
+div.slide h1
+{
+    margin-top: 40px;
+    margin-bottom: 1em;
+    color: white;
+    border-bottom: none;
+}
+
+div.slide p, div.slide li
+{
+    font-size: 1.25em;
+}
+
+.navfooter{
+    background: #0b75bc;
+    border: 1px solid #0b75bc;
+    border-top: 1px solid #3c91c9;
+}
+
+.navfooter a {
+    color: #fff;
+    color: rgba(255,255,255,0.8);
+    text-decoration: none;
+    text-shadow: none;
+    font-family: Helvetica, Arial, sans-serif;
+}
+
+h1 { font-size: 1.8em; margin-bottom: 1em; }
+h2 { font-size: 1.6em; margin-bottom: 1em; }
+h3 { font-size: 1.4em; margin-bottom: 1em; }
+h4 { font-size: 1.2em; margin-bottom: 0.5em; }
+h5 { font-size: 1em; margin-bottom: 0.5em; }
+
+.devstatus-code-none {
+    border: solid black 2px;
+    margin-right: 5px !important;
+    display: block;
+    float: right;
+    width: 4em;
+    font-size: 10pt !important;
+    font-weight: bolder;
+    font-family: "Courier New", "Courier", monospace !important;
+    background-color: #f08080;
+    text-align: center;
+    text-shadow: none  !important;
+}
+
+.devstatus-code-early {
+    border: solid black 2px;
+    margin-right: 5px !important;
+    display: block;
+    float: right;
+    width: 4em;
+    font-size: 10pt !important;
+    font-weight: bolder;
+    font-family: "Courier New", "Courier", monospace !important;
+    background-color: orange;
+    text-align: center;
+    text-shadow: none  !important;
+}
+.devstatus-code-beta {
+    border: solid black 2px;
+    margin-right: 5px !important;
+    display: block;
+    float: right;
+    width: 4em;
+    font-size: 10pt !important;
+    font-weight: bold;
+    font-family: "Courier New", "Courier", monospace !important;
+    background-color: yellow;
+    text-align: center;
+    text-shadow: none  !important;
+}
+.devstatus-code-stable {
+    border: solid black 2px;
+    margin-right: 5px !important;
+    display: block;
+    float: right;
+    width: 4em;
+    font-size: 10pt !important;
+    font-weight: bolder;
+    font-family: "Courier New", "Courier", monospace !important;
+    background-color: #adff2f;
+    text-align: center;
+    text-shadow: none  !important;
+}
+.devstatus-code-mature {
+    border: solid black 2px;
+    margin-right: 5px !important;
+    display: block;
+    float: right;
+    width: 4em;
+    font-size: 10pt !important;
+    font-weight: bolder;
+    font-family: "Courier New", "Courier", monospace !important;
+    background-color: #7cfc00;
+    text-align: center;
+    text-shadow: none  !important;
+}
+
+.devstatus-docs-none {
+    border: solid black 2px;
+    margin-right: 5px !important;
+    display: block;
+    float: right;
+    width: 4em;
+    font-size: 10pt !important;
+    font-weight: bolder;
+    font-family: "Courier New", "Courier", monospace !important;
+    background-color: #f08080;
+    text-align: center;
+    text-shadow: none  !important;
+}
+
+.devstatus-docs-brief {
+    border: solid black 2px;
+    margin-right: 5px !important;
+    display: block;
+    float: right;
+    width: 4em;
+    font-size: 10pt !important;
+    font-weight: bolder;
+    font-family: "Courier New", "Courier", monospace !important;
+    background-color: yellow;
+    text-align: center;
+    text-shadow: none  !important;
+}
+.devstatus-docs-good {
+    border: solid black 2px;
+    margin-right: 5px !important;
+    display: block;
+    float: right;
+    width: 4em;
+    font-size: 10pt !important;
+    font-weight: bolder;
+    font-family: "Courier New", "Courier", monospace !important;
+    background-color: #adff2f;
+    text-align: center;
+    text-shadow: none  !important;
+}
+.devstatus-docs-complete {
+    border: solid black 2px;
+    margin-right: 5px !important;
+    display: block;
+    float: right;
+    width: 4em;
+    font-size: 10pt !important;
+    font-weight: bolder;
+    font-family: "Courier New", "Courier", monospace !important;
+    background-color: #7cfc00;
+    text-align: center;
+    text-shadow: none  !important;
+}
+
+.devstatus-tests-none {
+    border: solid black 2px;
+    margin-right: 5px !important;
+    display: block;
+    float: right;
+    width: 4em;
+    font-size: 10pt !important;
+    font-weight: bolder;
+    font-family: "Courier New", "Courier", monospace !important;
+    background-color: #f08080;
+    text-align: center;
+    text-shadow: none  !important;
+}
+
+.devstatus-tests-some {
+    border: solid black 2px;
+    margin-right: 5px !important;
+    display: block;
+    float: right;
+    width: 4em;
+
+    font-size: 10pt !important;
+    font-weight: bolder;
+    font-family: "Courier New", "Courier", monospace !important;
+    background-color: yellow;
+    text-align: center;
+    text-shadow: none  !important;
+}
+.devstatus-tests-good {
+    border: solid black 2px;
+    margin-right: 5px !important;
+    display: block;
+    float: right;
+    width: 4em;
+    font-size: 10pt !important;
+    font-weight: bolder;
+    font-family: "Courier New", "Courier", monospace !important;
+    background-color: #adff2f;
+    text-align: center;
+    text-shadow: none  !important;
+}
+
+.devstatus-tests-complete {
+    border: solid black 2px;
+    margin-right: 5px !important;
+    display: block;
+    float: right;
+    width: 4em;
+    font-size: 10pt !important;
+    font-weight: bolder;
+    font-family: "Courier New", "Courier", monospace !important;
+    background-color: #7cfc00;
+    text-align: center;
+    text-shadow: none  !important;
+}
+
+
+.section .variablelist dt .term {
+    font-weight: bolder;
+    font-family: Consolas, Monaco, monospace;
+    background: #DEDEDE;
+}

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/manual/src/docs/website/xsl/head.xsl
----------------------------------------------------------------------
diff --git a/manual/src/docs/website/xsl/head.xsl b/manual/src/docs/website/xsl/head.xsl
index 297d67e..2054151 100644
--- a/manual/src/docs/website/xsl/head.xsl
+++ b/manual/src/docs/website/xsl/head.xsl
@@ -22,15 +22,15 @@
 
 <!-- favicon -->
 
-<link rel="shortcut icon" href="http://qi4j.org/favicon.ico" type="image/vnd.microsoft.icon" />
-<link rel="icon" href="http://qi4j.org/favicon.ico" type="image/x-icon" />
+<link rel="shortcut icon" href="http://zest.apache.org/favicon.ico" type="image/vnd.microsoft.icon" />
+<link rel="icon" href="http://zest.apache.org/favicon.ico" type="image/x-icon" />
 
 <!-- style -->
 
 <link href="css/shCore.css" rel="stylesheet" type="text/css" />
 <link href="css/shCoreEclipse.css" rel="stylesheet" type="text/css" />
 <link href="css/shThemeEclipse.css" rel="stylesheet" type="text/css" />
-<link href="css/qi4j.css" rel="stylesheet" type="text/css" />
+<link href="css/zest.css" rel="stylesheet" type="text/css" />
 
 <!-- Syntax Highlighter -->
 
@@ -65,7 +65,7 @@
 
 <script type="text/javascript" src="js/tablestyler.js"></script>
 
-<!-- Qi4j WebSite Progressive Enhancement -->
+<!-- Apache Zest WebSite Progressive Enhancement -->
 
 <link href="css/progressive-enhancement.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="js/jquery.scrollTo-1.4.2.js"></script>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/manual/src/main/java/org/apache/zest/manual/recipes/assemble/Main.java
----------------------------------------------------------------------
diff --git a/manual/src/main/java/org/apache/zest/manual/recipes/assemble/Main.java b/manual/src/main/java/org/apache/zest/manual/recipes/assemble/Main.java
index 550bb50..3fb329e 100644
--- a/manual/src/main/java/org/apache/zest/manual/recipes/assemble/Main.java
+++ b/manual/src/main/java/org/apache/zest/manual/recipes/assemble/Main.java
@@ -27,7 +27,7 @@ import org.apache.zest.bootstrap.*;
 // START SNIPPET: main
 public class Main
 {
-    private static Energy4Java qi4j;
+    private static Energy4Java zest;
     private static Application application;
 
     public static void main( String[] args )
@@ -35,10 +35,10 @@ public class Main
     {
         // Bootstrap Zest Runtime
         // Create a Zest Runtime
-        qi4j = new Energy4Java();
+        zest = new Energy4Java();
 
         // Instantiate the Application Model.
-        application = qi4j.newApplication( new ApplicationAssembler()
+        application = zest.newApplication( new ApplicationAssembler()
         {
             public ApplicationAssembly assemble(
                     ApplicationAssemblyFactory factory )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/manual/src/main/java/org/apache/zest/manual/recipes/createEntity/Main.java
----------------------------------------------------------------------
diff --git a/manual/src/main/java/org/apache/zest/manual/recipes/createEntity/Main.java b/manual/src/main/java/org/apache/zest/manual/recipes/createEntity/Main.java
index d43a8b6..5b18c23 100644
--- a/manual/src/main/java/org/apache/zest/manual/recipes/createEntity/Main.java
+++ b/manual/src/main/java/org/apache/zest/manual/recipes/createEntity/Main.java
@@ -26,10 +26,10 @@ public class Main
     public static void main(String[] args) throws Exception
     {
 
-        Energy4Java qi4j = new Energy4Java();
+        Energy4Java zest = new Energy4Java();
 
         // Instantiate the Application Model.
-        Application application = qi4j.newApplication( new ApplicationAssembler()
+        Application application = zest.newApplication( new ApplicationAssembler()
         {
             @Override
             public ApplicationAssembly assemble(ApplicationAssemblyFactory applicationFactory) throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/manual/src/main/java/org/apache/zest/manual/recipes/properties/SwingPanel.java
----------------------------------------------------------------------
diff --git a/manual/src/main/java/org/apache/zest/manual/recipes/properties/SwingPanel.java b/manual/src/main/java/org/apache/zest/manual/recipes/properties/SwingPanel.java
index 2ba77c5..22800a8 100644
--- a/manual/src/main/java/org/apache/zest/manual/recipes/properties/SwingPanel.java
+++ b/manual/src/main/java/org/apache/zest/manual/recipes/properties/SwingPanel.java
@@ -23,7 +23,7 @@ import java.util.Locale;
 import javax.swing.Icon;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import org.apache.zest.api.Qi4j;
+import org.apache.zest.api.ZestAPI;
 import org.apache.zest.api.injection.scope.Structure;
 import org.apache.zest.api.property.Property;
 
@@ -34,7 +34,7 @@ public class SwingPanel
 
 // START SNIPPET: info-use
     @Structure
-    private Qi4j api;
+    private ZestAPI api;
 // END SNIPPET: info-use
 
 // START SNIPPET: info-use

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/manual/src/resources/css/progressive-enhancement.css
----------------------------------------------------------------------
diff --git a/manual/src/resources/css/progressive-enhancement.css b/manual/src/resources/css/progressive-enhancement.css
index 590ec6d..d9dba89 100644
--- a/manual/src/resources/css/progressive-enhancement.css
+++ b/manual/src/resources/css/progressive-enhancement.css
@@ -117,7 +117,7 @@ li.jenkins-job div.links > a {
 /**
  * Google Groups forum
 */
-#qi4j-dev-iframe {
+#zest-dev-iframe {
     -moz-transform: scale(0.85, 0.85); 
     -webkit-transform: scale(0.85, 0.85); 
     -o-transform: scale(0.85, 0.85);

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/manual/src/resources/images/qi4j-blue.png
----------------------------------------------------------------------
diff --git a/manual/src/resources/images/qi4j-blue.png b/manual/src/resources/images/qi4j-blue.png
deleted file mode 100644
index 6918246..0000000
Binary files a/manual/src/resources/images/qi4j-blue.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/manual/src/resources/images/zest-blue.png
----------------------------------------------------------------------
diff --git a/manual/src/resources/images/zest-blue.png b/manual/src/resources/images/zest-blue.png
new file mode 100644
index 0000000..6918246
Binary files /dev/null and b/manual/src/resources/images/zest-blue.png differ

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/manual/src/resources/js/progressive-enhancement.js
----------------------------------------------------------------------
diff --git a/manual/src/resources/js/progressive-enhancement.js b/manual/src/resources/js/progressive-enhancement.js
index bbf6f86..2e1483d 100644
--- a/manual/src/resources/js/progressive-enhancement.js
+++ b/manual/src/resources/js/progressive-enhancement.js
@@ -19,7 +19,7 @@
 
 
 /**
- * Qi4j Documentation WebSite Progressive Enhancement.
+ * Apache Zest Documentation WebSite Progressive Enhancement.
  */
 $( document ).ready( function($){
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/manual/src/resources/schemas/2008/dev-status/1/dev-status.xsd
----------------------------------------------------------------------
diff --git a/manual/src/resources/schemas/2008/dev-status/1/dev-status.xsd b/manual/src/resources/schemas/2008/dev-status/1/dev-status.xsd
index 1174fdf..47746e7 100644
--- a/manual/src/resources/schemas/2008/dev-status/1/dev-status.xsd
+++ b/manual/src/resources/schemas/2008/dev-status/1/dev-status.xsd
@@ -17,15 +17,15 @@
 -->
 <xs:schema attributeFormDefault="unqualified"
            elementFormDefault="qualified"
-           targetNamespace="http://www.qi4j.org/schemas/2008/dev-status/1"
+           targetNamespace="http://zest.apache.org/schemas/2008/dev-status/1"
            xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:element name="module" type="ns:moduleType" xmlns:ns="http://www.qi4j.org/schemas/2008/dev-status/1"/>
+  <xs:element name="module" type="ns:moduleType" xmlns:ns="http://zest.apache.org/schemas/2008/dev-status/1"/>
   <xs:complexType name="licensesType">
     <xs:sequence>
       <xs:element type="xs:string" name="license">
         <xs:annotation>
           <xs:documentation>
-            Qi4j itself only uses Apache License ver 2.0 for all its own developed code. We also try to list
+            Apache Zest itself only uses Apache License ver 2.0 for all its own developed code. We also try to list
             all dependencies' licenses here, so automated tools can bring that into the documentation.
             If the license is OTHER, the documentation will highlight this as a warning, and instruct users
             to carefully examine NOTICE file as well as the dependencies themselves.
@@ -45,8 +45,8 @@
   </xs:complexType>
   <xs:complexType name="moduleType">
     <xs:sequence>
-      <xs:element type="ns:statusType" name="status" xmlns:ns="http://www.qi4j.org/schemas/2008/dev-status/1"/>
-      <xs:element type="ns:licensesType" name="licenses" xmlns:ns="http://www.qi4j.org/schemas/2008/dev-status/1"/>
+      <xs:element type="ns:statusType" name="status" xmlns:ns="http://zest.apache.org/schemas/2008/dev-status/1"/>
+      <xs:element type="ns:licensesType" name="licenses" xmlns:ns="http://zest.apache.org/schemas/2008/dev-status/1"/>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="statusType">

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/manual/src/xsl/chunked-basic.xsl
----------------------------------------------------------------------
diff --git a/manual/src/xsl/chunked-basic.xsl b/manual/src/xsl/chunked-basic.xsl
index 0b60821..d525cf9 100644
--- a/manual/src/xsl/chunked-basic.xsl
+++ b/manual/src/xsl/chunked-basic.xsl
@@ -53,7 +53,7 @@
     <xsl:param name="generate.toc" select="''"/>
 
     <xsl:template name="footer.navigation">
-      <div class="footer"> (c) 2012 The Qi4j Community</div>
+      <div class="footer"> (c) 2012 The Apache Zest Community</div>
     </xsl:template>
 
     <xsl:template name="header.navigation">

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/manual/src/xsl/disqus-footer.xsl
----------------------------------------------------------------------
diff --git a/manual/src/xsl/disqus-footer.xsl b/manual/src/xsl/disqus-footer.xsl
index c5695db..fc89bdd 100644
--- a/manual/src/xsl/disqus-footer.xsl
+++ b/manual/src/xsl/disqus-footer.xsl
@@ -23,7 +23,7 @@
 <script type="text/javascript">
 // DISQUS
   var disqus_identifier = "manual";
-  var disqus_title = "The Qi4j Manual";
+  var disqus_title = "The Apache Zest Manual";
   function getIdFromHeading ( headingElement )
   {
     var id = disqus_identifier;
@@ -98,7 +98,7 @@
   var disqus_url = window.location;
   if ( disqus_url.protocol === "http:" || disqus_url.protocol === "https:" )
   {
-    var docsLocation = "http://www.qi4j.org/chunked/snapshot/";
+    var docsLocation = "http://zest.apache.org/chunked/snapshot/";
     var path = disqus_url.pathname;
     var position = path.lastIndexOf('/');
     if ( position === -1 )
@@ -111,7 +111,7 @@
       disqus_url = docsLocation + page;
     }
   }
-  var disqus_shortname = "qi4j";
+  var disqus_shortname = "zest";
   var disqus_developer = 0;
 
 (function() {

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/manual/src/xsl/fo.xsl
----------------------------------------------------------------------
diff --git a/manual/src/xsl/fo.xsl b/manual/src/xsl/fo.xsl
index d125c94..b9019bf 100644
--- a/manual/src/xsl/fo.xsl
+++ b/manual/src/xsl/fo.xsl
@@ -343,7 +343,7 @@
       <xsl:with-param name="master-reference">titlepage</xsl:with-param>
       <xsl:with-param name="content">
         <fo:block text-align="center" margin-top="5.0cm">
-          <fo:external-graphic src="url(images/qi4j-blue.png)"
+          <fo:external-graphic src="url(images/zest-blue.png)"
                                content-width="12cm"
                                content-height="2.94cm"
                                scaling="uniform"/>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/manual/src/xsl/head-offline.xsl
----------------------------------------------------------------------
diff --git a/manual/src/xsl/head-offline.xsl b/manual/src/xsl/head-offline.xsl
index 4e8a120..afe9dcb 100644
--- a/manual/src/xsl/head-offline.xsl
+++ b/manual/src/xsl/head-offline.xsl
@@ -22,15 +22,15 @@
 
 <!-- favicon -->
 
-<link rel="shortcut icon" href="http://qi4j.org/favicon.ico" type="image/vnd.microsoft.icon" />
-<link rel="icon" href="http://qi4j.org/favicon.ico" type="image/x-icon" />
+<link rel="shortcut icon" href="http://zest.apache.org/favicon.ico" type="image/vnd.microsoft.icon" />
+<link rel="icon" href="http://zest.apache.org/favicon.ico" type="image/x-icon" />
 
 <!-- style -->
 
 <link href="css/shCore.css" rel="stylesheet" type="text/css" />
 <link href="css/shCoreEclipse.css" rel="stylesheet" type="text/css" />
 <link href="css/shThemeEclipse.css" rel="stylesheet" type="text/css" />
-<link href="css/qi4j.css" rel="stylesheet" type="text/css" />
+<link href="css/zest.css" rel="stylesheet" type="text/css" />
 
 <!-- Syntax Highlighter -->
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/maven-compat.gradle
----------------------------------------------------------------------
diff --git a/maven-compat.gradle b/maven-compat.gradle
index 0387818..d6b22d7 100644
--- a/maven-compat.gradle
+++ b/maven-compat.gradle
@@ -86,7 +86,7 @@ uploadArchives {
             roles {
               role 'Core Team'
             }
-            organizationUrl 'http://www.qi4j.org'
+            organizationUrl 'http://zest.apache.org'
             timezone 'UTC+8'
           }
           developer {
@@ -108,7 +108,7 @@ uploadArchives {
             roles {
               role 'Core Team'
             }
-            organizationUrl 'http://www.qi4j.org'
+            organizationUrl 'http://zest.apache.org'
             timezone 'UTC+8'
           }
           developer {
@@ -118,7 +118,7 @@ uploadArchives {
             roles {
               role 'Core Team'
             }
-            organizationUrl 'http://www.qi4j.org'
+            organizationUrl 'http://zest.apache.org'
             timezone 'UTC+2'
           }
           developer {

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/samples/dci-cargo/dcisample_a/build.gradle
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/build.gradle b/samples/dci-cargo/dcisample_a/build.gradle
index 63927b4..636db8d 100644
--- a/samples/dci-cargo/dcisample_a/build.gradle
+++ b/samples/dci-cargo/dcisample_a/build.gradle
@@ -23,21 +23,21 @@ jar { manifest { name = "Apache Zest™ Sample DCI Cargo - Sample A" }}
 
 dependencies {
 
-  compile project( ':org.qi4j.core:org.qi4j.core.bootstrap' )
-  compile project( ':org.qi4j.libraries:org.qi4j.library.constraints' )
-  compile project( ':org.qi4j.libraries:org.qi4j.library.conversion' )
-  compile project( ':org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson' )
-  compile project( ':org.qi4j.extensions:org.qi4j.extension.indexing-rdf' )
-  compile project( ':org.qi4j.tools:org.qi4j.tool.envisage' )
+  compile project( ':org.apache.zest.core:org.apache.zest.core.bootstrap' )
+  compile project( ':org.apache.zest.libraries:org.apache.zest.library.constraints' )
+  compile project( ':org.apache.zest.libraries:org.apache.zest.library.conversion' )
+  compile project( ':org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson' )
+  compile project( ':org.apache.zest.extensions:org.apache.zest.extension.indexing-rdf' )
+  compile project( ':org.apache.zest.tools:org.apache.zest.tool.envisage' )
   compile libraries.jetty_webapp
   compile libraries.wicket
   compile libraries.wicket_devutils
   compile libraries.wicket_stateless
   compile libraries.slf4j_api
 
-  runtime project( ':org.qi4j.core:org.qi4j.core.runtime' )
+  runtime project( ':org.apache.zest.core:org.apache.zest.core.runtime' )
 
-  testCompile project( ':org.qi4j.core:org.qi4j.core.testsupport' )
+  testCompile project( ':org.apache.zest.core:org.apache.zest.core.testsupport' )
   testCompile libraries.easymock
 
   testRuntime libraries.logback
@@ -45,6 +45,6 @@ dependencies {
 }
 
 task(runSample, dependsOn: 'testClasses', type: JavaExec) {
-    main = 'org.qi4j.sample.dcicargo.sample_a.bootstrap.Start8081'
+    main = 'org.apache.zest.sample.dcicargo.sample_a.bootstrap.Start8081'
     classpath = sourceSets.test.runtimeClasspath
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/bootstrap/DCISampleApplication_a.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/bootstrap/DCISampleApplication_a.java b/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/bootstrap/DCISampleApplication_a.java
index 1819408..5b851f4 100644
--- a/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/bootstrap/DCISampleApplication_a.java
+++ b/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/bootstrap/DCISampleApplication_a.java
@@ -29,7 +29,7 @@ import org.apache.zest.sample.dcicargo.sample_a.communication.web.booking.Change
 import org.apache.zest.sample.dcicargo.sample_a.communication.web.booking.RouteCargoPage;
 import org.apache.zest.sample.dcicargo.sample_a.communication.web.handling.RegisterHandlingEventPage;
 import org.apache.zest.sample.dcicargo.sample_a.communication.web.tracking.TrackCargoPage;
-import org.apache.zest.sample.dcicargo.sample_a.infrastructure.WicketQi4jApplication;
+import org.apache.zest.sample.dcicargo.sample_a.infrastructure.WicketZestApplication;
 import org.apache.zest.sample.dcicargo.sample_a.infrastructure.wicket.tabs.TabsPanel;
 
 /**
@@ -38,7 +38,7 @@ import org.apache.zest.sample.dcicargo.sample_a.infrastructure.wicket.tabs.TabsP
  * A Wicket application backed by Zest.
  */
 public class DCISampleApplication_a
-    extends WicketQi4jApplication
+    extends WicketZestApplication
 {
     public void wicketInit()
     {

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/bootstrap/VisualizeApplicationStructure.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/bootstrap/VisualizeApplicationStructure.java b/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/bootstrap/VisualizeApplicationStructure.java
index 54aee78..9ca73e7 100644
--- a/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/bootstrap/VisualizeApplicationStructure.java
+++ b/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/bootstrap/VisualizeApplicationStructure.java
@@ -30,10 +30,10 @@ public class VisualizeApplicationStructure
     public static void main( String[] args )
         throws Exception
     {
-        Energy4Java qi4j = new Energy4Java();
+        Energy4Java zest = new Energy4Java();
         Assembler assembler = new Assembler();
-        ApplicationDescriptor applicationModel = qi4j.newApplicationModel( assembler );
-        applicationModel.newInstance( qi4j.spi() );
+        ApplicationDescriptor applicationModel = zest.newApplicationModel( assembler );
+        applicationModel.newInstance( zest.spi() );
 
         /*
        * The Envisage Swing app visualizes the application assemblage structure.

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/bootstrap/assembly/Assembler.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/bootstrap/assembly/Assembler.java b/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/bootstrap/assembly/Assembler.java
index 2bc58a8..81aeb10 100644
--- a/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/bootstrap/assembly/Assembler.java
+++ b/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/bootstrap/assembly/Assembler.java
@@ -74,7 +74,7 @@ import static org.apache.zest.api.structure.Application.Mode.development;
  *
  * A Zest application structure is declared by an assembly that defines which layers and modules
  * the application has and how they are allowed to depend on each other. Each layer could have it's
- * own assembly file in larger applications (read more at http://qi4j.org/latest/core-bootstrap-assembly.html).
+ * own assembly file in larger applications (read more at http://zest.apache.org/latest/core-bootstrap-assembly.html).
  *
  * The Zest assembly doesn't follow a strict 1-1 correlation between the directory hierarchy and
  * the assembly structures. An example is the Entities:
@@ -89,7 +89,7 @@ import static org.apache.zest.api.structure.Application.Mode.development;
  * layers above.
  *
  * So dependency structure layers (ie. as shown by Structure101) are not the same as Zest layers.
- * See more at http://qi4j.org/latest/core-bootstrap-assembly.html
+ * See more at http://zest.apache.org/latest/core-bootstrap-assembly.html
  *
  * TRY THIS: Run VisualizeApplicationStructure to see a cool visualization of the assembly below!
  */

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/communication/web/BasePage.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/communication/web/BasePage.java b/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/communication/web/BasePage.java
index 2964c4e..387d440 100644
--- a/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/communication/web/BasePage.java
+++ b/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/communication/web/BasePage.java
@@ -25,7 +25,7 @@ import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.markup.html.panel.Fragment;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.zest.sample.dcicargo.sample_a.infrastructure.WicketQi4jApplication;
+import org.apache.zest.sample.dcicargo.sample_a.infrastructure.WicketZestApplication;
 import org.apache.zest.sample.dcicargo.sample_a.infrastructure.wicket.page.BaseWebPage;
 import org.apache.zest.sample.dcicargo.sample_a.infrastructure.wicket.tabs.TabsPanel;
 
@@ -68,7 +68,7 @@ public class BasePage extends BaseWebPage
         add( toggleLinks );
         add( links.setOutputMarkupPlaceholderTag( true ).setVisible( false ) );
 
-        add( new Label( "version", ( (WicketQi4jApplication) getApplication() ).appVersion() ) );
+        add( new Label( "version", ( (WicketZestApplication) getApplication() ).appVersion() ) );
 
         add( new TabsPanel( activeTab ) );
     }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/WicketQi4jApplication.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/WicketQi4jApplication.java b/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/WicketQi4jApplication.java
deleted file mode 100644
index 2a7fc38..0000000
--- a/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/WicketQi4jApplication.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright 2011 Marc Grue.
- *
- * Licensed  under the  Apache License,  Version 2.0  (the "License");
- * you may not use  this file  except in  compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed  under the  License is distributed on an "AS IS" BASIS,
- * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.zest.sample.dcicargo.sample_a.infrastructure;
-
-import javax.servlet.http.HttpServletRequest;
-import org.apache.wicket.Page;
-import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.request.cycle.AbstractRequestCycleListener;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.zest.api.Qi4j;
-import org.apache.zest.api.composite.TransientBuilderFactory;
-import org.apache.zest.api.injection.scope.Service;
-import org.apache.zest.api.injection.scope.Structure;
-import org.apache.zest.api.query.QueryBuilderFactory;
-import org.apache.zest.api.structure.Application;
-import org.apache.zest.api.structure.Module;
-import org.apache.zest.api.unitofwork.ConcurrentEntityModificationException;
-import org.apache.zest.api.unitofwork.UnitOfWork;
-import org.apache.zest.api.unitofwork.UnitOfWorkCompletionException;
-import org.apache.zest.api.unitofwork.UnitOfWorkFactory;
-import org.apache.zest.api.usecase.UsecaseBuilder;
-import org.apache.zest.api.value.ValueBuilderFactory;
-import org.apache.zest.bootstrap.ApplicationAssembler;
-import org.apache.zest.bootstrap.Energy4Java;
-import org.apache.zest.sample.dcicargo.sample_a.infrastructure.conversion.EntityToDTOService;
-import org.apache.zest.sample.dcicargo.sample_a.infrastructure.dci.Context;
-import org.apache.zest.sample.dcicargo.sample_a.infrastructure.model.Queries;
-import org.apache.zest.sample.dcicargo.sample_a.infrastructure.model.ReadOnlyModel;
-import org.apache.zest.sample.dcicargo.sample_a.infrastructure.wicket.page.BaseWebPage;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Base Wicket Web Application containing the Zest application.
- */
-public class WicketQi4jApplication
-    extends WebApplication
-{
-    public Logger logger = LoggerFactory.getLogger( WicketQi4jApplication.class );
-
-    protected Application qi4jApp;
-    protected Module qi4jModule;
-
-    @Structure
-    protected UnitOfWorkFactory uowf;
-
-    @Structure
-    protected ValueBuilderFactory vbf;
-
-    @Structure
-    protected QueryBuilderFactory qbf;
-
-    @Structure
-    protected TransientBuilderFactory tbf;
-
-    @Structure
-    protected Qi4j qi4j;
-
-    @Service
-    protected EntityToDTOService valueConverter;
-
-    /**
-     * Zest Assembler
-     *
-     * To let the custom application class (DCISampleApplication_x) focus on starting up the
-     * Wicket environment, I made a convention of having Zest Assembler files in an 'assembly'
-     * folder beside the custom application class.
-     *
-     * There's always only one application file, but we could split the assemblage into several
-     * files ie. one for each layer. In that case, the Assembler file would be distributing to
-     * the individual LayerXAssembler classes.
-     *
-     * If you like, you can also override this method in the custom application class and simply
-     * return an instance of YourAssembler:
-     *
-     * &#64;Override protected ApplicationAssembler getAssembler() {
-     * return new YourAssemblerInAnyPath();
-     * }
-     */
-    protected ApplicationAssembler getAssembler()
-        throws Exception
-    {
-        String appPath = getClass().getCanonicalName();
-        String expectedPathFromApplication = ".assembly.Assembler";
-        String assemblerPath = appPath.substring( 0, appPath.lastIndexOf( "." ) ) + expectedPathFromApplication;
-        try
-        {
-            return (ApplicationAssembler) Class.forName( assemblerPath ).newInstance();
-        }
-        catch( ClassNotFoundException e )
-        {
-            throw new Exception( "Couldn't find Zest assembler in path '" + assemblerPath + "'" );
-        }
-    }
-
-    protected String defaultLayerName()
-    {
-        return "BOOTSTRAP";
-    }
-
-    protected String defaultModuleName()
-    {
-        return "BOOTSTRAP-Bootstrap";
-    }
-
-    // Override this to bootstrap the wicket application
-    protected void wicketInit()
-    {
-    }
-
-    @Override
-    protected void init()
-    {
-        startQi4j();
-        handleUnitOfWork();
-
-        Context.prepareContextBaseClass( uowf );
-        BaseWebPage.prepareBaseWebPageClass( tbf );
-        ReadOnlyModel.prepareModelBaseClass( qi4jModule, qi4j, valueConverter );
-        Queries.prepareQueriesBaseClass( uowf, qbf );
-
-        wicketInit();
-    }
-
-    private void startQi4j()
-    {
-        try
-        {
-            logger.info( "Starting Zest application" );
-            Energy4Java qi4j = new Energy4Java();
-            qi4jApp = qi4j.newApplication( getAssembler() );
-            qi4jApp.activate();
-            qi4jModule = qi4jApp.findModule( defaultLayerName(), defaultModuleName() );
-
-            // Zest injects @Structure and @Service elements into this application instance
-            //qi4jModule.newObject( WicketQi4jApplication.class );
-            qi4jModule.injectTo( this );
-
-            logger.info( "Started Zest application" );
-        }
-        catch( Exception e )
-        {
-            logger.error( "Could not start Zest application." );
-            e.printStackTrace();
-            System.exit( 100 );
-        }
-    }
-
-    private void handleUnitOfWork()
-    {
-        getRequestCycleListeners().add( new AbstractRequestCycleListener()
-        {
-            @Override
-            public void onBeginRequest( final RequestCycle requestCycle )
-            {
-                super.onBeginRequest( requestCycle );
-
-                logger.debug( "================================" );
-                logger.debug( "REQUEST start" );
-                logger.debug( requestCycle.getRequest().toString() );
-                logger.debug( requestCycle.getRequest().getRequestParameters().toString() );
-
-                UnitOfWork uow = uowf.newUnitOfWork( UsecaseBuilder.newUsecase( "REQUEST" ) );
-                logger.debug( "  ### NEW " + uow + "   ### MODULE: " + qi4jModule );
-            }
-
-            @Override
-            public void onEndRequest( final RequestCycle requestCycle )
-            {
-                UnitOfWork uow = uowf.currentUnitOfWork();
-                if( uow != null )
-                {
-                    try
-                    {
-                        if( "POST".equals( ( (HttpServletRequest) requestCycle.getRequest()
-                            .getContainerRequest() ).getMethod() ) )
-                        {
-                            // "Save"
-                            logger.debug( "  ### COMPLETE " + uow + "   ### MODULE: " + qi4jModule );
-                            uow.complete();
-                        }
-                        else
-                        {
-                            // GET requests
-                            logger.debug( "  ### DISCARD " + uow + "   ### MODULE: " + qi4jModule );
-                            uow.discard();
-                        }
-                    }
-                    catch( ConcurrentEntityModificationException e )
-                    {
-                        logger.error( "  ### DISCARD " + uow + "   ### MODULE: " + qi4jModule );
-                        uow.discard();
-                        e.printStackTrace();
-                    }
-                    catch( UnitOfWorkCompletionException e )
-                    {
-                        logger.error( "  ### DISCARD " + uow + "   ### MODULE: " + qi4jModule );
-                        uow.discard();
-                        e.printStackTrace();
-                    }
-                }
-                logger.debug( "REQUEST end" );
-                logger.debug( "------------------------------------" );
-            }
-        } );
-    }
-
-    // Since Zest can only add concrete classes in the assembly, we need to implement a (dummy) getHomePage()
-    // method here. Override in wicket application class with a real returned page class.
-    @Override
-    public Class<? extends Page> getHomePage()
-    {
-        return null;
-    }
-
-    @Override
-    protected void onDestroy()
-    {
-        if( qi4jApp == null )
-        {
-            return;
-        }
-
-        try
-        {
-            logger.info( "Passivating Zest application" );
-            qi4jApp.passivate();
-        }
-        catch( Exception e )
-        {
-            e.printStackTrace();
-        }
-    }
-
-    public String appVersion()
-    {
-        return qi4jApp.version();
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/WicketZestApplication.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/WicketZestApplication.java b/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/WicketZestApplication.java
new file mode 100644
index 0000000..3e43885
--- /dev/null
+++ b/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/WicketZestApplication.java
@@ -0,0 +1,254 @@
+/*
+ * Copyright 2011 Marc Grue.
+ *
+ * Licensed  under the  Apache License,  Version 2.0  (the "License");
+ * you may not use  this file  except in  compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed  under the  License is distributed on an "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.zest.sample.dcicargo.sample_a.infrastructure;
+
+import javax.servlet.http.HttpServletRequest;
+import org.apache.wicket.Page;
+import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.request.cycle.AbstractRequestCycleListener;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.zest.api.ZestAPI;
+import org.apache.zest.api.composite.TransientBuilderFactory;
+import org.apache.zest.api.injection.scope.Service;
+import org.apache.zest.api.injection.scope.Structure;
+import org.apache.zest.api.query.QueryBuilderFactory;
+import org.apache.zest.api.structure.Application;
+import org.apache.zest.api.structure.Module;
+import org.apache.zest.api.unitofwork.ConcurrentEntityModificationException;
+import org.apache.zest.api.unitofwork.UnitOfWork;
+import org.apache.zest.api.unitofwork.UnitOfWorkCompletionException;
+import org.apache.zest.api.unitofwork.UnitOfWorkFactory;
+import org.apache.zest.api.usecase.UsecaseBuilder;
+import org.apache.zest.api.value.ValueBuilderFactory;
+import org.apache.zest.bootstrap.ApplicationAssembler;
+import org.apache.zest.bootstrap.Energy4Java;
+import org.apache.zest.sample.dcicargo.sample_a.infrastructure.conversion.EntityToDTOService;
+import org.apache.zest.sample.dcicargo.sample_a.infrastructure.dci.Context;
+import org.apache.zest.sample.dcicargo.sample_a.infrastructure.model.Queries;
+import org.apache.zest.sample.dcicargo.sample_a.infrastructure.model.ReadOnlyModel;
+import org.apache.zest.sample.dcicargo.sample_a.infrastructure.wicket.page.BaseWebPage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Base Wicket Web Application containing the Zest application.
+ */
+public class WicketZestApplication
+    extends WebApplication
+{
+    public Logger logger = LoggerFactory.getLogger( WicketZestApplication.class );
+
+    protected Application zestApp;
+    protected Module zestModule;
+
+    @Structure
+    protected UnitOfWorkFactory uowf;
+
+    @Structure
+    protected ValueBuilderFactory vbf;
+
+    @Structure
+    protected QueryBuilderFactory qbf;
+
+    @Structure
+    protected TransientBuilderFactory tbf;
+
+    @Structure
+    protected ZestAPI api;
+
+    @Service
+    protected EntityToDTOService valueConverter;
+
+    /**
+     * Zest Assembler
+     *
+     * To let the custom application class (DCISampleApplication_x) focus on starting up the
+     * Wicket environment, I made a convention of having Zest Assembler files in an 'assembly'
+     * folder beside the custom application class.
+     *
+     * There's always only one application file, but we could split the assemblage into several
+     * files ie. one for each layer. In that case, the Assembler file would be distributing to
+     * the individual LayerXAssembler classes.
+     *
+     * If you like, you can also override this method in the custom application class and simply
+     * return an instance of YourAssembler:
+     *
+     * &#64;Override protected ApplicationAssembler getAssembler() {
+     * return new YourAssemblerInAnyPath();
+     * }
+     */
+    protected ApplicationAssembler getAssembler()
+        throws Exception
+    {
+        String appPath = getClass().getCanonicalName();
+        String expectedPathFromApplication = ".assembly.Assembler";
+        String assemblerPath = appPath.substring( 0, appPath.lastIndexOf( "." ) ) + expectedPathFromApplication;
+        try
+        {
+            return (ApplicationAssembler) Class.forName( assemblerPath ).newInstance();
+        }
+        catch( ClassNotFoundException e )
+        {
+            throw new Exception( "Couldn't find Zest assembler in path '" + assemblerPath + "'" );
+        }
+    }
+
+    protected String defaultLayerName()
+    {
+        return "BOOTSTRAP";
+    }
+
+    protected String defaultModuleName()
+    {
+        return "BOOTSTRAP-Bootstrap";
+    }
+
+    // Override this to bootstrap the wicket application
+    protected void wicketInit()
+    {
+    }
+
+    @Override
+    protected void init()
+    {
+        startZest();
+        handleUnitOfWork();
+
+        Context.prepareContextBaseClass( uowf );
+        BaseWebPage.prepareBaseWebPageClass( tbf );
+        ReadOnlyModel.prepareModelBaseClass( zestModule, api, valueConverter );
+        Queries.prepareQueriesBaseClass( uowf, qbf );
+
+        wicketInit();
+    }
+
+    private void startZest()
+    {
+        try
+        {
+            logger.info( "Starting Zest application" );
+            Energy4Java zest = new Energy4Java();
+            zestApp = zest.newApplication( getAssembler() );
+            zestApp.activate();
+            zestModule = zestApp.findModule( defaultLayerName(), defaultModuleName() );
+
+            // Zest injects @Structure and @Service elements into this application instance
+            //zestModule.newObject( WicketZestApplication.class );
+            zestModule.injectTo( this );
+
+            logger.info( "Started Zest application" );
+        }
+        catch( Exception e )
+        {
+            logger.error( "Could not start Zest application." );
+            e.printStackTrace();
+            System.exit( 100 );
+        }
+    }
+
+    private void handleUnitOfWork()
+    {
+        getRequestCycleListeners().add( new AbstractRequestCycleListener()
+        {
+            @Override
+            public void onBeginRequest( final RequestCycle requestCycle )
+            {
+                super.onBeginRequest( requestCycle );
+
+                logger.debug( "================================" );
+                logger.debug( "REQUEST start" );
+                logger.debug( requestCycle.getRequest().toString() );
+                logger.debug( requestCycle.getRequest().getRequestParameters().toString() );
+
+                UnitOfWork uow = uowf.newUnitOfWork( UsecaseBuilder.newUsecase( "REQUEST" ) );
+                logger.debug( "  ### NEW " + uow + "   ### MODULE: " + zestModule );
+            }
+
+            @Override
+            public void onEndRequest( final RequestCycle requestCycle )
+            {
+                UnitOfWork uow = uowf.currentUnitOfWork();
+                if( uow != null )
+                {
+                    try
+                    {
+                        if( "POST".equals( ( (HttpServletRequest) requestCycle.getRequest()
+                            .getContainerRequest() ).getMethod() ) )
+                        {
+                            // "Save"
+                            logger.debug( "  ### COMPLETE " + uow + "   ### MODULE: " + zestModule );
+                            uow.complete();
+                        }
+                        else
+                        {
+                            // GET requests
+                            logger.debug( "  ### DISCARD " + uow + "   ### MODULE: " + zestModule );
+                            uow.discard();
+                        }
+                    }
+                    catch( ConcurrentEntityModificationException e )
+                    {
+                        logger.error( "  ### DISCARD " + uow + "   ### MODULE: " + zestModule );
+                        uow.discard();
+                        e.printStackTrace();
+                    }
+                    catch( UnitOfWorkCompletionException e )
+                    {
+                        logger.error( "  ### DISCARD " + uow + "   ### MODULE: " + zestModule );
+                        uow.discard();
+                        e.printStackTrace();
+                    }
+                }
+                logger.debug( "REQUEST end" );
+                logger.debug( "------------------------------------" );
+            }
+        } );
+    }
+
+    // Since Zest can only add concrete classes in the assembly, we need to implement a (dummy) getHomePage()
+    // method here. Override in wicket application class with a real returned page class.
+    @Override
+    public Class<? extends Page> getHomePage()
+    {
+        return null;
+    }
+
+    @Override
+    protected void onDestroy()
+    {
+        if( zestApp == null )
+        {
+            return;
+        }
+
+        try
+        {
+            logger.info( "Passivating Zest application" );
+            zestApp.passivate();
+        }
+        catch( Exception e )
+        {
+            e.printStackTrace();
+        }
+    }
+
+    public String appVersion()
+    {
+        return zestApp.version();
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/conversion/EntityToDTOService.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/conversion/EntityToDTOService.java b/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/conversion/EntityToDTOService.java
index 5fac157..5316f48 100644
--- a/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/conversion/EntityToDTOService.java
+++ b/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/conversion/EntityToDTOService.java
@@ -41,14 +41,14 @@ import org.apache.zest.api.value.ValueDescriptor;
 import org.apache.zest.functional.Function;
 import org.apache.zest.functional.Iterables;
 import org.apache.zest.library.conversion.values.Unqualified;
-import org.apache.zest.spi.Qi4jSPI;
+import org.apache.zest.spi.ZestSPI;
 
 /**
  * Conversion of Entity objects to DTO's
  *
  * Value composites that extend {@link DTO} will have association properties converted recursively.
  *
- * Modification of {org.qi4j.library.conversion.values.EntityToValue}
+ * Modification of {org.apache.zest.library.conversion.values.EntityToValue}
  * WARN No support of NamedAssociations
  */
 @SuppressWarnings( "unchecked" )
@@ -65,7 +65,7 @@ public interface EntityToDTOService
         private ValueBuilderFactory vbf;
 
         @Structure
-        private Qi4jSPI spi;
+        private ZestSPI spi;
 
         @Structure
         private Module module;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/model/JSONModel.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/model/JSONModel.java b/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/model/JSONModel.java
index afdb48c..3f858a4 100644
--- a/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/model/JSONModel.java
+++ b/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/model/JSONModel.java
@@ -46,7 +46,7 @@ public class JSONModel<T, U extends ValueComposite>
         }
 
         // Get ValueComposite interface
-        Class<U> valueCompositeClass = (Class<U>) qi4j.valueDescriptorFor( value ).valueType().mainType();
+        Class<U> valueCompositeClass = (Class<U>) api.valueDescriptorFor( value ).valueType().mainType();
 
         return new JSONModel<T, U>( value, valueCompositeClass );
     }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/model/ReadOnlyModel.java
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/model/ReadOnlyModel.java b/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/model/ReadOnlyModel.java
index a61b2ea..42d0e9b 100644
--- a/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/model/ReadOnlyModel.java
+++ b/samples/dci-cargo/dcisample_a/src/main/java/org/apache/zest/sample/dcicargo/sample_a/infrastructure/model/ReadOnlyModel.java
@@ -18,7 +18,7 @@
 package org.apache.zest.sample.dcicargo.sample_a.infrastructure.model;
 
 import org.apache.wicket.model.IModel;
-import org.apache.zest.api.Qi4j;
+import org.apache.zest.api.ZestAPI;
 import org.apache.zest.api.structure.Module;
 import org.apache.zest.sample.dcicargo.sample_a.infrastructure.conversion.EntityToDTOService;
 
@@ -31,7 +31,7 @@ public abstract class ReadOnlyModel<T>
     private static final long serialVersionUID = 1L;
 
     static protected EntityToDTOService valueConverter;
-    static protected Qi4j qi4j;
+    static protected ZestAPI api;
     static protected Module module;
 
     /**
@@ -58,12 +58,12 @@ public abstract class ReadOnlyModel<T>
     }
 
     public static void prepareModelBaseClass( Module m,
-                                              Qi4j api,
+                                              ZestAPI api,
                                               EntityToDTOService entityToDTO
     )
     {
         module = m;
-        qi4j = api;
+        ReadOnlyModel.api = api;
         valueConverter = entityToDTO;
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/samples/dci-cargo/dcisample_a/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/log4j.properties b/samples/dci-cargo/dcisample_a/src/main/resources/log4j.properties
index 02c5759..41819e2 100644
--- a/samples/dci-cargo/dcisample_a/src/main/resources/log4j.properties
+++ b/samples/dci-cargo/dcisample_a/src/main/resources/log4j.properties
@@ -26,4 +26,4 @@ log4j.rootLogger=INFO,Stdout
 #log4j.logger.org.apache.wicket.RequestCycle=DEBUG
 #log4j.logger.org.apache.wicket.util.resource=DEBUG
 
-#log4j.logger.org.qi4j.index.rdf.query.internal.RdfQueryParserImpl=DEBUG, Stdout
\ No newline at end of file
+#log4j.logger.org.apache.zest.index.rdf.query.internal.RdfQueryParserImpl=DEBUG, Stdout
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/BasePage.html
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/BasePage.html b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/BasePage.html
index 87ec4f6..474c76e 100644
--- a/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/BasePage.html
+++ b/samples/dci-cargo/dcisample_a/src/main/resources/org/apache/zest/sample/dcicargo/sample_a/communication/web/BasePage.html
@@ -24,7 +24,7 @@
 <div class="left">
     <div class="headline"><a href="/">DCI sample</a></div>
     <div id="toggle">
-        <a href="#" class="closed" wicket:id="toggleLinks">Qi4j/Wicket port of the DDD sample application to the DCI
+        <a href="#" class="closed" wicket:id="toggleLinks">Zest/Wicket port of the DDD sample application to the DCI
             paradigm.</a>
     </div>
 
@@ -36,8 +36,8 @@
             <tr>
                 <td>DCI</td>
                 <td>DDD</td>
-                <td>Qi4j</td>
-                <td>Wicket</td>
+                <td>Apache Zest</td>
+                <td>Apache Wicket</td>
                 <td>Marc Grue</td>
             </tr>
             </thead>
@@ -92,7 +92,7 @@
 </div>
 
 <div class="right">
-    <b>Java-Qi4j-Wicket<br>
+    <b>Java-Zest-Wicket<br>
         Version <span wicket:id="version">[X.Y.Z]</span></b><br>
     Created 2011-10-04<br>
     Modified 2011-10-04<br>


Mime
View raw message