polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject [70/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:09 GMT
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rdf/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/rdf/build.gradle b/libraries/rdf/build.gradle
index dff55b5..2ee3889 100644
--- a/libraries/rdf/build.gradle
+++ b/libraries/rdf/build.gradle
@@ -22,9 +22,9 @@ description = "Apache Zest™ RDF Library provides commonalities of various RDF
 jar { manifest { name = "Apache Zest™ Library - RDF" }}
 
 dependencies {
-  compile(project(":org.qi4j.core:org.qi4j.core.spi"))
-  compile(project(':org.qi4j.libraries:org.qi4j.library.constraints'))
-  compile(project(":org.qi4j.libraries:org.qi4j.library.fileconfig"))
+  compile(project(":org.apache.zest.core:org.apache.zest.core.spi"))
+  compile(project(':org.apache.zest.libraries:org.apache.zest.library.constraints'))
+  compile(project(":org.apache.zest.libraries:org.apache.zest.library.fileconfig"))
   compile(libraries.sesame)
 //  compile("org.openrdf.sesame:sesame-model:$rdfVersion")
 //  compile("org.openrdf.sesame:sesame-repository-dataset:$rdfVersion")
@@ -35,9 +35,9 @@ dependencies {
 //  compile("org.openrdf.sesame:sesame-sail-nativerdf:$rdfVersion")
 //  compile("org.openrdf.sesame:sesame-sail-rdbms:$rdfVersion")
 
-  testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport"))
-  testCompile project( ':org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson' )
+  testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport"))
+  testCompile project( ':org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson' )
 
-  testRuntime(project(":org.qi4j.core:org.qi4j.core.runtime"))
+  testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime"))
   testRuntime(libraries.logback)
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rdf/dev-status.xml
----------------------------------------------------------------------
diff --git a/libraries/rdf/dev-status.xml b/libraries/rdf/dev-status.xml
index f8669b1..50d4630 100644
--- a/libraries/rdf/dev-status.xml
+++ b/libraries/rdf/dev-status.xml
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
+<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
-        http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
+        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
   <status>
     <!--none,early,beta,stable,mature-->
     <codebase>stable</codebase>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rdf/src/main/java/org/apache/zest/library/rdf/Qi4jEntity.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/Qi4jEntity.java b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/Qi4jEntity.java
deleted file mode 100644
index 5355a66..0000000
--- a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/Qi4jEntity.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2007, Rickard Öberg. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.zest.library.rdf;
-
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-
-
-/**
- * This is the RDF vocabulary for Zest Entity data.
- */
-public interface Qi4jEntity
-{
-    // Model
-    String NAMESPACE = "http://www.qi4j.org/rdf/entity/1.0/";
-
-    // Types
-    URI ENTITY = new URIImpl( NAMESPACE + "entity" );
-    URI ENTITYTYPEREFERENCE = new URIImpl( NAMESPACE + "entitytypereference" );
-    URI QUALIFIER = new URIImpl( NAMESPACE + "qualifier" );
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rdf/src/main/java/org/apache/zest/library/rdf/Qi4jEntityType.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/Qi4jEntityType.java b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/Qi4jEntityType.java
deleted file mode 100644
index 6a06c74..0000000
--- a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/Qi4jEntityType.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2007, Rickard Öberg. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.zest.library.rdf;
-
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-
-
-/**
- * This is the RDF vocabulary for Zest EntityType data.
- */
-public interface Qi4jEntityType
-{
-    // Namespace
-    String NAMESPACE = "http://www.qi4j.org/rdf/entitytype/1.0/";
-
-    // Predicates
-    URI QUERYABLE = new URIImpl( NAMESPACE + "queryable" );
-    URI VERSION = new URIImpl( NAMESPACE + "version" );
-    URI TYPE = new URIImpl( NAMESPACE + "type" );
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rdf/src/main/java/org/apache/zest/library/rdf/Qi4jRdf.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/Qi4jRdf.java b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/Qi4jRdf.java
deleted file mode 100644
index 5daaf2f..0000000
--- a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/Qi4jRdf.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2007, Rickard Öberg. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.zest.library.rdf;
-
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-
-
-/**
- * This is the RDF vocabulary for Zest.
- */
-public interface Qi4jRdf
-{
-
-    // MODEL
-    // Namespace TODO: Need to figure out what these should really be!
-    String QI4JMODEL = "http://www.qi4j.org/rdf/model/1.0/";
-
-    String QI4JMODEL_TYPES = "http://www.qi4j.org/rdf/model/1.0/type#";
-    String QI4JMODEL_RELATIONSHIPS = "http://www.qi4j.org/rdf/module/1.0/";
-    String QI4JMODEL_PROPERTIES = "http://www.qi4j.org/rdf/model/1.0/property#";
-
-    // Types
-    URI TYPE_APPLICATION = new URIImpl( QI4JMODEL_TYPES + "application" );
-    URI TYPE_LAYER = new URIImpl( QI4JMODEL_TYPES + "layer" );
-    URI TYPE_MODULE = new URIImpl( QI4JMODEL_TYPES + "module" );
-    URI TYPE_ENTITY = new URIImpl( QI4JMODEL_TYPES + "entity" );
-    URI TYPE_QUALIFIER = new URIImpl( QI4JMODEL_TYPES + "qualifier" );
-    URI TYPE_COMPOSITE = new URIImpl( QI4JMODEL_TYPES + "composite" );
-    URI TYPE_SERVICE = new URIImpl( QI4JMODEL_TYPES + "service" );
-    URI TYPE_METHOD = new URIImpl( QI4JMODEL_TYPES + "method" );
-    URI TYPE_CONSTRAINT = new URIImpl( QI4JMODEL_TYPES + "constraint" );
-    URI TYPE_CONCERN = new URIImpl( QI4JMODEL_TYPES + "concern" );
-    URI TYPE_CONSTRUCTOR = new URIImpl( QI4JMODEL_TYPES + "constructor" );
-    URI TYPE_SIDEEFFECT = new URIImpl( QI4JMODEL_TYPES + "sideeffect" );
-    URI TYPE_MIXIN = new URIImpl( QI4JMODEL_TYPES + "mixin" );
-    URI TYPE_FIELD = new URIImpl( QI4JMODEL_TYPES + "field" );
-    URI TYPE_CLASS = new URIImpl( QI4JMODEL_TYPES + "class" );
-    URI TYPE_OBJECT = new URIImpl( QI4JMODEL_TYPES + "object" );
-    URI TYPE_PARAMETER = new URIImpl( QI4JMODEL_TYPES + "parameter" );
-    URI TYPE_INJECTION = new URIImpl( QI4JMODEL_TYPES + "injection" );
-    URI TYPE_INFO = new URIImpl( QI4JMODEL_TYPES + "info" );
-
-    // Properties
-    URI HAS_INJECTIONS = new URIImpl( QI4JMODEL_PROPERTIES + "hasinjections" );
-
-    // Relationship
-    URI RELATIONSHIP_COMPOSITE = new URIImpl( QI4JMODEL_RELATIONSHIPS + "composite" );
-    URI RELATIONSHIP_ENTITY = new URIImpl( QI4JMODEL_RELATIONSHIPS + "entity" );
-    URI RELATIONSHIP_SERVICE = new URIImpl( QI4JMODEL_RELATIONSHIPS + "service" );
-    URI RELATIONSHIP_OBJECT = new URIImpl( QI4JMODEL_RELATIONSHIPS + "object" );
-    URI RELATIONSHIP_PRIVATE_METHOD = new URIImpl( QI4JMODEL_RELATIONSHIPS + "private/method" );
-    URI RELATIONSHIP_INJECTION = new URIImpl( QI4JMODEL_RELATIONSHIPS + "injection" );
-    URI RELATIONSHIP_CONSTRUCTOR = new URIImpl( QI4JMODEL_RELATIONSHIPS + "constructor" );
-    URI RELATIONSHIP_FIELD = new URIImpl( QI4JMODEL_RELATIONSHIPS + "field" );
-    URI RELATIONSHIP_APPLIESTO = new URIImpl( QI4JMODEL_RELATIONSHIPS + "appliesto" );
-    URI RELATIONSHIP_METHOD = new URIImpl( QI4JMODEL_RELATIONSHIPS + "method" );
-    URI RELATIONSHIP_CONSTRAINT = new URIImpl( QI4JMODEL_RELATIONSHIPS + "constraint" );
-    URI RELATIONSHIP_CONCERN = new URIImpl( QI4JMODEL_RELATIONSHIPS + "concern" );
-    URI RELATIONSHIP_SIDEEFFECT = new URIImpl( QI4JMODEL_RELATIONSHIPS + "sideeffect" );
-    URI RELATIONSHIP_PUBLIC_SERVICE = new URIImpl( QI4JMODEL_RELATIONSHIPS + "public/service" );
-    URI RELATIONSHIP_PRIVATE_SERVICE = new URIImpl( QI4JMODEL_RELATIONSHIPS + "private/service" );
-    URI RELATIONSHIP_PROVIDEDBY = new URIImpl( QI4JMODEL_RELATIONSHIPS + "providedby" );
-    URI RELATIONSHIP_SERVICEINFO = new URIImpl( QI4JMODEL_RELATIONSHIPS + "info/service" );
-    URI RELATIONSHIP_INFOVALUE = new URIImpl( QI4JMODEL_RELATIONSHIPS + "info/value" );
-    URI RELATIONSHIP_MIXIN = new URIImpl( QI4JMODEL_RELATIONSHIPS + "mixin" );
-    URI RELATIONSHIP_LAYER = new URIImpl( QI4JMODEL_RELATIONSHIPS + "layer" );
-    URI RELATIONSHIP_MODULE = new URIImpl( QI4JMODEL_RELATIONSHIPS + "module" );
-}

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rdf/src/main/java/org/apache/zest/library/rdf/ZestEntity.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/ZestEntity.java b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/ZestEntity.java
new file mode 100644
index 0000000..c802f3a
--- /dev/null
+++ b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/ZestEntity.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2007, Rickard Öberg. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.zest.library.rdf;
+
+import org.openrdf.model.URI;
+import org.openrdf.model.impl.URIImpl;
+
+
+/**
+ * This is the RDF vocabulary for Zest Entity data.
+ */
+public interface ZestEntity
+{
+    // Model
+    String NAMESPACE = "http://zest.apache.org/rdf/entity/1.0/";
+
+    // Types
+    URI ENTITY = new URIImpl( NAMESPACE + "entity" );
+    URI ENTITYTYPEREFERENCE = new URIImpl( NAMESPACE + "entitytypereference" );
+    URI QUALIFIER = new URIImpl( NAMESPACE + "qualifier" );
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rdf/src/main/java/org/apache/zest/library/rdf/ZestEntityType.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/ZestEntityType.java b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/ZestEntityType.java
new file mode 100644
index 0000000..a42cd2d
--- /dev/null
+++ b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/ZestEntityType.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2007, Rickard Öberg. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.zest.library.rdf;
+
+import org.openrdf.model.URI;
+import org.openrdf.model.impl.URIImpl;
+
+
+/**
+ * This is the RDF vocabulary for Zest EntityType data.
+ */
+public interface ZestEntityType
+{
+    // Namespace
+    String NAMESPACE = "http://zest.apache.org/rdf/entitytype/1.0/";
+
+    // Predicates
+    URI QUERYABLE = new URIImpl( NAMESPACE + "queryable" );
+    URI VERSION = new URIImpl( NAMESPACE + "version" );
+    URI TYPE = new URIImpl( NAMESPACE + "type" );
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rdf/src/main/java/org/apache/zest/library/rdf/ZestRdf.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/ZestRdf.java b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/ZestRdf.java
new file mode 100644
index 0000000..531bdbe
--- /dev/null
+++ b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/ZestRdf.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2007, Rickard Öberg. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.zest.library.rdf;
+
+import org.openrdf.model.URI;
+import org.openrdf.model.impl.URIImpl;
+
+
+/**
+ * This is the RDF vocabulary for Zest.
+ */
+public interface ZestRdf
+{
+
+    // MODEL
+    // Namespace TODO: Need to figure out what these should really be!
+    String ZEST_MODEL = "http://zest.apache.org/rdf/model/1.0/";
+
+    String ZEST_MODEL_TYPES = "http://zest.apache.org/rdf/model/1.0/type#";
+    String ZEST_MODEL_RELATIONSHIPS = "http://zest.apache.org/rdf/module/1.0/";
+    String ZEST_MODEL_PROPERTIES = "http://zest.apache.org/rdf/model/1.0/property#";
+
+    // Types
+    URI TYPE_APPLICATION = new URIImpl( ZEST_MODEL_TYPES + "application" );
+    URI TYPE_LAYER = new URIImpl( ZEST_MODEL_TYPES + "layer" );
+    URI TYPE_MODULE = new URIImpl( ZEST_MODEL_TYPES + "module" );
+    URI TYPE_ENTITY = new URIImpl( ZEST_MODEL_TYPES + "entity" );
+    URI TYPE_QUALIFIER = new URIImpl( ZEST_MODEL_TYPES + "qualifier" );
+    URI TYPE_COMPOSITE = new URIImpl( ZEST_MODEL_TYPES + "composite" );
+    URI TYPE_SERVICE = new URIImpl( ZEST_MODEL_TYPES + "service" );
+    URI TYPE_METHOD = new URIImpl( ZEST_MODEL_TYPES + "method" );
+    URI TYPE_CONSTRAINT = new URIImpl( ZEST_MODEL_TYPES + "constraint" );
+    URI TYPE_CONCERN = new URIImpl( ZEST_MODEL_TYPES + "concern" );
+    URI TYPE_CONSTRUCTOR = new URIImpl( ZEST_MODEL_TYPES + "constructor" );
+    URI TYPE_SIDEEFFECT = new URIImpl( ZEST_MODEL_TYPES + "sideeffect" );
+    URI TYPE_MIXIN = new URIImpl( ZEST_MODEL_TYPES + "mixin" );
+    URI TYPE_FIELD = new URIImpl( ZEST_MODEL_TYPES + "field" );
+    URI TYPE_CLASS = new URIImpl( ZEST_MODEL_TYPES + "class" );
+    URI TYPE_OBJECT = new URIImpl( ZEST_MODEL_TYPES + "object" );
+    URI TYPE_PARAMETER = new URIImpl( ZEST_MODEL_TYPES + "parameter" );
+    URI TYPE_INJECTION = new URIImpl( ZEST_MODEL_TYPES + "injection" );
+    URI TYPE_INFO = new URIImpl( ZEST_MODEL_TYPES + "info" );
+
+    // Properties
+    URI HAS_INJECTIONS = new URIImpl( ZEST_MODEL_PROPERTIES + "hasinjections" );
+
+    // Relationship
+    URI RELATIONSHIP_COMPOSITE = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "composite" );
+    URI RELATIONSHIP_ENTITY = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "entity" );
+    URI RELATIONSHIP_SERVICE = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "service" );
+    URI RELATIONSHIP_OBJECT = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "object" );
+    URI RELATIONSHIP_PRIVATE_METHOD = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "private/method" );
+    URI RELATIONSHIP_INJECTION = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "injection" );
+    URI RELATIONSHIP_CONSTRUCTOR = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "constructor" );
+    URI RELATIONSHIP_FIELD = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "field" );
+    URI RELATIONSHIP_APPLIESTO = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "appliesto" );
+    URI RELATIONSHIP_METHOD = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "method" );
+    URI RELATIONSHIP_CONSTRAINT = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "constraint" );
+    URI RELATIONSHIP_CONCERN = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "concern" );
+    URI RELATIONSHIP_SIDEEFFECT = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "sideeffect" );
+    URI RELATIONSHIP_PUBLIC_SERVICE = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "public/service" );
+    URI RELATIONSHIP_PRIVATE_SERVICE = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "private/service" );
+    URI RELATIONSHIP_PROVIDEDBY = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "providedby" );
+    URI RELATIONSHIP_SERVICEINFO = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "info/service" );
+    URI RELATIONSHIP_INFOVALUE = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "info/value" );
+    URI RELATIONSHIP_MIXIN = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "mixin" );
+    URI RELATIONSHIP_LAYER = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "layer" );
+    URI RELATIONSHIP_MODULE = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "module" );
+}

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rdf/src/main/java/org/apache/zest/library/rdf/entity/EntityStateSerializer.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/entity/EntityStateSerializer.java b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/entity/EntityStateSerializer.java
index be48cd3..3672276 100644
--- a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/entity/EntityStateSerializer.java
+++ b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/entity/EntityStateSerializer.java
@@ -25,7 +25,7 @@ import org.openrdf.model.Statement;
 import org.openrdf.model.URI;
 import org.openrdf.model.ValueFactory;
 import org.openrdf.model.impl.GraphImpl;
-import org.apache.zest.api.Qi4j;
+import org.apache.zest.api.ZestAPI;
 import org.apache.zest.api.association.AssociationDescriptor;
 import org.apache.zest.api.composite.Composite;
 import org.apache.zest.api.entity.EntityDescriptor;
@@ -167,7 +167,7 @@ public class EntityStateSerializer
 
         for( PropertyDescriptor persistentProperty : ( (ValueCompositeType) valueType ).properties() )
         {
-            Object propertyValue = Qi4j.FUNCTION_COMPOSITE_INSTANCE_OF
+            Object propertyValue = ZestAPI.FUNCTION_COMPOSITE_INSTANCE_OF
                 .map( (Composite) value )
                 .state()
                 .propertyFor( persistentProperty.accessor() )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rdf/src/main/java/org/apache/zest/library/rdf/entity/EntityTypeSerializer.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/entity/EntityTypeSerializer.java b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/entity/EntityTypeSerializer.java
index 7f189f9..a333eab 100644
--- a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/entity/EntityTypeSerializer.java
+++ b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/entity/EntityTypeSerializer.java
@@ -35,7 +35,7 @@ import org.apache.zest.api.association.AssociationDescriptor;
 import org.apache.zest.api.entity.EntityDescriptor;
 import org.apache.zest.api.property.PropertyDescriptor;
 import org.apache.zest.api.util.Classes;
-import org.apache.zest.library.rdf.Qi4jEntityType;
+import org.apache.zest.library.rdf.ZestEntityType;
 import org.apache.zest.library.rdf.Rdfs;
 
 import static org.apache.zest.functional.Iterables.first;
@@ -74,8 +74,8 @@ public class EntityTypeSerializer
         graph.add( entityTypeUri, Rdfs.TYPE, Rdfs.CLASS );
         graph.add( entityTypeUri, Rdfs.TYPE, OWL.CLASS );
 
-        graph.add( entityTypeUri, Qi4jEntityType.TYPE, values.createLiteral( first( entityDescriptor.types() ).toString() ) );
-        graph.add( entityTypeUri, Qi4jEntityType.QUERYABLE, values.createLiteral( entityDescriptor.queryable() ) );
+        graph.add( entityTypeUri, ZestEntityType.TYPE, values.createLiteral( first( entityDescriptor.types() ).toString() ) );
+        graph.add( entityTypeUri, ZestEntityType.QUERYABLE, values.createLiteral( entityDescriptor.queryable() ) );
 
         serializeMixinTypes( entityDescriptor, graph, entityTypeUri );
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rdf/src/main/java/org/apache/zest/library/rdf/model/ApplicationVisitor.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/model/ApplicationVisitor.java b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/model/ApplicationVisitor.java
index 3385e00..5c51b09 100644
--- a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/model/ApplicationVisitor.java
+++ b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/model/ApplicationVisitor.java
@@ -22,7 +22,7 @@ import org.apache.zest.api.structure.ApplicationDescriptor;
 import org.apache.zest.api.structure.LayerDescriptor;
 import org.apache.zest.api.structure.ModuleDescriptor;
 import org.apache.zest.functional.HierarchicalVisitorAdapter;
-import org.apache.zest.library.rdf.Qi4jRdf;
+import org.apache.zest.library.rdf.ZestRdf;
 import org.apache.zest.library.rdf.serializer.SerializerContext;
 
 import static org.apache.zest.functional.Iterables.first;
@@ -55,56 +55,56 @@ class ApplicationVisitor extends HierarchicalVisitorAdapter<Object, Object, Runt
         {
             ApplicationDescriptor applicationDescriptor = (ApplicationDescriptor) visited;
             appUri = context.createApplicationUri( applicationDescriptor.name() );
-            context.setNameAndType( appUri, applicationDescriptor.name(), Qi4jRdf.TYPE_APPLICATION );
+            context.setNameAndType( appUri, applicationDescriptor.name(), ZestRdf.TYPE_APPLICATION );
         }
 
         if( visited instanceof LayerDescriptor )
         {
             LayerDescriptor layerDescriptor = (LayerDescriptor) visited;
             layerUri = context.createLayerUri( appUri, layerDescriptor.name() );
-            context.setNameAndType( layerUri, layerDescriptor.name(), Qi4jRdf.TYPE_LAYER );
-            context.addRelationship( appUri, Qi4jRdf.RELATIONSHIP_LAYER, layerUri );
+            context.setNameAndType( layerUri, layerDescriptor.name(), ZestRdf.TYPE_LAYER );
+            context.addRelationship( appUri, ZestRdf.RELATIONSHIP_LAYER, layerUri );
         }
 
         if( visited instanceof ModuleDescriptor )
         {
             ModuleDescriptor moduleDescriptor = (ModuleDescriptor) visited;
             moduleUri = context.createModuleUri( layerUri, moduleDescriptor.name() );
-            context.setNameAndType( layerUri, moduleDescriptor.name(), Qi4jRdf.TYPE_MODULE );
+            context.setNameAndType( layerUri, moduleDescriptor.name(), ZestRdf.TYPE_MODULE );
 
-            context.addRelationship( layerUri, Qi4jRdf.RELATIONSHIP_MODULE, moduleUri );
+            context.addRelationship( layerUri, ZestRdf.RELATIONSHIP_MODULE, moduleUri );
         }
 
         if( visited instanceof TransientDescriptor )
         {
             TransientDescriptor transientDescriptor = (TransientDescriptor) visited;
             compositeUri = context.createCompositeUri( moduleUri, first( transientDescriptor.types() ) );
-            context.addType( compositeUri, Qi4jRdf.TYPE_COMPOSITE );
-            context.addRelationship( moduleUri, Qi4jRdf.RELATIONSHIP_COMPOSITE, compositeUri );
+            context.addType( compositeUri, ZestRdf.TYPE_COMPOSITE );
+            context.addRelationship( moduleUri, ZestRdf.RELATIONSHIP_COMPOSITE, compositeUri );
         }
 
         if( visited instanceof EntityDescriptor )
         {
             EntityDescriptor entityDescriptor = (EntityDescriptor) visited;
             compositeUri = context.createCompositeUri( moduleUri, first( entityDescriptor.types() ) );
-            context.addType( compositeUri, Qi4jRdf.TYPE_ENTITY );
-            context.addRelationship( moduleUri, Qi4jRdf.RELATIONSHIP_ENTITY, compositeUri );
+            context.addType( compositeUri, ZestRdf.TYPE_ENTITY );
+            context.addRelationship( moduleUri, ZestRdf.RELATIONSHIP_ENTITY, compositeUri );
         }
 
         if( visited instanceof ObjectDescriptor )
         {
             ObjectDescriptor objectDescriptor = (ObjectDescriptor) visited;
             compositeUri = context.createCompositeUri( moduleUri, first( objectDescriptor.types() ) );
-            context.addType( compositeUri, Qi4jRdf.TYPE_OBJECT );
-            context.addRelationship( moduleUri, Qi4jRdf.RELATIONSHIP_OBJECT, compositeUri );
+            context.addType( compositeUri, ZestRdf.TYPE_OBJECT );
+            context.addRelationship( moduleUri, ZestRdf.RELATIONSHIP_OBJECT, compositeUri );
         }
 
         if( visited instanceof MethodDescriptor )
         {
             MethodDescriptor compositeMethodDescriptor = (MethodDescriptor) visited;
             String compositeMethodUri = context.createCompositeMethodUri( compositeUri, compositeMethodDescriptor.method() );
-            context.addType( compositeMethodUri, Qi4jRdf.TYPE_METHOD );
-            context.addRelationship( compositeUri, Qi4jRdf.RELATIONSHIP_METHOD, compositeMethodUri );
+            context.addType( compositeMethodUri, ZestRdf.TYPE_METHOD );
+            context.addRelationship( compositeUri, ZestRdf.RELATIONSHIP_METHOD, compositeMethodUri );
         }
 
         return true;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rdf/src/main/java/org/apache/zest/library/rdf/repository/HttpRepositoryConfiguration.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/repository/HttpRepositoryConfiguration.java b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/repository/HttpRepositoryConfiguration.java
index 6a2de55..818a50e 100644
--- a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/repository/HttpRepositoryConfiguration.java
+++ b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/repository/HttpRepositoryConfiguration.java
@@ -36,7 +36,7 @@ public interface HttpRepositoryConfiguration
     /**
      * The ID of the Repository at the remote Sesame HTTP host.
      *
-     * Default: qi4j
+     * Default: zest
      *
      * @return The configured ID at the remote Sesame HTTP host.
      */

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rdf/src/main/java/org/apache/zest/library/rdf/repository/HttpRepositoryService.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/repository/HttpRepositoryService.java b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/repository/HttpRepositoryService.java
index 7efe996..e384ce6 100644
--- a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/repository/HttpRepositoryService.java
+++ b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/repository/HttpRepositoryService.java
@@ -84,7 +84,7 @@ public interface HttpRepositoryService
             Property<String> id = configuration.repositoryId();
             if( id.get() == null )
             {
-                id.set( "qi4j" );
+                id.set( "zest" );
             }
             return id.get();
         }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rdf/src/main/java/org/apache/zest/library/rdf/repository/NativeRepositoryService.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/repository/NativeRepositoryService.java b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/repository/NativeRepositoryService.java
index abf3e4b..d134f22 100644
--- a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/repository/NativeRepositoryService.java
+++ b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/repository/NativeRepositoryService.java
@@ -111,7 +111,7 @@ public interface NativeRepositoryService extends Repository, ServiceComposite, A
                 {
                     if( serviceIdentity == null || "".equals( serviceIdentity ) )
                     {
-                        dataDir = "./rdf/repositories/qi4j";
+                        dataDir = "./rdf/repositories/zest";
                     }
                     else
                     {

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rdf/src/main/java/org/apache/zest/library/rdf/serializer/AbstractSerializer.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/serializer/AbstractSerializer.java b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/serializer/AbstractSerializer.java
index 9af3128..4317edc 100644
--- a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/serializer/AbstractSerializer.java
+++ b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/serializer/AbstractSerializer.java
@@ -22,7 +22,7 @@ import org.openrdf.model.Statement;
 import org.openrdf.rio.RDFHandlerException;
 import org.openrdf.rio.RDFWriter;
 import org.openrdf.rio.RDFWriterFactory;
-import org.apache.zest.library.rdf.Qi4jRdf;
+import org.apache.zest.library.rdf.ZestRdf;
 import org.apache.zest.library.rdf.Rdfs;
 
 abstract class AbstractSerializer
@@ -38,8 +38,8 @@ abstract class AbstractSerializer
     @Override
     public void serialize( Iterable<Statement> graph, Writer out ) throws RDFHandlerException
     {
-        String[] prefixes = { "qi4j", "rdf", "rdfs" };
-        String[] namespaces = { Qi4jRdf.QI4JMODEL, Rdfs.RDF, Rdfs.RDFS };
+        String[] prefixes = { "zest", "rdf", "rdfs" };
+        String[] namespaces = { ZestRdf.ZEST_MODEL, Rdfs.RDF, Rdfs.RDFS };
         serialize( graph, out, prefixes, namespaces );
     }
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rdf/src/main/java/org/apache/zest/library/rdf/serializer/SerializerContext.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/serializer/SerializerContext.java b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/serializer/SerializerContext.java
index f7142a4..aa81799 100644
--- a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/serializer/SerializerContext.java
+++ b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/serializer/SerializerContext.java
@@ -58,7 +58,7 @@ public final class SerializerContext
 
     public String createApplicationUri( String app )
     {
-        return "urn:qi4j:model:" + app;
+        return "urn:zest:model:" + app;
     }
 
     public String createLayerUri( String appUri, String layer )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rdf/src/test/java/org/apache/zest/library/rdf/ApplicationXmlTest.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/test/java/org/apache/zest/library/rdf/ApplicationXmlTest.java b/libraries/rdf/src/test/java/org/apache/zest/library/rdf/ApplicationXmlTest.java
index c2d7f46..5d49305 100644
--- a/libraries/rdf/src/test/java/org/apache/zest/library/rdf/ApplicationXmlTest.java
+++ b/libraries/rdf/src/test/java/org/apache/zest/library/rdf/ApplicationXmlTest.java
@@ -34,7 +34,7 @@ import org.apache.zest.bootstrap.ModuleAssembly;
 import org.apache.zest.library.fileconfig.FileConfiguration;
 import org.apache.zest.library.fileconfig.FileConfigurationService;
 import org.apache.zest.library.rdf.model.ApplicationSerializer;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationHandler;
@@ -43,7 +43,7 @@ import java.lang.reflect.Method;
 /**
  * JAVADOC
  */
-public class ApplicationXmlTest extends AbstractQi4jTest
+public class ApplicationXmlTest extends AbstractZestTest
 {
 
     public void assemble( ModuleAssembly module )
@@ -86,7 +86,7 @@ public class ApplicationXmlTest extends AbstractQi4jTest
         throws RDFHandlerException
     {
         writer.startRDF();
-        writer.handleNamespace( "qi4j", Qi4jRdf.QI4JMODEL );
+        writer.handleNamespace( "zest", ZestRdf.ZEST_MODEL );
         writer.handleNamespace( "rdf", Rdfs.RDF );
         writer.handleNamespace( "rdfs", Rdfs.RDFS );
         for( Statement st : graph )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rdf/src/test/java/org/apache/zest/library/rdf/entity/EntitySerializerTest.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/test/java/org/apache/zest/library/rdf/entity/EntitySerializerTest.java b/libraries/rdf/src/test/java/org/apache/zest/library/rdf/entity/EntitySerializerTest.java
index ad1ab39..8082065 100644
--- a/libraries/rdf/src/test/java/org/apache/zest/library/rdf/entity/EntitySerializerTest.java
+++ b/libraries/rdf/src/test/java/org/apache/zest/library/rdf/entity/EntitySerializerTest.java
@@ -36,7 +36,7 @@ import org.apache.zest.library.rdf.serializer.RdfXmlSerializer;
 import org.apache.zest.spi.entity.EntityState;
 import org.apache.zest.spi.entitystore.EntityStore;
 import org.apache.zest.spi.entitystore.EntityStoreUnitOfWork;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationAssembler;
 
@@ -44,7 +44,7 @@ import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationAssem
  * JAVADOC
  */
 public class EntitySerializerTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     @Service
     EntityStore entityStore;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rdf/src/test/java/org/apache/zest/library/rdf/entity/EntityTypeSerializerTest.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/test/java/org/apache/zest/library/rdf/entity/EntityTypeSerializerTest.java b/libraries/rdf/src/test/java/org/apache/zest/library/rdf/entity/EntityTypeSerializerTest.java
index a9e61ff..23b4eca 100644
--- a/libraries/rdf/src/test/java/org/apache/zest/library/rdf/entity/EntityTypeSerializerTest.java
+++ b/libraries/rdf/src/test/java/org/apache/zest/library/rdf/entity/EntityTypeSerializerTest.java
@@ -28,11 +28,11 @@ import org.apache.zest.api.value.ValueBuilder;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
 import org.apache.zest.library.rdf.DcRdf;
-import org.apache.zest.library.rdf.Qi4jEntityType;
+import org.apache.zest.library.rdf.ZestEntityType;
 import org.apache.zest.library.rdf.Rdfs;
 import org.apache.zest.library.rdf.serializer.RdfXmlSerializer;
 import org.apache.zest.spi.entitystore.EntityStore;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 import java.io.PrintWriter;
 import org.apache.zest.test.EntityTestAssembler;
@@ -42,7 +42,7 @@ import org.apache.zest.test.EntityTestAssembler;
  * JAVADOC
  */
 public class EntityTypeSerializerTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     @Service EntityStore entityStore;
     @Uses EntityTypeSerializer serializer;
@@ -73,8 +73,8 @@ public class EntityTypeSerializerTest
 
         Iterable<Statement> graph = serializer.serialize( entityDescriptor );
 
-        String[] prefixes = new String[]{ "rdf", "dc", " vc", "qi4j" };
-        String[] namespaces = new String[]{ Rdfs.RDF, DcRdf.NAMESPACE, "http://www.w3.org/2001/vcard-rdf/3.0#", Qi4jEntityType.NAMESPACE };
+        String[] prefixes = new String[]{ "rdf", "dc", " vc", "zest" };
+        String[] namespaces = new String[]{ Rdfs.RDF, DcRdf.NAMESPACE, "http://www.w3.org/2001/vcard-rdf/3.0#", ZestEntityType.NAMESPACE };
 
         new RdfXmlSerializer().serialize( graph, new PrintWriter( System.out ), prefixes, namespaces );
     }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rdf/src/test/java/org/apache/zest/library/rdf/entity/test.xml
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/test/java/org/apache/zest/library/rdf/entity/test.xml b/libraries/rdf/src/test/java/org/apache/zest/library/rdf/entity/test.xml
index b2de33f..6e7e049 100644
--- a/libraries/rdf/src/test/java/org/apache/zest/library/rdf/entity/test.xml
+++ b/libraries/rdf/src/test/java/org/apache/zest/library/rdf/entity/test.xml
@@ -20,32 +20,32 @@
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:ns1="http://www.w3.org/2001/vcard-rdf/3.0#"
   xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
-  <org.qi4j.library.rdf.entity.TestEntity xmlns="urn:qi4j:persistent:Wvgf5vdB2OuC8JfcNmUqJLEPSYM:"
-                                          rdf:about="urn:qi4j:entity:test2"/>
+  <org.apache.zest.library.rdf.entity.TestEntity xmlns="urn:zest:persistent:Wvgf5vdB2OuC8JfcNmUqJLEPSYM:"
+                                          rdf:about="urn:zest:entity:test2"/>
   <rdf:Description>
-    <value.test1 xmlns="urn:qi4j:persistent:org.qi4j.library.rdf.entity.TestEntity#">5</value.test1>
-    <value.,test2 xmlns="urn:qi4j:type:org.qi4j.library.rdf.entity.TestEntity#"/>
+    <value.test1 xmlns="urn:zest:persistent:org.apache.zest.library.rdf.entity.TestEntity#">5</value.test1>
+    <value.,test2 xmlns="urn:zest:type:org.apache.zest.library.rdf.entity.TestEntity#"/>
   </rdf:Description>
   <rdf:Description>
-    <value.data xmlns=".urn:qi4j:persistent:org.qi4j.library.rdf.entity.TestEntity#">Habba</value.data>
+    <value.data xmlns=".urn:zest:persistent:org.apache.zest.library.rdf.entity.TestEntity#">Habba</value.data>
   </rdf:Description>
   <rdf:Description>
-    <value.test3 xmlns="urn:qi4j:persistent:org.qi4j.library.rdf.entity.TestEntity#"/>
+    <value.test3 xmlns="urn:zest:persistent:org.apache.zest.library.rdf.entity.TestEntity#"/>
   </rdf:Description>
-  <rdf:Description rdf:about="urn:qi4j:entity:test2">
-    <value xmlns="urn:qi4j:persistent:org.qi4j.library.rdf.entity.TestEntity#"/>
-    <identity xmlns="urn:qi4j:persistent:org.qi4j.api.entity.Identity#">test2</identity>
-    <name xmlns="urn:qi4j:persistent:org.qi4j.library.rdf.entity.TestEntity#">Niclas</name>
-    <title xmlns="urn:qi4j:persistent:org.qi4j.library.rdf.entity.TestEntity#">Mr</title>
-    <association xmlns="urn:qi4j:persistent:org.qi4j.library.rdf.entity.TestEntity#" rdf:resource="urn:qi4j:entity:test1"/>
-    <group xmlns="urn:qi4j:persistent:org.qi4j.library.rdf.entity.TestEntity#">
+  <rdf:Description rdf:about="urn:zest:entity:test2">
+    <value xmlns="urn:zest:persistent:org.apache.zest.library.rdf.entity.TestEntity#"/>
+    <identity xmlns="urn:zest:persistent:org.apache.zest.api.entity.Identity#">test2</identity>
+    <name xmlns="urn:zest:persistent:org.apache.zest.library.rdf.entity.TestEntity#">Niclas</name>
+    <title xmlns="urn:zest:persistent:org.apache.zest.library.rdf.entity.TestEntity#">Mr</title>
+    <association xmlns="urn:zest:persistent:org.apache.zest.library.rdf.entity.TestEntity#" rdf:resource="urn:zest:entity:test1"/>
+    <group xmlns="urn:zest:persistent:org.apache.zest.library.rdf.entity.TestEntity#">
       <rdf:Seq>
-        <rdf:li rdf:resource="urn:qi4j:entity:test1"/>
+        <rdf:li rdf:resource="urn:zest:entity:test1"/>
       </rdf:Seq>
     </group>
-    <manyAssoc xmlns="urn:qi4j:persistent:org.qi4j.library.rdf.entity.TestEntity#">
+    <manyAssoc xmlns="urn:zest:persistent:org.apache.zest.library.rdf.entity.TestEntity#">
       <rdf:Seq>
-        <rdf:li rdf:resource="urn:qi4j:entity:test1"/>
+        <rdf:li rdf:resource="urn:zest:entity:test1"/>
       </rdf:Seq>
     </manyAssoc>
   </rdf:Description>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rdf/src/test/java/org/apache/zest/library/rdf/entity/test2.xml
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/test/java/org/apache/zest/library/rdf/entity/test2.xml b/libraries/rdf/src/test/java/org/apache/zest/library/rdf/entity/test2.xml
index 91ff53b..0834ec7 100644
--- a/libraries/rdf/src/test/java/org/apache/zest/library/rdf/entity/test2.xml
+++ b/libraries/rdf/src/test/java/org/apache/zest/library/rdf/entity/test2.xml
@@ -20,23 +20,23 @@
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:ns1="http://www.w3.org/2001/vcard-rdf/3.0#"
   xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
-  <org.qi4j.library.rdf.entity.TestEntity xmlns="urn:qi4j:persistent:Wvgf5vdB2OuC8JfcNmUqJLEPSYM:"
-                                          rdf:about="urn:qi4j:entity:test2">
-    <value xmlns="urn:qi4j:persistent:org.qi4j.library.rdf.entity.TestEntity#">{test1:5,test2:null,test3:{data:"Habba"}}</value>
-    <identity xmlns="urn:qi4j:persistent:org.qi4j.api.entity.Identity#">test2</identity>
-    <name xmlns="urn:qi4j:persistent:org.qi4j.library.rdf.entity.TestEntity#">Niclas</name>
-    <title xmlns="urn:qi4j:persistent:org.qi4j.library.rdf.entity.TestEntity#">Mr</title>
-    <association xmlns="urn:qi4j:persistent:org.qi4j.library.rdf.entity.TestEntity#" rdf:resource="urn:qi4j:entity:test1"/>
-    <group xmlns="urn:qi4j:persistent:org.qi4j.library.rdf.entity.TestEntity#">
+  <org.apache.zest.library.rdf.entity.TestEntity xmlns="urn:zest:persistent:Wvgf5vdB2OuC8JfcNmUqJLEPSYM:"
+                                          rdf:about="urn:zest:entity:test2">
+    <value xmlns="urn:zest:persistent:org.apache.zest.library.rdf.entity.TestEntity#">{test1:5,test2:null,test3:{data:"Habba"}}</value>
+    <identity xmlns="urn:zest:persistent:org.apache.zest.api.entity.Identity#">test2</identity>
+    <name xmlns="urn:zest:persistent:org.apache.zest.library.rdf.entity.TestEntity#">Niclas</name>
+    <title xmlns="urn:zest:persistent:org.apache.zest.library.rdf.entity.TestEntity#">Mr</title>
+    <association xmlns="urn:zest:persistent:org.apache.zest.library.rdf.entity.TestEntity#" rdf:resource="urn:zest:entity:test1"/>
+    <group xmlns="urn:zest:persistent:org.apache.zest.library.rdf.entity.TestEntity#">
       <rdf:Seq>
-        <rdf:li rdf:resource="urn:qi4j:entity:test1"/>
+        <rdf:li rdf:resource="urn:zest:entity:test1"/>
       </rdf:Seq>
     </group>
-    <manyAssoc xmlns="urn:qi4j:persistent:org.qi4j.library.rdf.entity.TestEntity#">
+    <manyAssoc xmlns="urn:zest:persistent:org.apache.zest.library.rdf.entity.TestEntity#">
       <rdf:Seq>
-        <rdf:li rdf:resource="urn:qi4j:entity:test1"/>
+        <rdf:li rdf:resource="urn:zest:entity:test1"/>
       </rdf:Seq>
     </manyAssoc>
-  </org.qi4j.library.rdf.entity.TestEntity>
+  </org.apache.zest.library.rdf.entity.TestEntity>
 
 </rdf:RDF>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rdf/src/test/java/org/apache/zest/library/rdf/repository/MemoryRepositoryTest.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/test/java/org/apache/zest/library/rdf/repository/MemoryRepositoryTest.java b/libraries/rdf/src/test/java/org/apache/zest/library/rdf/repository/MemoryRepositoryTest.java
index f464129..1c696c0 100644
--- a/libraries/rdf/src/test/java/org/apache/zest/library/rdf/repository/MemoryRepositoryTest.java
+++ b/libraries/rdf/src/test/java/org/apache/zest/library/rdf/repository/MemoryRepositoryTest.java
@@ -23,13 +23,13 @@ import org.openrdf.repository.RepositoryException;
 import org.apache.zest.api.injection.scope.Service;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 /**
  * JAVADOC
  */
 public class MemoryRepositoryTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     @Service
     Repository repository;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rdf/src/test/java/org/apache/zest/library/rdf/repository/NativeRepositoryTest.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/test/java/org/apache/zest/library/rdf/repository/NativeRepositoryTest.java b/libraries/rdf/src/test/java/org/apache/zest/library/rdf/repository/NativeRepositoryTest.java
index 1825ef8..4f756f2 100644
--- a/libraries/rdf/src/test/java/org/apache/zest/library/rdf/repository/NativeRepositoryTest.java
+++ b/libraries/rdf/src/test/java/org/apache/zest/library/rdf/repository/NativeRepositoryTest.java
@@ -24,14 +24,14 @@ import org.apache.zest.api.injection.scope.Service;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
 import org.apache.zest.library.fileconfig.FileConfigurationService;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 
 /**
  * JAVADOC
  */
 public class NativeRepositoryTest
-        extends AbstractQi4jTest
+        extends AbstractZestTest
 {
    @Service
    Repository repository;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest-client/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/rest-client/build.gradle b/libraries/rest-client/build.gradle
index 04b1ce9..ae087fc 100644
--- a/libraries/rest-client/build.gradle
+++ b/libraries/rest-client/build.gradle
@@ -23,16 +23,16 @@ jar { manifest { name = "Apache Zest™ Library - REST Client" }}
 
 dependencies {
 
-    compile project( ":org.qi4j.core:org.qi4j.core.api" )
-    compile project( ":org.qi4j.libraries:org.qi4j.library.rest-common" )
+    compile project( ":org.apache.zest.core:org.apache.zest.core.api" )
+    compile project( ":org.apache.zest.libraries:org.apache.zest.library.rest-common" )
     compile libraries.restlet
     compile libraries.slf4j_api
 
-    testCompile project( ":org.qi4j.core:org.qi4j.core.testsupport" )
-    testCompile project( ":org.qi4j.libraries:org.qi4j.library.rest-server" )
-    testCompile project( ':org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson' )
+    testCompile project( ":org.apache.zest.core:org.apache.zest.core.testsupport" )
+    testCompile project( ":org.apache.zest.libraries:org.apache.zest.library.rest-server" )
+    testCompile project( ':org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson' )
 
-    testRuntime project( ":org.qi4j.core:org.qi4j.core.runtime" )
+    testRuntime project( ":org.apache.zest.core:org.apache.zest.core.runtime" )
     testRuntime libraries.logback
 
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest-client/dev-status.xml
----------------------------------------------------------------------
diff --git a/libraries/rest-client/dev-status.xml b/libraries/rest-client/dev-status.xml
index a294481..fc28eea 100644
--- a/libraries/rest-client/dev-status.xml
+++ b/libraries/rest-client/dev-status.xml
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
+<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
-        http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
+        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
   <status>
     <!--none,early,beta,stable,mature-->
     <codebase>stable</codebase>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest-client/src/main/java/org/apache/zest/library/rest/client/RequestWriterDelegator.java
----------------------------------------------------------------------
diff --git a/libraries/rest-client/src/main/java/org/apache/zest/library/rest/client/RequestWriterDelegator.java b/libraries/rest-client/src/main/java/org/apache/zest/library/rest/client/RequestWriterDelegator.java
index acd60f1..6df65f1 100644
--- a/libraries/rest-client/src/main/java/org/apache/zest/library/rest/client/RequestWriterDelegator.java
+++ b/libraries/rest-client/src/main/java/org/apache/zest/library/rest/client/RequestWriterDelegator.java
@@ -49,7 +49,7 @@ public class RequestWriterDelegator
    {
       Logger logger = LoggerFactory.getLogger( getClass() );
 
-      ResourceBundle defaultRequestWriters = ResourceBundle.getBundle( "org.qi4j.library.rest.client.rest-client" );
+      ResourceBundle defaultRequestWriters = ResourceBundle.getBundle( "org.apache.zest.library.rest.client.rest-client" );
 
       String requestWriterClasses = defaultRequestWriters.getString( "requestwriters" );
       logger.info( "Using request writers:"+requestWriterClasses );

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest-client/src/main/java/org/apache/zest/library/rest/client/ResponseReaderDelegator.java
----------------------------------------------------------------------
diff --git a/libraries/rest-client/src/main/java/org/apache/zest/library/rest/client/ResponseReaderDelegator.java b/libraries/rest-client/src/main/java/org/apache/zest/library/rest/client/ResponseReaderDelegator.java
index 70996d8..0eb46f2 100644
--- a/libraries/rest-client/src/main/java/org/apache/zest/library/rest/client/ResponseReaderDelegator.java
+++ b/libraries/rest-client/src/main/java/org/apache/zest/library/rest/client/ResponseReaderDelegator.java
@@ -46,7 +46,7 @@ public class ResponseReaderDelegator
    {
       Logger logger = LoggerFactory.getLogger( getClass() );
 
-      ResourceBundle defaultResponseReaders = ResourceBundle.getBundle( "org.qi4j.library.rest.client.rest-client" );
+      ResourceBundle defaultResponseReaders = ResourceBundle.getBundle( "org.apache.zest.library.rest.client.rest-client" );
 
       String responseReaderClasses = defaultResponseReaders.getString( "responsereaders" );
       logger.info( "Using responsereaders:"+responseReaderClasses );

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest-client/src/main/java/org/apache/zest/library/rest/client/requestwriter/ValueCompositeRequestWriter.java
----------------------------------------------------------------------
diff --git a/libraries/rest-client/src/main/java/org/apache/zest/library/rest/client/requestwriter/ValueCompositeRequestWriter.java b/libraries/rest-client/src/main/java/org/apache/zest/library/rest/client/requestwriter/ValueCompositeRequestWriter.java
index e463e02..18cf41c 100644
--- a/libraries/rest-client/src/main/java/org/apache/zest/library/rest/client/requestwriter/ValueCompositeRequestWriter.java
+++ b/libraries/rest-client/src/main/java/org/apache/zest/library/rest/client/requestwriter/ValueCompositeRequestWriter.java
@@ -30,7 +30,7 @@ import org.apache.zest.api.value.ValueSerialization;
 import org.apache.zest.api.value.ValueSerializationException;
 import org.apache.zest.api.value.ValueSerializer;
 import org.apache.zest.library.rest.client.spi.RequestWriter;
-import org.apache.zest.spi.Qi4jSPI;
+import org.apache.zest.spi.ZestSPI;
 import org.restlet.Request;
 import org.restlet.data.CharacterSet;
 import org.restlet.data.MediaType;
@@ -47,7 +47,7 @@ public class ValueCompositeRequestWriter
    implements RequestWriter
 {
    @Structure
-   private Qi4jSPI spi;
+   private ZestSPI spi;
 
    @Service
    @Tagged( ValueSerialization.Formats.JSON )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest-client/src/main/resources/org/apache/zest/library/rest/client/rest-client.properties
----------------------------------------------------------------------
diff --git a/libraries/rest-client/src/main/resources/org/apache/zest/library/rest/client/rest-client.properties b/libraries/rest-client/src/main/resources/org/apache/zest/library/rest/client/rest-client.properties
index 4a0ac1d..d9dc94b 100644
--- a/libraries/rest-client/src/main/resources/org/apache/zest/library/rest/client/rest-client.properties
+++ b/libraries/rest-client/src/main/resources/org/apache/zest/library/rest/client/rest-client.properties
@@ -14,9 +14,9 @@
 # limitations under the License.
 
 #Client
-requestwriters=org.qi4j.library.rest.client.requestwriter.FormRequestWriter,\
-  org.qi4j.library.rest.client.requestwriter.ValueCompositeRequestWriter\
+requestwriters=org.apache.zest.library.rest.client.requestwriter.FormRequestWriter,\
+  org.apache.zest.library.rest.client.requestwriter.ValueCompositeRequestWriter\
 
-responsereaders=org.qi4j.library.rest.client.responsereader.DefaultResponseReader,\
-  org.qi4j.library.rest.client.responsereader.TableResponseReader,\
-  org.qi4j.library.rest.client.responsereader.JSONResponseReader
+responsereaders=org.apache.zest.library.rest.client.responsereader.DefaultResponseReader,\
+  org.apache.zest.library.rest.client.responsereader.TableResponseReader,\
+  org.apache.zest.library.rest.client.responsereader.JSONResponseReader

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContextResourceClientFactoryTest.java
----------------------------------------------------------------------
diff --git a/libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContextResourceClientFactoryTest.java b/libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContextResourceClientFactoryTest.java
index cf23e3e..0efbe9d 100644
--- a/libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContextResourceClientFactoryTest.java
+++ b/libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContextResourceClientFactoryTest.java
@@ -70,7 +70,7 @@ import org.apache.zest.library.rest.server.api.dci.Role;
 import org.apache.zest.library.rest.server.assembler.RestServerAssembler;
 import org.apache.zest.library.rest.server.restlet.NullCommandResult;
 import org.apache.zest.library.rest.server.spi.CommandResult;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationAssembler;
 import org.restlet.Client;
 import org.restlet.Request;
@@ -92,7 +92,7 @@ import static org.apache.zest.bootstrap.ImportedServiceDeclaration.*;
 import static org.apache.zest.library.rest.client.api.HandlerCommand.*;
 
 public class ContextResourceClientFactoryTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     private Server server;
     private ContextResourceClient crc;
@@ -200,7 +200,7 @@ public class ContextResourceClientFactoryTest
     @Override
     protected Application newApplicationInstance( ApplicationDescriptor applicationModel )
     {
-        return applicationModel.newInstance( qi4j.api(), new MetadataService() );
+        return applicationModel.newInstance( zest.api(), new MetadataService() );
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContinuousIntegrationTest.java
----------------------------------------------------------------------
diff --git a/libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContinuousIntegrationTest.java b/libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContinuousIntegrationTest.java
index a74444e..365bd83 100644
--- a/libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContinuousIntegrationTest.java
+++ b/libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContinuousIntegrationTest.java
@@ -50,7 +50,7 @@ import org.apache.zest.library.rest.server.api.ContextRestlet;
 import org.apache.zest.library.rest.server.assembler.RestServerAssembler;
 import org.apache.zest.library.rest.server.restlet.NullCommandResult;
 import org.apache.zest.library.rest.server.spi.CommandResult;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationAssembler;
 import org.restlet.Client;
 import org.restlet.Request;
@@ -77,7 +77,7 @@ import static org.apache.zest.library.rest.client.api.HandlerCommand.refresh;
  * ReST Client libraries documentation source snippets.
  */
 public class ContinuousIntegrationTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     private Server server;
     private ContextResourceClient crc;
@@ -180,7 +180,7 @@ public class ContinuousIntegrationTest
     @Override
     protected Application newApplicationInstance( ApplicationDescriptor applicationModel )
     {
-        return applicationModel.newInstance( qi4j.api(), new MetadataService() );
+        return applicationModel.newInstance( zest.api(), new MetadataService() );
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/RssReaderTest.java
----------------------------------------------------------------------
diff --git a/libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/RssReaderTest.java b/libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/RssReaderTest.java
index 43e3ebe..21c7eac 100644
--- a/libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/RssReaderTest.java
+++ b/libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/RssReaderTest.java
@@ -38,7 +38,7 @@ import org.apache.zest.library.rest.client.spi.ResponseHandler;
 import org.apache.zest.library.rest.client.spi.ResponseReader;
 import org.apache.zest.library.rest.client.spi.ResultHandler;
 import org.apache.zest.library.rest.common.ValueAssembler;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationAssembler;
 import org.restlet.Client;
 import org.restlet.Response;
@@ -58,7 +58,7 @@ import static org.apache.zest.test.util.Assume.assumeConnectivity;
  * library.
  */
 public class RssReaderTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     @BeforeClass

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest-common/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/rest-common/build.gradle b/libraries/rest-common/build.gradle
index cfe7410..02a6801 100644
--- a/libraries/rest-common/build.gradle
+++ b/libraries/rest-common/build.gradle
@@ -22,7 +22,7 @@ description = "Apache Zest™ REST Library provides various Restlet resources th
 jar { manifest { name = "Apache Zest™ Library - REST" }}
 
 dependencies {
-  compile project( ':org.qi4j.core:org.qi4j.core.bootstrap' )
+  compile project( ':org.apache.zest.core:org.apache.zest.core.bootstrap' )
   compile libraries.restlet
   compile libraries.velocity
   compile libraries.servlet_api

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest-common/dev-status.xml
----------------------------------------------------------------------
diff --git a/libraries/rest-common/dev-status.xml b/libraries/rest-common/dev-status.xml
index 37f9020..c72f670 100644
--- a/libraries/rest-common/dev-status.xml
+++ b/libraries/rest-common/dev-status.xml
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
+<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
-        http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
+        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
   <status>
     <!--none,early,beta,stable,mature-->
     <codebase>stable</codebase>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest-common/src/main/java/org/apache/zest/library/rest/common/table/TableQuery.java
----------------------------------------------------------------------
diff --git a/libraries/rest-common/src/main/java/org/apache/zest/library/rest/common/table/TableQuery.java b/libraries/rest-common/src/main/java/org/apache/zest/library/rest/common/table/TableQuery.java
index e50bf25..da0a8a4 100644
--- a/libraries/rest-common/src/main/java/org/apache/zest/library/rest/common/table/TableQuery.java
+++ b/libraries/rest-common/src/main/java/org/apache/zest/library/rest/common/table/TableQuery.java
@@ -24,7 +24,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.apache.zest.api.Qi4j;
+import org.apache.zest.api.ZestAPI;
 import org.apache.zest.api.mixin.Mixins;
 import org.apache.zest.api.property.Property;
 import org.apache.zest.api.value.ValueBuilder;
@@ -156,7 +156,7 @@ public interface TableQuery
       @Override
       public Table applyTo(Table table)
       {
-         ValueBuilder<Table> tableBuilder = Qi4j.FUNCTION_COMPOSITE_INSTANCE_OF
+         ValueBuilder<Table> tableBuilder = ZestAPI.FUNCTION_COMPOSITE_INSTANCE_OF
              .map( table ).module().newValueBuilderWithPrototype( table );
 
 /* TODO Finish label setting

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest-server/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/rest-server/build.gradle b/libraries/rest-server/build.gradle
index b9d14cb..70a9d36 100644
--- a/libraries/rest-server/build.gradle
+++ b/libraries/rest-server/build.gradle
@@ -22,16 +22,16 @@ description = "Apache Zest™ REST Server Library provides a server component fo
 jar { manifest { name = "Apache Zest™ Library - REST server" }}
 
 dependencies {
-  compile(project(":org.qi4j.core:org.qi4j.core.api"))
-  compile(project(":org.qi4j.libraries:org.qi4j.library.rest-common"))
+  compile(project(":org.apache.zest.core:org.apache.zest.core.api"))
+  compile(project(":org.apache.zest.libraries:org.apache.zest.library.rest-common"))
   compile(libraries.servlet_api)
   compile libraries.slf4j_api
   compile(libraries.velocity)
   compile(libraries.restlet)
   compile(libraries.freemarker)
 
-  testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport"))
+  testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport"))
 
-  testRuntime(project(":org.qi4j.core:org.qi4j.core.runtime"))
+  testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime"))
   testRuntime(libraries.logback)
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest-server/dev-status.xml
----------------------------------------------------------------------
diff --git a/libraries/rest-server/dev-status.xml b/libraries/rest-server/dev-status.xml
index 37f9020..c72f670 100644
--- a/libraries/rest-server/dev-status.xml
+++ b/libraries/rest-server/dev-status.xml
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
+<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
-        http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
+        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
   <status>
     <!--none,early,beta,stable,mature-->
     <codebase>stable</codebase>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/api/ContextResource.java
----------------------------------------------------------------------
diff --git a/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/api/ContextResource.java b/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/api/ContextResource.java
index ac94db2..1c9f88a 100644
--- a/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/api/ContextResource.java
+++ b/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/api/ContextResource.java
@@ -51,7 +51,7 @@ import org.apache.zest.library.rest.server.restlet.InteractionConstraints;
 import org.apache.zest.library.rest.server.restlet.RequestReaderDelegator;
 import org.apache.zest.library.rest.server.restlet.ResponseWriterDelegator;
 import org.apache.zest.library.rest.server.spi.ResultConverter;
-import org.apache.zest.spi.Qi4jSPI;
+import org.apache.zest.spi.ZestSPI;
 import org.restlet.Request;
 import org.restlet.Response;
 import org.restlet.Uniform;
@@ -93,7 +93,7 @@ public class ContextResource
     private final List<Method> resourceCommands = new ArrayList<>();
 
     @Structure
-    private Qi4jSPI spi;
+    private ZestSPI spi;
 
     @Service
     private ResponseWriterDelegator responseWriter;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/api/ResourceValidity.java
----------------------------------------------------------------------
diff --git a/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/api/ResourceValidity.java b/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/api/ResourceValidity.java
index c8b2a73..34c5a3f 100644
--- a/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/api/ResourceValidity.java
+++ b/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/api/ResourceValidity.java
@@ -21,7 +21,7 @@ import java.util.Date;
 import org.apache.zest.api.entity.EntityComposite;
 import org.apache.zest.api.unitofwork.NoSuchEntityException;
 import org.apache.zest.api.unitofwork.UnitOfWork;
-import org.apache.zest.spi.Qi4jSPI;
+import org.apache.zest.spi.ZestSPI;
 import org.apache.zest.spi.entity.EntityState;
 import org.restlet.Request;
 import org.restlet.Response;
@@ -35,10 +35,10 @@ import org.restlet.resource.ResourceException;
 public class ResourceValidity
 {
     EntityComposite entity;
-    private final Qi4jSPI spi;
+    private final ZestSPI spi;
     private Request request;
 
-    public ResourceValidity( EntityComposite entity, Qi4jSPI spi, Request request )
+    public ResourceValidity( EntityComposite entity, ZestSPI spi, Request request )
     {
         this.entity = entity;
         this.spi = spi;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/RequestReaderDelegator.java
----------------------------------------------------------------------
diff --git a/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/RequestReaderDelegator.java b/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/RequestReaderDelegator.java
index d049c4f..801dca9 100644
--- a/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/RequestReaderDelegator.java
+++ b/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/RequestReaderDelegator.java
@@ -60,7 +60,7 @@ public class RequestReaderDelegator
         }
 
         // Add defaults
-        ResourceBundle defaultRequestReaders = ResourceBundle.getBundle( "org.qi4j.library.rest.server.rest-server" );
+        ResourceBundle defaultRequestReaders = ResourceBundle.getBundle( "org.apache.zest.library.rest.server.rest-server" );
 
         String requestReaderClasses = defaultRequestReaders.getString( "requestreaders" );
         logger.info( "Using request readers:" + requestReaderClasses );

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/ResponseWriterDelegator.java
----------------------------------------------------------------------
diff --git a/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/ResponseWriterDelegator.java b/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/ResponseWriterDelegator.java
index acfbda6..7d49388 100644
--- a/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/ResponseWriterDelegator.java
+++ b/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/ResponseWriterDelegator.java
@@ -57,7 +57,7 @@ public class ResponseWriterDelegator
         }
 
         // Add defaults
-        ResourceBundle defaultResultWriters = ResourceBundle.getBundle( "org.qi4j.library.rest.server.rest-server" );
+        ResourceBundle defaultResultWriters = ResourceBundle.getBundle( "org.apache.zest.library.rest.server.rest-server" );
 
         String resultWriterClasses = defaultResultWriters.getString( "responsewriters" );
         logger.info( "Using response writers:" + resultWriterClasses );

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/freemarker/ValueCompositeTemplateModel.java
----------------------------------------------------------------------
diff --git a/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/freemarker/ValueCompositeTemplateModel.java b/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/freemarker/ValueCompositeTemplateModel.java
index 35ded48..7857791 100644
--- a/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/freemarker/ValueCompositeTemplateModel.java
+++ b/libraries/rest-server/src/main/java/org/apache/zest/library/rest/server/restlet/freemarker/ValueCompositeTemplateModel.java
@@ -24,7 +24,7 @@ import freemarker.template.TemplateHashModelEx;
 import freemarker.template.TemplateModel;
 import freemarker.template.TemplateModelException;
 import freemarker.template.TemplateScalarModel;
-import org.apache.zest.api.Qi4j;
+import org.apache.zest.api.ZestAPI;
 import org.apache.zest.api.property.Property;
 import org.apache.zest.api.property.PropertyDescriptor;
 import org.apache.zest.api.value.ValueComposite;
@@ -46,7 +46,7 @@ public class ValueCompositeTemplateModel
     {
         this.composite = composite;
         this.wrapper = wrapper;
-        descriptor = (ValueDescriptor) Qi4j.FUNCTION_DESCRIPTOR_FOR.map( composite );
+        descriptor = (ValueDescriptor) ZestAPI.FUNCTION_DESCRIPTOR_FOR.map( composite );
     }
 
     @Override
@@ -88,7 +88,7 @@ public class ValueCompositeTemplateModel
                     throw new IllegalStateException( e );
                 }
             }
-        }, Qi4j.FUNCTION_COMPOSITE_INSTANCE_OF.map( composite ).state().properties() ).iterator() );
+        }, ZestAPI.FUNCTION_COMPOSITE_INSTANCE_OF.map( composite ).state().properties() ).iterator() );
     }
 
     @Override
@@ -97,7 +97,7 @@ public class ValueCompositeTemplateModel
     {
         try
         {
-            return wrapper.wrap( Qi4j.FUNCTION_COMPOSITE_INSTANCE_OF
+            return wrapper.wrap( ZestAPI.FUNCTION_COMPOSITE_INSTANCE_OF
                                      .map( composite )
                                      .state()
                                      .propertyFor( descriptor.state().findPropertyModelByName( key ).accessor() )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest-server/src/main/resources/org/apache/zest/library/rest/server/rest-server.properties
----------------------------------------------------------------------
diff --git a/libraries/rest-server/src/main/resources/org/apache/zest/library/rest/server/rest-server.properties b/libraries/rest-server/src/main/resources/org/apache/zest/library/rest/server/rest-server.properties
index 54507bd..52df65f 100644
--- a/libraries/rest-server/src/main/resources/org/apache/zest/library/rest/server/rest-server.properties
+++ b/libraries/rest-server/src/main/resources/org/apache/zest/library/rest/server/rest-server.properties
@@ -14,13 +14,13 @@
 # limitations under the License.
 
 #Server
-responsewriters=org.qi4j.library.rest.server.restlet.responsewriter.ResourceTemplateResponseWriter,\
-    org.qi4j.library.rest.server.restlet.responsewriter.DefaultResponseWriter,\
-    org.qi4j.library.rest.server.restlet.responsewriter.LinksResponseWriter,\
-    org.qi4j.library.rest.server.restlet.responsewriter.TableResponseWriter,\
-    org.qi4j.library.rest.server.restlet.responsewriter.ResourceResponseWriter,\
-    org.qi4j.library.rest.server.restlet.responsewriter.ValueCompositeResponseWriter,\
-    org.qi4j.library.rest.server.restlet.responsewriter.FormResponseWriter, \
-    org.qi4j.library.rest.server.restlet.responsewriter.JSONResponseWriter
+responsewriters=org.apache.zest.library.rest.server.restlet.responsewriter.ResourceTemplateResponseWriter,\
+    org.apache.zest.library.rest.server.restlet.responsewriter.DefaultResponseWriter,\
+    org.apache.zest.library.rest.server.restlet.responsewriter.LinksResponseWriter,\
+    org.apache.zest.library.rest.server.restlet.responsewriter.TableResponseWriter,\
+    org.apache.zest.library.rest.server.restlet.responsewriter.ResourceResponseWriter,\
+    org.apache.zest.library.rest.server.restlet.responsewriter.ValueCompositeResponseWriter,\
+    org.apache.zest.library.rest.server.restlet.responsewriter.FormResponseWriter, \
+    org.apache.zest.library.rest.server.restlet.responsewriter.JSONResponseWriter
 
 requestreaders=org.apache.zest.library.rest.server.restlet.requestreader.DefaultRequestReader

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/rest/build.gradle b/libraries/rest/build.gradle
index 2c9ff02..85ed802 100644
--- a/libraries/rest/build.gradle
+++ b/libraries/rest/build.gradle
@@ -23,18 +23,18 @@ jar { manifest { name = "Apache Zest™ Library - REST" }}
 
 dependencies {
 
-    compile project( ':org.qi4j.extensions:org.qi4j.extension.indexing-rdf' )
+    compile project( ':org.apache.zest.extensions:org.apache.zest.extension.indexing-rdf' )
     compile libraries.restlet
     compile libraries.sparql
     compile libraries.velocity
     compile libraries.servlet_api
 
-    testCompile project( ":org.qi4j.core:org.qi4j.core.testsupport" )
-    testCompile project( ":org.qi4j.libraries:org.qi4j.library.http" )
-    testCompile project( ':org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson' )
+    testCompile project( ":org.apache.zest.core:org.apache.zest.core.testsupport" )
+    testCompile project( ":org.apache.zest.libraries:org.apache.zest.library.http" )
+    testCompile project( ':org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson' )
     testCompile libraries.http_client
 
-    testRuntime project( ":org.qi4j.core:org.qi4j.core.runtime" )
+    testRuntime project( ":org.apache.zest.core:org.apache.zest.core.runtime" )
     testRuntime libraries.logback
 
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest/dev-status.xml
----------------------------------------------------------------------
diff --git a/libraries/rest/dev-status.xml b/libraries/rest/dev-status.xml
index 37f9020..c72f670 100644
--- a/libraries/rest/dev-status.xml
+++ b/libraries/rest/dev-status.xml
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
+<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
-        http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
+        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
   <status>
     <!--none,early,beta,stable,mature-->
     <codebase>stable</codebase>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/EntitiesResource.java
----------------------------------------------------------------------
diff --git a/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/EntitiesResource.java b/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/EntitiesResource.java
index 334f9c3..bc20aa8 100644
--- a/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/EntitiesResource.java
+++ b/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/EntitiesResource.java
@@ -131,12 +131,12 @@ public class EntitiesResource
                 {
                     PrintWriter out = new PrintWriter( writer );
                     out.println( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<rdf:RDF\n"
-                                 + "\txmlns=\"urn:qi4j:\"\n" + "\txmlns:qi4j=\"http://www.qi4j.org/rdf/model/1.0/\"\n"
+                                 + "\txmlns=\"urn:zest:\"\n" + "\txmlns:zest=\"http://zest.apache.org/rdf/model/1.0/\"\n"
                                  + "\txmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n"
                                  + "\txmlns:rdfs=\"http://www.w3.org/2000/01/rdf-schema#\">" );
                     for( EntityReference qualifiedIdentity : query )
                     {
-                        out.println( "<qi4j:entity rdf:about=\"" + getRequest().getResourceRef().getPath() + "/"
+                        out.println( "<zest:entity rdf:about=\"" + getRequest().getResourceRef().getPath() + "/"
                                      + qualifiedIdentity.identity() + ".rdf\"/>" );
                     }
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/Qi4jFinder.java
----------------------------------------------------------------------
diff --git a/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/Qi4jFinder.java b/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/Qi4jFinder.java
deleted file mode 100644
index 3f2594a..0000000
--- a/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/Qi4jFinder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2008, Niclas Hedhman. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.zest.library.rest.admin;
-
-import org.apache.zest.api.injection.scope.Structure;
-import org.apache.zest.api.object.ObjectFactory;
-import org.restlet.Request;
-import org.restlet.Response;
-import org.restlet.resource.Finder;
-import org.restlet.resource.ServerResource;
-
-public class Qi4jFinder
-    extends Finder
-{
-    @Structure
-    private ObjectFactory factory;
-
-    public Qi4jFinder()
-    {
-    }
-
-    @Override
-    public ServerResource create( Class<? extends ServerResource> targetClass, Request request, Response response )
-    {
-        return factory.newObject( targetClass );
-    }
-}

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/Qi4jServerServlet.java
----------------------------------------------------------------------
diff --git a/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/Qi4jServerServlet.java b/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/Qi4jServerServlet.java
deleted file mode 100644
index e796051..0000000
--- a/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/Qi4jServerServlet.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2008, Rickard Öberg. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.zest.library.rest.admin;
-
-import org.apache.zest.api.injection.scope.Structure;
-import org.apache.zest.api.structure.Module;
-import org.restlet.Application;
-import org.restlet.Context;
-import org.restlet.ext.servlet.ServerServlet;
-
-/**
- * Integration with Zest. Register an object extending Application to use.
- */
-public class Qi4jServerServlet
-    extends ServerServlet
-{
-    @Structure
-    Module module;
-
-    @Override
-    @SuppressWarnings( "unchecked" )
-    protected Application createApplication( Context context )
-    {
-        return module.newObject( Application.class, context.createChildContext(), getServletConfig(), getServletContext() );
-    }
-}

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/Qi4jServerServletService.java
----------------------------------------------------------------------
diff --git a/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/Qi4jServerServletService.java b/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/Qi4jServerServletService.java
deleted file mode 100644
index c905c5d..0000000
--- a/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/Qi4jServerServletService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2008, Rickard Öberg. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.zest.library.rest.admin;
-
-import javax.servlet.Servlet;
-import org.apache.zest.api.mixin.Mixins;
-import org.apache.zest.api.service.ServiceComposite;
-
-/**
- * JAVADOC
- */
-@Mixins( Qi4jServerServlet.class )
-public interface Qi4jServerServletService
-    extends Servlet, ServiceComposite
-{
-}

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/RestAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/RestAssembler.java b/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/RestAssembler.java
index 99f2f75..fafd1d2 100644
--- a/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/RestAssembler.java
+++ b/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/RestAssembler.java
@@ -25,7 +25,7 @@ public class RestAssembler
         throws AssemblyException
     {
         module.objects( RestApplication.class ).visibleIn( visibility() );
-        module.objects( Qi4jFinder.class,
+        module.objects( ZestFinder.class,
                         EntitiesResource.class,
                         EntityResource.class,
                         IndexResource.class,

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/ZestFinder.java
----------------------------------------------------------------------
diff --git a/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/ZestFinder.java b/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/ZestFinder.java
new file mode 100644
index 0000000..4b585fa
--- /dev/null
+++ b/libraries/rest/src/main/java/org/apache/zest/library/rest/admin/ZestFinder.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2008, Niclas Hedhman. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.zest.library.rest.admin;
+
+import org.apache.zest.api.injection.scope.Structure;
+import org.apache.zest.api.object.ObjectFactory;
+import org.restlet.Request;
+import org.restlet.Response;
+import org.restlet.resource.Finder;
+import org.restlet.resource.ServerResource;
+
+public class ZestFinder
+    extends Finder
+{
+    @Structure
+    private ObjectFactory factory;
+
+    public ZestFinder()
+    {
+    }
+
+    @Override
+    public ServerResource create( Class<? extends ServerResource> targetClass, Request request, Response response )
+    {
+        return factory.newObject( targetClass );
+    }
+}


Mime
View raw message