http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldComposite.scala ---------------------------------------------------------------------- diff --git a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldComposite.scala b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldComposite.scala deleted file mode 100644 index 5b2a940..0000000 --- a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldComposite.scala +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2011 Rickard Ãberg - * 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.scala.scala - -import org.apache.zest.api.composite.TransientComposite -import org.apache.zest.api.concern.Concerns - -// START SNIPPET: composite -@Concerns(Array(classOf[ HelloThereConcern ])) -trait HelloWorldComposite - extends TransientComposite with HelloWorldMixin with HelloWorldMixin2 -// END SNIPPET: composite
http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldComposite2.scala ---------------------------------------------------------------------- diff --git a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldComposite2.scala b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldComposite2.scala deleted file mode 100644 index 782baba..0000000 --- a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldComposite2.scala +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright 2011 Rickard Ãberg - * 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.scala.scala - -trait HelloWorldComposite2 - extends HelloWorldComposite with HelloWorldMixin3 http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldCompositeTest.java ---------------------------------------------------------------------- diff --git a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldCompositeTest.java b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldCompositeTest.java deleted file mode 100644 index 47f3c8c..0000000 --- a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldCompositeTest.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright 2011 Rickard Ãberg - * 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.scala.scala; - -import org.junit.Assert; -import org.junit.Test; -import org.apache.zest.api.constraint.ConstraintViolationException; -import org.apache.zest.api.unitofwork.UnitOfWork; -import org.apache.zest.bootstrap.AssemblyException; -import org.apache.zest.bootstrap.ModuleAssembly; -import org.apache.zest.bootstrap.SingletonAssembler; -import org.apache.zest.index.rdf.assembly.RdfMemoryStoreAssembler; -import org.apache.zest.library.scala.ScalaTraitMixin; -import org.apache.zest.spi.query.IndexExporter; -import org.apache.zest.test.EntityTestAssembler; - -import static org.apache.zest.api.query.QueryExpressions.eq; -import static org.apache.zest.api.query.QueryExpressions.templateFor; - -/** - * TODO - */ -public class HelloWorldCompositeTest -{ - @Test - public void testComposite() - throws Exception - { - SingletonAssembler assembler = new SingletonAssembler() - { - @Override - public void assemble( ModuleAssembly module ) - throws AssemblyException - { - // START SNIPPET: composite - module.transients( HelloWorldComposite.class, HelloWorldComposite2.class ). - withMixins( ScalaTraitMixin.class ). - withConcerns( ExclamationGenericConcern.class ); - // END SNIPPET: composite - } - }; - - HelloWorldComposite composite = assembler.module().newTransient( HelloWorldComposite.class ); - Assert.assertEquals( "Do stuff!", composite.doStuff() ); - Assert.assertEquals( "Hello there World!", composite.sayHello( "World" ) ); - - try - { - composite.sayHello( "AReallyReallyLongName" ); - } - catch( ConstraintViolationException e ) - { - // Ok! - } - - HelloWorldComposite2 composite2 = assembler.module().newTransient( HelloWorldComposite2.class ); - Assert.assertEquals( "Do custom stuff!", composite2.doStuff() ); - } - - @Test - public void testEntity() - throws Exception - { - SingletonAssembler assembler = new SingletonAssembler() - { - @Override - public void assemble( ModuleAssembly module ) - throws AssemblyException - { - // START SNIPPET: entity - module.entities( TestEntity.class ).withMixins( ScalaTraitMixin.class ); - // END SNIPPET: entity - // START SNIPPET: service - module.services( TestService.class ).withMixins( ScalaTraitMixin.class ); - // END SNIPPET: service - - new EntityTestAssembler().assemble( module ); - new RdfMemoryStoreAssembler().assemble( module ); - } - }; - - // Create and update Entity - UnitOfWork uow = assembler.module().newUnitOfWork(); - try - { - Commands entity = uow.newEntity( Commands.class ); - entity.updateFoo( "Foo" ); - - Data data = uow.get( Data.class, entity.toString() ); - - Assert.assertEquals( "FooFoo", data.foo().get() ); - } - finally - { - uow.complete(); - } - - assembler.module().findService( IndexExporter.class ).get().exportReadableToStream( System.out ); - - // Find it - uow = assembler.module().newUnitOfWork(); - try - { - Data data = uow.newQuery( assembler.module() - .newQueryBuilder( Data.class ) - .where( eq( templateFor( Data.class ).foo(), "FooFoo" ) ) ).find(); - Assert.assertEquals( "FooFoo", data.foo().get() ); - } - finally - { - uow.discard(); - } - } -} http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldMixin.scala ---------------------------------------------------------------------- diff --git a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldMixin.scala b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldMixin.scala deleted file mode 100644 index de17b11..0000000 --- a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldMixin.scala +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2011 Rickard Ãberg - * 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.scala.scala - -trait HelloWorldMixin -{ - def doStuff(): String = - { - "Do stuff" - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldMixin2.scala ---------------------------------------------------------------------- diff --git a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldMixin2.scala b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldMixin2.scala deleted file mode 100644 index c22c148..0000000 --- a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldMixin2.scala +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2011 Rickard Ãberg - * 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.scala.scala - -import org.apache.zest.library.constraints.annotation.MaxLength - -// START SNIPPET: mixin -trait HelloWorldMixin2 -{ - def sayHello(@MaxLength(10) name: String ): String = "Hello " + name -} -// END SNIPPET: mixin http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldMixin3.scala ---------------------------------------------------------------------- diff --git a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldMixin3.scala b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldMixin3.scala deleted file mode 100644 index 11df519..0000000 --- a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/HelloWorldMixin3.scala +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2011 Rickard Ãberg - * 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.scala.scala - -/** - * TODO - */ - -trait HelloWorldMixin3 - extends HelloWorldMixin -{ - override def doStuff() = "Do custom stuff" -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/TestEntity.scala ---------------------------------------------------------------------- diff --git a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/TestEntity.scala b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/TestEntity.scala deleted file mode 100644 index 63b4225..0000000 --- a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/TestEntity.scala +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2011 Rickard Ãberg - * 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.scala.scala - -import org.apache.zest.api.entity.EntityComposite -import org.apache.zest.api.injection.scope.Service -import org.apache.zest.api.common.UseDefaults -import org.apache.zest.api.property.Property - -/** - * Test entity - */ - // START SNIPPET: entity -trait TestEntity - extends EntityComposite with Commands with Events with Data - -trait Commands -{ - self: Events => - def updateFoo(newValue: String ) - { - // Call "injected" service - val repeated = testService.repeat(newValue) - - // Check here if input is ok - updatedFoo(repeated) - } - - // Service injection - this is really a method call to the ServiceFinder of the composite - @Service - def testService: TestService -} - -// Raw data of entity goes here -trait Data -{ - @UseDefaults - def foo: Property[ String ] - - // Define property - def foo_=(v: String ) { foo.set(v) } // Operator overloading for = -} - -trait Events -{ - self: Data => - def updatedFoo(newValue: String ) - { - // Register change by modifying state - foo = newValue - } -} -// END SNIPPET: entity http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/TestService.scala ---------------------------------------------------------------------- diff --git a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/TestService.scala b/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/TestService.scala deleted file mode 100644 index 7e62d3a..0000000 --- a/libraries/lang-scala/src/test/scala/org/apache/zest/library/scala/scala/TestService.scala +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2011 Rickard Ãberg - * 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.scala.scala - -import org.apache.zest.api.service.ServiceComposite - -/** - * Test service that repeats given string - */ - // START SNIPPET: service -trait TestService - extends ServiceComposite -{ - def repeat(input: String ): String = input + input -} -// END SNIPPET: service http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/libraries/locking/src/docs/locking.txt ---------------------------------------------------------------------- diff --git a/libraries/locking/src/docs/locking.txt b/libraries/locking/src/docs/locking.txt index 6f1f9ee..bebce16 100644 --- a/libraries/locking/src/docs/locking.txt +++ b/libraries/locking/src/docs/locking.txt @@ -61,7 +61,7 @@ or apply it during assembly, in case that is the only choice (such as existing/e [snippet,java] ---- -source=libraries/locking/src/test/java/org/qi4j/library/locking/DocumentationSupport.java +source=libraries/locking/src/test/java/org/apache/zest/library/locking/DocumentationSupport.java tag=assembly ---- http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/libraries/logging/src/docs/logging.txt ---------------------------------------------------------------------- diff --git a/libraries/logging/src/docs/logging.txt b/libraries/logging/src/docs/logging.txt index ed7f6b6..ff6820a 100644 --- a/libraries/logging/src/docs/logging.txt +++ b/libraries/logging/src/docs/logging.txt @@ -58,7 +58,7 @@ To produce debugging output in your code you just need to add the field [snippet,java] ----------- -source=libraries/logging/src/test/java/org/qi4j/logging/docsupport/LoggingDocs.java +source=libraries/logging/src/test/java/org/apache/zest/library/logging/docsupport/LoggingDocs.java tag=logging1 ----------- @@ -66,7 +66,7 @@ and then check for null at each usage [snippet,java] ----------- -source=libraries/logging/src/test/java/org/qi4j/logging/docsupport/LoggingDocs.java +source=libraries/logging/src/test/java/org/apache/zest/library/logging/docsupport/LoggingDocs.java tag=logging2 ----------- @@ -90,7 +90,7 @@ interface or the mixin implementation. You will also need to add the TraceConcer [snippet,java] ----------- -source=libraries/logging/src/test/java/org/qi4j/logging/docsupport/LoggingDocs.java +source=libraries/logging/src/test/java/org/apache/zest/library/logging/docsupport/LoggingDocs.java tag=logging3 ----------- @@ -107,6 +107,6 @@ sideeffects and mixins to composites during the bootstrap phase instead of hard- [snippet,java] ----------- -source=libraries/logging/src/test/java/org/qi4j/logging/docsupport/LoggingDocs.java +source=libraries/logging/src/test/java/org/apache/zest/library/logging/docsupport/LoggingDocs.java tag=logging4 ----------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/libraries/metrics/src/docs/metrics.txt ---------------------------------------------------------------------- diff --git a/libraries/metrics/src/docs/metrics.txt b/libraries/metrics/src/docs/metrics.txt index 857c99a..616b409 100644 --- a/libraries/metrics/src/docs/metrics.txt +++ b/libraries/metrics/src/docs/metrics.txt @@ -47,7 +47,7 @@ Example; [snippet,java] ---- -source=libraries/metrics/src/test/java/org/qi4j/library/metrics/DocumentationSupport.java +source=libraries/metrics/src/test/java/org/apache/zest/library/metrics/DocumentationSupport.java tag=capture ---- @@ -57,7 +57,7 @@ Any of the method declarations should work. From the testcases we have the follo [snippet,java] ---- -source=libraries/metrics/src/test/java/org/qi4j/library/metrics/MetricsTest.java +source=libraries/metrics/src/test/java/org/apache/zest/library/metrics/MetricsTest.java tag=complex-capture ---- http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/libraries/osgi/src/docs/osgi.txt ---------------------------------------------------------------------- diff --git a/libraries/osgi/src/docs/osgi.txt b/libraries/osgi/src/docs/osgi.txt index 957bbfc..5c36457 100644 --- a/libraries/osgi/src/docs/osgi.txt +++ b/libraries/osgi/src/docs/osgi.txt @@ -34,7 +34,7 @@ include::../../build/docs/buildinfo/artifact.txt[] [snippet,java] ---- -source=libraries/osgi/src/test/java/org/qi4j/library/osgi/DocumentationSupport.java +source=libraries/osgi/src/test/java/org/apache/zest/library/osgi/DocumentationSupport.java tag=export ---- @@ -43,7 +43,7 @@ tag=export [snippet,java] ---- -source=libraries/osgi/src/test/java/org/qi4j/library/osgi/DocumentationSupport.java +source=libraries/osgi/src/test/java/org/apache/zest/library/osgi/DocumentationSupport.java tag=import ---- http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/libraries/rest-client/src/docs/primer.txt ---------------------------------------------------------------------- diff --git a/libraries/rest-client/src/docs/primer.txt b/libraries/rest-client/src/docs/primer.txt index 62245bd..d87fc95 100644 --- a/libraries/rest-client/src/docs/primer.txt +++ b/libraries/rest-client/src/docs/primer.txt @@ -51,7 +51,7 @@ requests, or it may abort. "refresh" does not return any value, and usually does Example: [snippet,java] ----------- -source=libraries/rest-client/src/test/java/org/qi4j/library/rest/client/docsupport/RestPrimerDocs.java +source=libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/docsupport/RestPrimerDocs.java tag=1 ----------- @@ -68,7 +68,7 @@ handlers. Here is the setup of crc: [snippet,java] ----------- -source=libraries/rest-client/src/test/java/org/qi4j/library/rest/client/docsupport/RestPrimerDocs.java +source=libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/docsupport/RestPrimerDocs.java tag=2 ----------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/libraries/rest-client/src/docs/rest-client.txt ---------------------------------------------------------------------- diff --git a/libraries/rest-client/src/docs/rest-client.txt b/libraries/rest-client/src/docs/rest-client.txt index dafd6db..a783281 100644 --- a/libraries/rest-client/src/docs/rest-client.txt +++ b/libraries/rest-client/src/docs/rest-client.txt @@ -46,7 +46,7 @@ Let's walk through the different steps typically needed. [snippet,java] ------------- -source=libraries/rest-client/src/test/java/org/qi4j/library/rest/client/ContextResourceClientFactoryTest.java +source=libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContextResourceClientFactoryTest.java tag=client-create1 ------------- @@ -57,7 +57,7 @@ We then create the global handler, which will be set to all ContextResourceClien [snippet,java] ------------- -source=libraries/rest-client/src/test/java/org/qi4j/library/rest/client/ContextResourceClientFactoryTest.java +source=libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContextResourceClientFactoryTest.java tag=client-create2 ------------- @@ -74,7 +74,7 @@ ReST API. [snippet,java] ------------- -source=libraries/rest-client/src/test/java/org/qi4j/library/rest/client/ContextResourceClientFactoryTest.java +source=libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContextResourceClientFactoryTest.java tag=client-create3 ------------- @@ -89,28 +89,28 @@ The general approach is to register handlers for potential results when invoking === Query without Value === [snippet,java] ------------- -source=libraries/rest-client/src/test/java/org/qi4j/library/rest/client/ContextResourceClientFactoryTest.java +source=libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContextResourceClientFactoryTest.java tag=query-without-value ------------- === Query and Command === [snippet,java] ------------- -source=libraries/rest-client/src/test/java/org/qi4j/library/rest/client/ContextResourceClientFactoryTest.java +source=libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContextResourceClientFactoryTest.java tag=query-and-command ------------- === Query List and Command === [snippet,java] ------------- -source=libraries/rest-client/src/test/java/org/qi4j/library/rest/client/ContextResourceClientFactoryTest.java +source=libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContextResourceClientFactoryTest.java tag=query-list-and-command ------------- === Query List and Command Progressive === [snippet,java] ------------- -source=libraries/rest-client/src/test/java/org/qi4j/library/rest/client/ContextResourceClientFactoryTest.java +source=libraries/rest-client/src/test/java/org/apache/zest/library/rest/client/ContextResourceClientFactoryTest.java tag=query-list-and-command-progressive ------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/libraries/scheduler/src/docs/scheduler.txt ---------------------------------------------------------------------- diff --git a/libraries/scheduler/src/docs/scheduler.txt b/libraries/scheduler/src/docs/scheduler.txt index 142907a..2a42cbe 100644 --- a/libraries/scheduler/src/docs/scheduler.txt +++ b/libraries/scheduler/src/docs/scheduler.txt @@ -33,7 +33,7 @@ include::../../build/docs/buildinfo/artifact.txt[] == Logging == -The SLF4J Logger used by this library is named "org.qi4j.library.scheduler". +The SLF4J Logger used by this library is named "org.apache.zest.library.scheduler". == Assembly == @@ -45,7 +45,7 @@ Here is a full example: [snippet,java] ---- -source=libraries/scheduler/src/test/java/org/qi4j/library/scheduler/SchedulerTest.java +source=libraries/scheduler/src/test/java/org/apache/zest/library/scheduler/SchedulerTest.java tag=assembly ---- @@ -55,7 +55,7 @@ SchedulerConfiguration defines configuration properties details: [snippet,java] ---- -source=libraries/scheduler/src/main/java/org/qi4j/library/scheduler/SchedulerConfiguration.java +source=libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/SchedulerConfiguration.java tag=configuration ---- @@ -67,7 +67,7 @@ The Task contract is quite simple: [snippet,java] ---- -source=libraries/scheduler/src/main/java/org/qi4j/library/scheduler/Task.java +source=libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/Task.java tag=task ---- @@ -82,7 +82,7 @@ Here is a simple example: [snippet,java] ----------- -source=libraries/scheduler/src/test/java/org/qi4j/library/scheduler/docsupport/SchedulerDocs.java +source=libraries/scheduler/src/test/java/org/apache/zest/library/scheduler/docsupport/SchedulerDocs.java tag=1 ----------- @@ -104,7 +104,7 @@ This is the easiest way to run a background Task once after a given initial dela [snippet,java] ----------- -source=libraries/scheduler/src/test/java/org/qi4j/library/scheduler/docsupport/SchedulerDocs.java +source=libraries/scheduler/src/test/java/org/apache/zest/library/scheduler/docsupport/SchedulerDocs.java tag=2 ----------- @@ -154,7 +154,7 @@ Use the following in your code to get a Timeline Service injected: [snippet,java] ----------- -source=libraries/scheduler/src/test/java/org/qi4j/library/scheduler/docsupport/SchedulerDocs.java +source=libraries/scheduler/src/test/java/org/apache/zest/library/scheduler/docsupport/SchedulerDocs.java tag=timeline ----------- @@ -162,7 +162,7 @@ Here is the actual Timeline contract: [snippet,java] ---- -source=libraries/scheduler/src/main/java/org/qi4j/library/scheduler/timeline/Timeline.java +source=libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/timeline/Timeline.java tag=timeline ---- http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/libraries/servlet/src/docs/servlet.txt ---------------------------------------------------------------------- diff --git a/libraries/servlet/src/docs/servlet.txt b/libraries/servlet/src/docs/servlet.txt index 4af90c1..763a47a 100644 --- a/libraries/servlet/src/docs/servlet.txt +++ b/libraries/servlet/src/docs/servlet.txt @@ -44,7 +44,7 @@ Here is an example ServletContextListener: [snippet,java] ---- -source=libraries/servlet/src/test/java/org/qi4j/library/servlet/ServletTest.java +source=libraries/servlet/src/test/java/org/apache/zest/library/servlet/ServletTest.java tag=bootstrap ---- @@ -58,12 +58,12 @@ Here is a sample servlet that simply output the assembled Application name: [snippet,java] ---- -source=libraries/servlet/src/test/java/org/qi4j/library/servlet/ServletTest.java +source=libraries/servlet/src/test/java/org/apache/zest/library/servlet/ServletTest.java tag=usage ---- == Logging == -The SLF4J logger used by this library is named "org.qi4j.library.servlet". +The SLF4J logger used by this library is named "org.apache.zest.library.servlet". http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/libraries/shiro-core/src/docs/shiro.txt ---------------------------------------------------------------------- diff --git a/libraries/shiro-core/src/docs/shiro.txt b/libraries/shiro-core/src/docs/shiro.txt index a12a3e7..c108bac 100644 --- a/libraries/shiro-core/src/docs/shiro.txt +++ b/libraries/shiro-core/src/docs/shiro.txt @@ -53,7 +53,7 @@ SecurityManager when activating your Zest⢠Application. It can be done outside [snippet,java] ---- -source=libraries/shiro-core/src/test/java/org/qi4j/library/shiro/StandaloneShiroTest.java +source=libraries/shiro-core/src/test/java/org/apache/zest/library/shiro/StandaloneShiroTest.java tag=before ---- @@ -64,7 +64,7 @@ the SecurityManager when passivated: [snippet,java] ---- -source=libraries/shiro-core/src/test/java/org/qi4j/library/shiro/StandaloneShiroTest.java +source=libraries/shiro-core/src/test/java/org/apache/zest/library/shiro/StandaloneShiroTest.java tag=assembly ---- @@ -72,7 +72,7 @@ You can change the INI resource path through the ShiroIniConfiguration: [snippet,java] ---- -source=libraries/shiro-core/src/main/java/org/qi4j/library/shiro/ini/ShiroIniConfiguration.java +source=libraries/shiro-core/src/main/java/org/apache/zest/library/shiro/ini/ShiroIniConfiguration.java tag=config ---- @@ -85,7 +85,7 @@ Once started you must remember to register the SecurityManager in Shiro's Thread [snippet,java] ---- -source=libraries/shiro-core/src/test/java/org/qi4j/library/shiro/StandaloneShiroTest.java +source=libraries/shiro-core/src/test/java/org/apache/zest/library/shiro/StandaloneShiroTest.java tag=thread-context ---- @@ -126,7 +126,7 @@ credientials and configuring it ; [snippet,java] ---- -source=libraries/shiro-core/src/test/java/org/qi4j/library/shiro/RealmServiceTest.java +source=libraries/shiro-core/src/test/java/org/apache/zest/library/shiro/RealmServiceTest.java tag=realm-service ---- @@ -164,7 +164,7 @@ UserFactory too. Note that the factory uses the PasswordService implemented by t [snippet,java] ---- -source=libraries/shiro-core/src/test/java/org/qi4j/library/shiro/PasswordDomainTest.java +source=libraries/shiro-core/src/test/java/org/apache/zest/library/shiro/PasswordDomainTest.java tag=domain ---- @@ -173,7 +173,7 @@ entity and its factory: [snippet,java] ---- -source=libraries/shiro-core/src/test/java/org/qi4j/library/shiro/PasswordDomainTest.java +source=libraries/shiro-core/src/test/java/org/apache/zest/library/shiro/PasswordDomainTest.java tag=assembly ---- @@ -181,7 +181,7 @@ And finally here is how to create a new user and below how to perform a login: [snippet,java] ---- -source=libraries/shiro-core/src/test/java/org/qi4j/library/shiro/PasswordDomainTest.java +source=libraries/shiro-core/src/test/java/org/apache/zest/library/shiro/PasswordDomainTest.java tag=usage ---- @@ -190,7 +190,7 @@ change this you can do it using PasswordRealmConfiguration properties: [snippet,java] ---- -source=libraries/shiro-core/src/main/java/org/qi4j/library/shiro/domain/passwords/PasswordRealmConfiguration.java +source=libraries/shiro-core/src/main/java/org/apache/zest/library/shiro/domain/passwords/PasswordRealmConfiguration.java tag=config ---- @@ -206,7 +206,7 @@ First you need to add the RoleAssignee type to your account: [snippet,java] ---- -source=libraries/shiro-core/src/test/java/org/qi4j/library/shiro/PermissionsDomainTest.java +source=libraries/shiro-core/src/test/java/org/apache/zest/library/shiro/PermissionsDomainTest.java tag=domain ---- @@ -214,7 +214,7 @@ Assembly is straight forward: [snippet,java] ---- -source=libraries/shiro-core/src/test/java/org/qi4j/library/shiro/PermissionsDomainTest.java +source=libraries/shiro-core/src/test/java/org/apache/zest/library/shiro/PermissionsDomainTest.java tag=assembly ---- @@ -222,7 +222,7 @@ And here is how to use all this: [snippet,java] ---- -source=libraries/shiro-core/src/test/java/org/qi4j/library/shiro/PermissionsDomainTest.java +source=libraries/shiro-core/src/test/java/org/apache/zest/library/shiro/PermissionsDomainTest.java tag=usage ---- @@ -241,4 +241,4 @@ contribute. == Logging == -All code from this library use the `org.qi4j.library.shiro` logger. +All code from this library use the `org.apache.zest.library.shiro` logger. http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/libraries/shiro-web/src/docs/shiro-web.txt ---------------------------------------------------------------------- diff --git a/libraries/shiro-web/src/docs/shiro-web.txt b/libraries/shiro-web/src/docs/shiro-web.txt index c92d9b8..d798752 100644 --- a/libraries/shiro-web/src/docs/shiro-web.txt +++ b/libraries/shiro-web/src/docs/shiro-web.txt @@ -53,7 +53,7 @@ If you use the <<library-http>> you can either directly use Shiro classes or use [snippet,java] ---- -source=libraries/shiro-web/src/test/java/org/qi4j/library/shiro/web/WebHttpShiroTest.java +source=libraries/shiro-web/src/test/java/org/apache/zest/library/shiro/web/WebHttpShiroTest.java tag=assembly ---- http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/libraries/spring/src/docs/spring.txt ---------------------------------------------------------------------- diff --git a/libraries/spring/src/docs/spring.txt b/libraries/spring/src/docs/spring.txt index 12ec47e..9c2caa4 100644 --- a/libraries/spring/src/docs/spring.txt +++ b/libraries/spring/src/docs/spring.txt @@ -38,7 +38,7 @@ beans will be available as Zest⢠services. The most important things to rememb [snippet,java] ---- -source=libraries/spring/src/test/java/org/qi4j/library/spring/importer/Qi4jImportServiceTest.java +source=libraries/spring/src/test/java/org/apache/zest/library/spring/importer/Qi4jImportServiceTest.java tag=import ---- @@ -47,15 +47,15 @@ It is also possible to run a Zest⢠Application as a Spring Bean and export its Steps to export Zest⢠service: - 1. Create spring BeanFactory service of qi4j services to export. + 1. Create spring BeanFactory service of Zest services to export. 2. Create a class that extends Qi4jApplicationBootstrap. 3. Sets the layer and module that register BeanFactory service. - 4. Assemble qi4j application by implementing #assemble method. + 4. Assemble Zest application by implementing #assemble method. 5. Sets the identity of bean factory service. This identity is the spring bean name. - 6. Declare qi4j bootstrap in spring xml application context. + 6. Declare Zest bootstrap in spring xml application context. To bootstrap the Zest⢠runtime in Spring, you should have a bootstrap bean that extends the -+org.qi4j.library.spring.bootstrap.Qi4jApplicationBootstrap+ and implement the ++org.apache.zest.library.spring.bootstrap.Qi4jApplicationBootstrap+ and implement the +org.springframework.context.ApplicationContextAware+. A new bean will appear in the application context, called +"qi4jApplication"+ which is only @@ -86,6 +86,6 @@ Example application context; [snippet,java] ---- -source=libraries/spring/src/test/java/org/qi4j/library/spring/MyZestBootstrapper.java +source=libraries/spring/src/test/java/org/apache/zest/library/spring/MyZestBootstrapper.java tag=code ---- http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/libraries/sql/src/docs/sql.txt ---------------------------------------------------------------------- diff --git a/libraries/sql/src/docs/sql.txt b/libraries/sql/src/docs/sql.txt index ffad172..76f1e24 100644 --- a/libraries/sql/src/docs/sql.txt +++ b/libraries/sql/src/docs/sql.txt @@ -69,7 +69,7 @@ BoneCP support resides in the *sql-bonecp* module. [snippet,java] ---- -source=libraries/sql/src/test/java/org/qi4j/library/sql/DocumentationSupport.java +source=libraries/sql/src/test/java/org/apache/zest/library/sql/DocumentationSupport.java tag=bonecp ---- @@ -84,7 +84,7 @@ include::../../../sql-dbcp/build/docs/buildinfo/artifact.txt[] [snippet,java] ---- -source=libraries/sql/src/test/java/org/qi4j/library/sql/DocumentationSupport.java +source=libraries/sql/src/test/java/org/apache/zest/library/sql/DocumentationSupport.java tag=dbcp ---- @@ -98,7 +98,7 @@ tag=dbcp [snippet,java] ---- -source=libraries/sql/src/test/java/org/qi4j/library/sql/DocumentationSupport.java +source=libraries/sql/src/test/java/org/apache/zest/library/sql/DocumentationSupport.java tag=datasource ---- @@ -111,7 +111,7 @@ See <<howto-configure-service>>. [snippet,java] ---- -source=libraries/sql/src/main/java/org/qi4j/library/sql/datasource/DataSourceConfigurationState.java +source=libraries/sql/src/main/java/org/apache/zest/library/sql/datasource/DataSourceConfigurationState.java tag=config ---- @@ -131,7 +131,7 @@ Application runs in an environment where DataSource are already provided. [snippet,java] ---- -source=libraries/sql/src/test/java/org/qi4j/library/sql/datasource/ExternalDataSourceTest.java +source=libraries/sql/src/test/java/org/apache/zest/library/sql/datasource/ExternalDataSourceTest.java tag=assembly ---- @@ -149,7 +149,7 @@ CircuitBreaker and set it as <<def-metainfo>> of the DataSource. [snippet,java] ---- -source=libraries/sql/src/test/java/org/qi4j/library/sql/DocumentationSupport.java +source=libraries/sql/src/test/java/org/apache/zest/library/sql/DocumentationSupport.java tag=cb-assembly ---- @@ -158,7 +158,7 @@ by a CircuitBreaker proxy. [snippet,java] ---- -source=libraries/sql/src/test/java/org/qi4j/library/sql/DocumentationSupport.java +source=libraries/sql/src/test/java/org/apache/zest/library/sql/DocumentationSupport.java tag=cb-datasource ---- @@ -171,7 +171,7 @@ Here is a simple example: [snippet,java] ---- -source=libraries/sql-liquibase/src/test/java/org/qi4j/library/sql/liquibase/LiquibaseServiceTest.java +source=libraries/sql-liquibase/src/test/java/org/apache/zest/library/sql/liquibase/LiquibaseServiceTest.java tag=io ---- @@ -184,7 +184,7 @@ through JMX. [snippet,java] ---- -source=libraries/sql/src/test/java/org/qi4j/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java +source=libraries/sql/src/test/java/org/apache/zest/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java tag=jmx ---- @@ -212,7 +212,7 @@ include::../../../sql-liquibase/build/docs/buildinfo/artifact.txt[] [snippet,java] ---- -source=libraries/sql-liquibase/src/test/java/org/qi4j/library/sql/liquibase/LiquibaseServiceTest.java +source=libraries/sql-liquibase/src/test/java/org/apache/zest/library/sql/liquibase/LiquibaseServiceTest.java tag=assembly ---- @@ -223,7 +223,7 @@ applies the configured changelog. [snippet,java] ---- -source=libraries/sql-liquibase/src/main/java/org/qi4j/library/sql/liquibase/LiquibaseConfiguration.java +source=libraries/sql-liquibase/src/main/java/org/apache/zest/library/sql/liquibase/LiquibaseConfiguration.java tag=config ---- http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/libraries/uid/src/docs/uid.txt ---------------------------------------------------------------------- diff --git a/libraries/uid/src/docs/uid.txt b/libraries/uid/src/docs/uid.txt index 710b606..84d2e13 100644 --- a/libraries/uid/src/docs/uid.txt +++ b/libraries/uid/src/docs/uid.txt @@ -35,7 +35,7 @@ Assembly is done using the provided Assembler: [snippet,java] ---- -source=libraries/uid/src/test/java/org/qi4j/library/uid/DocumentationSupport.java +source=libraries/uid/src/test/java/org/apache/zest/library/uid/DocumentationSupport.java tag=uuid-assembly ---- @@ -43,7 +43,7 @@ Usage is quite simple: [snippet,java] ---- -source=libraries/uid/src/test/java/org/qi4j/library/uid/DocumentationSupport.java +source=libraries/uid/src/test/java/org/apache/zest/library/uid/DocumentationSupport.java tag=uuid-usage ---- @@ -64,7 +64,7 @@ Assembly is done using the provided Assembler: [snippet,java] ---- -source=libraries/uid/src/test/java/org/qi4j/library/uid/DocumentationSupport.java +source=libraries/uid/src/test/java/org/apache/zest/library/uid/DocumentationSupport.java tag=seq-assembly ---- @@ -72,7 +72,7 @@ Usage is quite simple: [snippet,java] ---- -source=libraries/uid/src/test/java/org/qi4j/library/uid/DocumentationSupport.java +source=libraries/uid/src/test/java/org/apache/zest/library/uid/DocumentationSupport.java tag=seq-usage ---- @@ -82,7 +82,7 @@ Assembly is done using the provided Assembler: [snippet,java] ---- -source=libraries/uid/src/test/java/org/qi4j/library/uid/DocumentationSupport.java +source=libraries/uid/src/test/java/org/apache/zest/library/uid/DocumentationSupport.java tag=perseq-assembly ---- @@ -90,7 +90,7 @@ Usage is quite simple: [snippet,java] ---- -source=libraries/uid/src/test/java/org/qi4j/library/uid/DocumentationSupport.java +source=libraries/uid/src/test/java/org/apache/zest/library/uid/DocumentationSupport.java tag=seq-usage ---- http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/libraries/uowfile/src/docs/uowfile.txt ---------------------------------------------------------------------- diff --git a/libraries/uowfile/src/docs/uowfile.txt b/libraries/uowfile/src/docs/uowfile.txt index b3a1c00..8069a37 100644 --- a/libraries/uowfile/src/docs/uowfile.txt +++ b/libraries/uowfile/src/docs/uowfile.txt @@ -43,7 +43,7 @@ include::../../build/docs/buildinfo/artifact.txt[] == Logging == -The SLF4J Logger used by this library is named "org.qi4j.library.uowfile". +The SLF4J Logger used by this library is named "org.apache.zest.library.uowfile". == Add an attached file to an Entity == @@ -52,7 +52,7 @@ Let's say you have the following Entity: [snippet,java] ---- -source=libraries/uowfile/src/test/java/org/qi4j/library/uowfile/HasUoWFileTest.java +source=libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFileTest.java tag=entity ---- @@ -60,7 +60,7 @@ To add an attached file to it you first need to extends HasUoWFileLifecycle: [snippet,java] ---- -source=libraries/uowfile/src/test/java/org/qi4j/library/uowfile/HasUoWFileTest.java +source=libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFileTest.java tag=uowfile ---- @@ -68,7 +68,7 @@ This provides you with the following contract: [snippet,java] ---- -source=libraries/uowfile/src/main/java/org/qi4j/library/uowfile/singular/HasUoWFile.java +source=libraries/uowfile/src/main/java/org/apache/zest/library/uowfile/singular/HasUoWFile.java tag=contract ---- @@ -76,7 +76,7 @@ Next you need to write the UoWFileLocator mixin: [snippet,java] ---- -source=libraries/uowfile/src/test/java/org/qi4j/library/uowfile/HasUoWFileTest.java +source=libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFileTest.java tag=locator ---- @@ -84,7 +84,7 @@ Assemble all this as follow: [snippet,java] ---- -source=libraries/uowfile/src/test/java/org/qi4j/library/uowfile/HasUoWFileTest.java +source=libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFileTest.java tag=assembly ---- @@ -92,7 +92,7 @@ You can now use the following methods on your EntityComposite: [snippet,java] ---- -source=libraries/uowfile/src/test/java/org/qi4j/library/uowfile/HasUoWFileTest.java +source=libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFileTest.java tag=api ---- @@ -106,7 +106,7 @@ Let's say you have the following Entity: [snippet,java] ---- -source=libraries/uowfile/src/test/java/org/qi4j/library/uowfile/HasUoWFilesTest.java +source=libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFilesTest.java tag=entity ---- @@ -118,7 +118,7 @@ HasUoWFilesLifecycle: [snippet,java] ---- -source=libraries/uowfile/src/test/java/org/qi4j/library/uowfile/HasUoWFilesTest.java +source=libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFilesTest.java tag=uowfile ---- @@ -126,7 +126,7 @@ This provides you with the following contract: [snippet,java] ---- -source=libraries/uowfile/src/main/java/org/qi4j/library/uowfile/plural/HasUoWFiles.java +source=libraries/uowfile/src/main/java/org/apache/zest/library/uowfile/plural/HasUoWFiles.java tag=contract ---- @@ -134,7 +134,7 @@ Next you need to write the UoWFileLocator mixin: [snippet,java] ---- -source=libraries/uowfile/src/test/java/org/qi4j/library/uowfile/HasUoWFilesTest.java +source=libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFilesTest.java tag=locator ---- @@ -142,7 +142,7 @@ Assemble all this as follow: [snippet,java] ---- -source=libraries/uowfile/src/test/java/org/qi4j/library/uowfile/HasUoWFilesTest.java +source=libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFilesTest.java tag=assembly ---- @@ -150,7 +150,7 @@ You can now use the following methods on your EntityComposite: [snippet,java] ---- -source=libraries/uowfile/src/test/java/org/qi4j/library/uowfile/HasUoWFilesTest.java +source=libraries/uowfile/src/test/java/org/apache/zest/library/uowfile/HasUoWFilesTest.java tag=api ---- http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/manual/src/docs/tutorials/howto-assembly-application.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-assembly-application.txt b/manual/src/docs/tutorials/howto-assembly-application.txt index 05e2ad7..c2b17c3 100644 --- a/manual/src/docs/tutorials/howto-assembly-application.txt +++ b/manual/src/docs/tutorials/howto-assembly-application.txt @@ -70,7 +70,7 @@ is either a direct reference, such as [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/assemble/Docs.java +source=manual/src/main/java/org/apache/zest/manual/recipes/assemble/Docs.java tag=direct ----------- @@ -78,7 +78,7 @@ or an indirect lookup, such as [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/assemble/Docs.java +source=manual/src/main/java/org/apache/zest/manual/recipes/assemble/Docs.java tag=indirect ----------- @@ -122,7 +122,7 @@ So, lets see how we code up this bit in the actual code first. [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/assemble/Main.java +source=manual/src/main/java/org/apache/zest/manual/recipes/assemble/Main.java tag=main ----------- @@ -135,7 +135,7 @@ it could be to create the Domain Layer. [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/assemble/Main.java +source=manual/src/main/java/org/apache/zest/manual/recipes/assemble/Main.java tag=domainLayer ----------- @@ -145,7 +145,7 @@ we need to declare which Composites, Entities, Services and Objects that is in e [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/assemble/Main.java +source=manual/src/main/java/org/apache/zest/manual/recipes/assemble/Main.java tag=accountModule ----------- @@ -154,7 +154,7 @@ actually very, very simple; [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/assemble/Main.java +source=manual/src/main/java/org/apache/zest/manual/recipes/assemble/Main.java tag=shutdown ----------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/manual/src/docs/tutorials/howto-build-system.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-build-system.txt b/manual/src/docs/tutorials/howto-build-system.txt index ab2d3fa..f75999d 100644 --- a/manual/src/docs/tutorials/howto-build-system.txt +++ b/manual/src/docs/tutorials/howto-build-system.txt @@ -165,7 +165,7 @@ They can be run with the following Gradle command: [source,bash] ----------- -./gradlew :org.qi4j.tests:org.qi4j.test.performance:testPerf +./gradlew :org.apache.zest.tests:org.apache.zest.test.performance:testPerf ----------- Results will then be available in the test reports. http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/manual/src/docs/tutorials/howto-configure-service.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-configure-service.txt b/manual/src/docs/tutorials/howto-configure-service.txt index 86751b5..6f70d45 100644 --- a/manual/src/docs/tutorials/howto-configure-service.txt +++ b/manual/src/docs/tutorials/howto-configure-service.txt @@ -34,7 +34,7 @@ Destinations. For the sake of simplicity, we are leaving out the domain details. [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/travel/TravelPlan.java +source=manual/src/main/java/org/apache/zest/manual/travel/TravelPlan.java tag=service ----------- @@ -42,7 +42,7 @@ So, then there is the ServiceComposite... [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/travel/TravelPlanService.java +source=manual/src/main/java/org/apache/zest/manual/travel/TravelPlanService.java tag=serviceComposite ----------- @@ -52,7 +52,7 @@ configuration interface. [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/travel/TravelPlanConfiguration.java +source=manual/src/main/java/org/apache/zest/manual/travel/TravelPlanConfiguration.java tag=configuration ----------- @@ -63,7 +63,7 @@ Now we can access this configuration in the TravelPlanMixin like this; [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/travel/TravelPlanMixin.java +source=manual/src/main/java/org/apache/zest/manual/travel/TravelPlanMixin.java tag=mixin ----------- @@ -74,7 +74,7 @@ with the refresh() method in the Configuration interface; [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/travel/TravelPlanMixin.java +source=manual/src/main/java/org/apache/zest/manual/travel/TravelPlanMixin.java tag=refresh ----------- @@ -95,7 +95,7 @@ So, we create a properties file, where the keys are the names of the properties [snippet,bash] ----------- -source=manual/src/main/java/org/qi4j/manual/travel/TravelPlanService.properties +source=manual/src/main/java/org/apache/zest/manual/travel/TravelPlanService.properties tag=params ----------- File: org/hedhman/niclas/travel/TravelPlanService.properties @@ -106,7 +106,7 @@ And this would work with the standard assembly. [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/travel/Main.java +source=manual/src/main/java/org/apache/zest/manual/travel/Main.java tag=simple ----------- @@ -117,7 +117,7 @@ the same package as the ServiceComposite sub type, the TravelPlanService in the [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/travel/Main.java +source=manual/src/main/java/org/apache/zest/manual/travel/Main.java tag=assemble ----------- @@ -125,18 +125,18 @@ And the two files for configuration, [snippet,bash] ----------- -source=manual/src/main/java/org/qi4j/manual/travel/ExpediaService.properties +source=manual/src/main/java/org/apache/zest/manual/travel/ExpediaService.properties tag=params ----------- -File: org/qi4j/manual/travel/ExpediaService.properties +File: org/apache/zest/manual/travel/ExpediaService.properties [snippet,bash] ----------- -source=manual/src/main/java/org/qi4j/manual/travel/OrbitzService.properties +source=manual/src/main/java/org/apache/zest/manual/travel/OrbitzService.properties tag=params ----------- -File: org/qi4j/manual/travel/OrbitzService.properties +File: org/apache/zest/manual/travel/OrbitzService.properties == Changing Configuration in runtime == Unlike most frameworks, the Configuration in Zest⢠is an active Entity, and once the properties file has been read once http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/manual/src/docs/tutorials/howto-contextual-fragments.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-contextual-fragments.txt b/manual/src/docs/tutorials/howto-contextual-fragments.txt index 1dc423c..09f71b9 100644 --- a/manual/src/docs/tutorials/howto-contextual-fragments.txt +++ b/manual/src/docs/tutorials/howto-contextual-fragments.txt @@ -35,7 +35,7 @@ The mixins, sideeffects and concerns are added during the bootstrap phase. It is [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/contextualFragments/TraceAll.java +source=manual/src/main/java/org/apache/zest/manual/recipes/contextualFragments/TraceAll.java tag=assemble ----------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/manual/src/docs/tutorials/howto-create-concern.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-create-concern.txt b/manual/src/docs/tutorials/howto-create-concern.txt index a36ea99..94b0b6e 100644 --- a/manual/src/docs/tutorials/howto-create-concern.txt +++ b/manual/src/docs/tutorials/howto-create-concern.txt @@ -34,7 +34,7 @@ A typed Concern is a Java class that implements the MixinType it can be used on: [snippet,java] ----------- -source=tutorials/introduction/tenminutes/src/main/java/org/qi4j/demo/tenminute/InventoryConcern.java +source=tutorials/introduction/tenminutes/src/main/java/org/apache/zest/demo/tenminute/InventoryConcern.java tag=allClass ----------- @@ -49,7 +49,7 @@ It can be used as follows; [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/concern/Order.java +source=manual/src/main/java/org/apache/zest/manual/recipes/concern/Order.java tag=class ----------- @@ -63,7 +63,7 @@ arbitrary MixinType. [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/concern/MyGenericConcern.java +source=manual/src/main/java/org/apache/zest/manual/recipes/concern/MyGenericConcern.java tag=class ----------- @@ -71,7 +71,7 @@ It can be used as follows; [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/concern/AnyMixinType.java +source=manual/src/main/java/org/apache/zest/manual/recipes/concern/AnyMixinType.java tag=class ----------- @@ -90,7 +90,7 @@ Here is how the declaration goes ; [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/concern/MyGenericConcern.java +source=manual/src/main/java/org/apache/zest/manual/recipes/concern/MyGenericConcern.java tag=appliesTo ----------- @@ -98,7 +98,7 @@ And how to use the annotation ; [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/concern/AnyMixinType.java +source=manual/src/main/java/org/apache/zest/manual/recipes/concern/AnyMixinType.java tag=annotationUse ----------- @@ -108,6 +108,6 @@ Finally here is how to implement an AppliesToFilter: [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/concern/MyAppliesToFilter.java +source=manual/src/main/java/org/apache/zest/manual/recipes/concern/MyAppliesToFilter.java tag=filter ----------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/manual/src/docs/tutorials/howto-create-constraint.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-create-constraint.txt b/manual/src/docs/tutorials/howto-create-constraint.txt index 23dfab7..5d0630c 100644 --- a/manual/src/docs/tutorials/howto-create-constraint.txt +++ b/manual/src/docs/tutorials/howto-create-constraint.txt @@ -34,7 +34,7 @@ Method Constraints are declared with annotations on the method argument. The ann [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/createConstraint/Dialer.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createConstraint/Dialer.java tag=dialer ----------- @@ -42,7 +42,7 @@ In the code above we say that we want the argument to the callPhoneNumber() meth [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/createConstraint/PhoneNumber.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createConstraint/PhoneNumber.java tag=annotation ----------- @@ -50,7 +50,7 @@ We then need to provide the Constraint implementation. [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/createConstraint/PhoneNumberConstraint.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createConstraint/PhoneNumberConstraint.java tag=constraint ----------- @@ -58,7 +58,7 @@ We also need to include the Constraint on the Composites we want to have them pr [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/createConstraint/DialerComposite.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createConstraint/DialerComposite.java tag=composite ----------- @@ -67,7 +67,7 @@ in the method invocation. Concerns can be used to catch and report these violati [snippet,java] ---- -source=manual/src/main/java/org/qi4j/manual/recipes/createConstraint/ParameterViolationConcern.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createConstraint/ParameterViolationConcern.java tag=report ---- @@ -77,7 +77,7 @@ Property Constraints are declared on the Property method. [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/createConstraint/HasPhoneNumber.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createConstraint/HasPhoneNumber.java tag=property ----------- @@ -89,6 +89,6 @@ which can be done like this; [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/createConstraint/PhoneNumberParameterViolationConcern.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createConstraint/PhoneNumberParameterViolationConcern.java tag=property ----------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/manual/src/docs/tutorials/howto-create-entity.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-create-entity.txt b/manual/src/docs/tutorials/howto-create-entity.txt index 41ffe94..7d2d04f 100644 --- a/manual/src/docs/tutorials/howto-create-entity.txt +++ b/manual/src/docs/tutorials/howto-create-entity.txt @@ -65,17 +65,17 @@ Entity management. [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/Car.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/Car.java tag=entity ----------- [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/Manufacturer.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/Manufacturer.java tag=entity ----------- [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/Accident.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/Accident.java tag=entity ----------- @@ -90,17 +90,17 @@ We will also need to define the composites for the above domain structure; [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/CarEntity.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/CarEntity.java tag=composite ----------- [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/ManufacturerEntity.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/ManufacturerEntity.java tag=composite ----------- [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/AccidentValue.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/AccidentValue.java tag=composite ----------- @@ -114,7 +114,7 @@ We must also assemble an EntityStore for the entire application, but that is out [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/MyAssembler.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/MyAssembler.java tag=assembler1 ----------- @@ -130,7 +130,7 @@ fairly small implementation. So how is that done? [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/CarEntityFactory.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/CarEntityFactory.java tag=carFactory ----------- @@ -139,7 +139,7 @@ make it possible for the service injection later. [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/CarEntityFactoryService.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/CarEntityFactoryService.java tag=carFactoryService ----------- @@ -147,7 +147,7 @@ Then we need an implementation of the mixin. [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/CarEntityFactoryMixin.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/CarEntityFactoryMixin.java tag=carFactoryMixin1 ----------- @@ -159,7 +159,7 @@ to obtain a Module is simply to; [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/CarEntityFactoryMixin.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/CarEntityFactoryMixin.java tag=carFactoryMixin2 ----------- @@ -168,7 +168,7 @@ during the construction, we can also request it in the same manner as constructo [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/CarEntityFactoryMixin.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/CarEntityFactoryMixin.java tag=carFactoryMixin3 ----------- @@ -179,7 +179,7 @@ We then need to provide the implementation for the create() method. [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/CarEntityFactoryMixin.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/CarEntityFactoryMixin.java tag=create ----------- @@ -191,7 +191,7 @@ re-usable. So let's create one for the Manufacturer type. [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/ManufacturerRepository.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/ManufacturerRepository.java tag=repo ----------- @@ -199,7 +199,7 @@ And then we repeat the process for creating a Service... [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/ManufacturerRepositoryService.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/ManufacturerRepositoryService.java tag=manufacturerRepositoryService ----------- @@ -207,7 +207,7 @@ and a Mixin that implements it... [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/ManufacturerRepositoryMixin.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/ManufacturerRepositoryMixin.java tag=repo ----------- @@ -216,7 +216,7 @@ Services to be available to the application layer above, and not restricted to w [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/createEntity/MyAssembler.java +source=manual/src/main/java/org/apache/zest/manual/recipes/createEntity/MyAssembler.java tag=assembler2 ----------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/manual/src/docs/tutorials/howto-create-sideeffect.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-create-sideeffect.txt b/manual/src/docs/tutorials/howto-create-sideeffect.txt index 2675168..19b7709 100644 --- a/manual/src/docs/tutorials/howto-create-sideeffect.txt +++ b/manual/src/docs/tutorials/howto-create-sideeffect.txt @@ -34,7 +34,7 @@ A typed SideEffect is a Java class that implements the MixinType it can be used [snippet,java] ----------- -source=tutorials/introduction/tenminutes/src/main/java/org/qi4j/demo/tenminute/MailNotifySideEffect.java +source=tutorials/introduction/tenminutes/src/main/java/org/apache/zest/demo/tenminute/MailNotifySideEffect.java tag=allClass ----------- @@ -49,7 +49,7 @@ It can be used as follows; [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/sideeffects/OrderEntity.java +source=manual/src/main/java/org/apache/zest/manual/recipes/sideeffects/OrderEntity.java tag=body ----------- @@ -62,7 +62,7 @@ arbitrary MixinType. [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/sideeffects/MyGenericSideEffect.java +source=manual/src/main/java/org/apache/zest/manual/recipes/sideeffects/MyGenericSideEffect.java tag=body ----------- @@ -70,7 +70,7 @@ It can be used as follows; [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/sideeffects/AnyMixinType.java +source=manual/src/main/java/org/apache/zest/manual/recipes/sideeffects/AnyMixinType.java tag=body ----------- @@ -90,7 +90,7 @@ Here is how the declaration goes ; [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/sideeffects/MyGenericSideEffect.java +source=manual/src/main/java/org/apache/zest/manual/recipes/sideeffects/MyGenericSideEffect.java tag=appliesTo ----------- @@ -98,7 +98,7 @@ And how to use the annotation ; [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/sideeffects/AnyMixinType.java +source=manual/src/main/java/org/apache/zest/manual/recipes/sideeffects/AnyMixinType.java tag=annotation ----------- @@ -108,7 +108,7 @@ Finally here is how to implement an AppliesToFilter: [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/sideeffects/MyAppliesToFilter.java +source=manual/src/main/java/org/apache/zest/manual/recipes/sideeffects/MyAppliesToFilter.java tag=filter ----------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/manual/src/docs/tutorials/howto-depend-on-zest.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-depend-on-zest.txt b/manual/src/docs/tutorials/howto-depend-on-zest.txt index 1d0b629..1c7ec19 100644 --- a/manual/src/docs/tutorials/howto-depend-on-zest.txt +++ b/manual/src/docs/tutorials/howto-depend-on-zest.txt @@ -48,19 +48,19 @@ You simply declare dependencies on Zest⢠artifacts: ---- <dependencies> <dependency> - <groupId>org.qi4j.core</groupId> - <artifactId>org.qi4j.core.bootstrap</artifactId> + <groupId>org.apache.zest.core</groupId> + <artifactId>org.apache.zest.core.bootstrap</artifactId> <version>ZEST_VERSION</version> </dependency> <dependency> - <groupId>org.qi4j.core</groupId> - <artifactId>org.qi4j.core.runtime</artifactId> + <groupId>org.apache.zest.core</groupId> + <artifactId>org.apache.zest.core.runtime</artifactId> <version>ZEST_VERSION</version> <scope>runtime</scope> </dependency> <dependency> - <groupId>org.qi4j.core</groupId> - <artifactId>org.qi4j.core.testsupport</artifactId> + <groupId>org.apache.zest.core</groupId> + <artifactId>org.apache.zest.core.testsupport</artifactId> <version>ZEST_VERSION</version> <scope>test</scope> </dependency> @@ -91,9 +91,9 @@ You simply declare dependencies on Zest⢠artifacts: [source,groovy] ---- dependencies { - compile "org.qi4j.core:org.qi4j.core.bootstrap:ZEST_VERSION" - runtime "org.qi4j.core:org.qi4j.core.runtime:ZEST_VERSION" - testCompile "org.qi4j.core:org.qi4j.core.testsupport:ZEST_VERSION" + compile "org.apache.zest.core:org.apache.zest.core.bootstrap:ZEST_VERSION" + runtime "org.apache.zest.core:org.apache.zest.core.runtime:ZEST_VERSION" + testCompile "org.apache.zest.core:org.apache.zest.core.testsupport:ZEST_VERSION" } ---- @@ -115,9 +115,9 @@ You simply declare dependencies on Zest⢠artifacts: [source,ruby] ---- -compile.with 'org.qi4j.core:org.qi4j.core.bootstrap:ZEST_VERSION' -package(:war).with :libs => 'org.qi4j.core:org.qi4j.core.runtime:ZEST_VERSION' -test.with 'org.qi4j.core:org.qi4j.core.testsupport:ZEST_VERSION' +compile.with 'org.apache.zest.core:org.apache.zest.core.bootstrap:ZEST_VERSION' +package(:war).with :libs => 'org.apache.zest.core:org.apache.zest.core.runtime:ZEST_VERSION' +test.with 'org.apache.zest.core:org.apache.zest.core.testsupport:ZEST_VERSION' ---- Where `ZEST_VERSION` is the Zest⢠version you want to use. @@ -137,13 +137,13 @@ You simply declare dependencies on Zest⢠artifacts: [source,scala] ---- libraryDependencies += \ - "org.qi4j.core" % "org.qi4j.core.bootstrap" % "ZEST_VERSION" \ + "org.apache.zest.core" % "org.apache.zest.core.bootstrap" % "ZEST_VERSION" \ withSources() withJavadoc() libraryDependencies += \ - "org.qi4j.core" % "org.qi4j.core.runtime" % "ZEST_VERSION" % "runtime" \ + "org.apache.zest.core" % "org.apache.zest.core.runtime" % "ZEST_VERSION" % "runtime" \ withSources() withJavadoc() libraryDependencies += \ - "org.qi4j.core" % "org.qi4j.core.testsupport" % "ZEST_VERSION" % "test" \ + "org.apache.zest.core" % "org.apache.zest.core.testsupport" % "ZEST_VERSION" % "test" \ withSources() withJavadoc() ---- @@ -165,11 +165,11 @@ You simply declare dependencies on Zest⢠artifacts: ---- <ivy-module> <dependencies> - <dependency org="org.qi4j.core" name="org.qi4j.core.bootstrap" + <dependency org="org.apache.zest.core" name="org.apache.zest.core.bootstrap" rev="ZEST_VERSION" conf="default" /> - <dependency org="org.qi4j.core" name="org.qi4j.core.runtime" + <dependency org="org.apache.zest.core" name="org.apache.zest.core.runtime" rev="ZEST_VERSION" conf="runtime" /> - <dependency org="org.qi4j.core" name="org.qi4j.core.testsupport" + <dependency org="org.apache.zest.core" name="org.apache.zest.core.testsupport" rev="ZEST_VERSION" conf="test" /> </dependencies> </ivy-module> http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/manual/src/docs/tutorials/howto-invocation-annotation.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-invocation-annotation.txt b/manual/src/docs/tutorials/howto-invocation-annotation.txt index 200ed44..4e13b68 100644 --- a/manual/src/docs/tutorials/howto-invocation-annotation.txt +++ b/manual/src/docs/tutorials/howto-invocation-annotation.txt @@ -53,7 +53,7 @@ First create an annotation of your own liking, it must have +java.lang.annotatio [snippet,java] ----------- -source=core/runtime/src/test/java/org/qi4j/runtime/injection/InvocationInjectionTest.java +source=core/runtime/src/test/java/org/apache/zest/runtime/injection/InvocationInjectionTest.java tag=annotation ----------- @@ -61,7 +61,7 @@ After that it is possible to have this annotation placed on composite type metho [snippet,java] ----------- -source=core/runtime/src/test/java/org/qi4j/runtime/injection/InvocationInjectionTest.java +source=core/runtime/src/test/java/org/apache/zest/runtime/injection/InvocationInjectionTest.java tag=declaration ----------- @@ -69,7 +69,7 @@ and then the annotation can simply be injected into your Concerns or Mixins, lik [snippet,java] ----------- -source=core/runtime/src/test/java/org/qi4j/runtime/injection/InvocationInjectionTest.java +source=core/runtime/src/test/java/org/apache/zest/runtime/injection/InvocationInjectionTest.java tag=use1 ----------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/manual/src/docs/tutorials/howto-leverage-properties.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-leverage-properties.txt b/manual/src/docs/tutorials/howto-leverage-properties.txt index 1934f8c..cc9691a 100644 --- a/manual/src/docs/tutorials/howto-leverage-properties.txt +++ b/manual/src/docs/tutorials/howto-leverage-properties.txt @@ -30,13 +30,13 @@ So in Zest, instead of writing; [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/properties/pojo/Book.java +source=manual/src/main/java/org/apache/zest/manual/recipes/properties/pojo/Book.java tag=book ----------- [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/properties/pojo/MutableBook.java +source=manual/src/main/java/org/apache/zest/manual/recipes/properties/pojo/MutableBook.java tag=mutableBook ----------- @@ -51,7 +51,7 @@ like this; [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/properties/Book.java +source=manual/src/main/java/org/apache/zest/manual/recipes/properties/Book.java tag=book ----------- @@ -64,7 +64,7 @@ There is more to this than meets the eye. [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/properties/BookFactory.java +source=manual/src/main/java/org/apache/zest/manual/recipes/properties/BookFactory.java tag=create ----------- @@ -87,7 +87,7 @@ actual domain model. Such Swing client will utilize a SwingInfo property info if [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/properties/SwingInfo.java +source=manual/src/main/java/org/apache/zest/manual/recipes/properties/SwingInfo.java tag=info ----------- @@ -95,6 +95,6 @@ Our generic Swing UI will be mainly reflective in nature, but when it gets hold [snippet,java] ----------- -source=manual/src/main/java/org/qi4j/manual/recipes/properties/SwingPanel.java +source=manual/src/main/java/org/apache/zest/manual/recipes/properties/SwingPanel.java tag=info-use ----------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/manual/src/docs/tutorials/howto-releasing-apache.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-releasing-apache.txt b/manual/src/docs/tutorials/howto-releasing-apache.txt index f529318..21327db 100644 --- a/manual/src/docs/tutorials/howto-releasing-apache.txt +++ b/manual/src/docs/tutorials/howto-releasing-apache.txt @@ -372,7 +372,7 @@ Tag: https://git-wip-us.apache.org/repos/asf?p=zest-java.git;a=tag;h=cc0f8211bf4 The distributions to be voted on are located here: https://dist.apache.org/repos/dist/dev/zest/ -Convenience artifacts in a maven repository are staged here: https://repository.apache.org/content/groups/staging/org/qi4j/ +Convenience artifacts in a maven repository are staged here: https://repository.apache.org/content/groups/staging/org/apache/zest/ Release distributions and convenience artifacts are signed with the following key: https://dist.apache.org/repos/dist/dev/zest/KEYS http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/manual/src/docs/tutorials/howto-use-io.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/tutorials/howto-use-io.txt b/manual/src/docs/tutorials/howto-use-io.txt index 7eaecf6..318e299 100644 --- a/manual/src/docs/tutorials/howto-use-io.txt +++ b/manual/src/docs/tutorials/howto-use-io.txt @@ -89,7 +89,7 @@ To start with we have Input: [snippet,java] -------------- -source=core/io/src/main/java/org/qi4j/io/Input.java +source=core/io/src/main/java/org/apache/zest/io/Input.java tag=input ------------- @@ -105,7 +105,7 @@ On the receiving side we then have Output: [snippet,java] -------------- -source=core/io/src/main/java/org/qi4j/io/Output.java +source=core/io/src/main/java/org/apache/zest/io/Output.java tag=output ------------- @@ -118,7 +118,7 @@ Next we have Sender: [snippet,java] -------------- -source=core/io/src/main/java/org/qi4j/io/Sender.java +source=core/io/src/main/java/org/apache/zest/io/Sender.java tag=sender ------------- @@ -127,7 +127,7 @@ this point can start transferring data of type T to the receiver, one at a time. [snippet,java] -------------- -source=core/io/src/main/java/org/qi4j/io/Receiver.java +source=core/io/src/main/java/org/apache/zest/io/Receiver.java tag=receiver ------------- @@ -147,7 +147,7 @@ looks like this: [snippet,java] -------------- -source=manual/src/main/java/org/qi4j/manual/recipes/io/Docs.java +source=manual/src/main/java/org/apache/zest/manual/recipes/io/Docs.java tag=filter -------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/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 d5eb13e..d578e57 100644 --- a/manual/src/docs/tutorials/howto-writing-docs.txt +++ b/manual/src/docs/tutorials/howto-writing-docs.txt @@ -226,7 +226,7 @@ Most source code that is included in the documentation should be extract via +SN ---- [snippet,java] ----------- - source=tutorials/introduction/tenminutes/src/main/java/org/qi4j/demo/tenminute/OrderEntity.java + source=tutorials/introduction/tenminutes/src/main/java/org/apache/zest/demo/tenminute/OrderEntity.java tag=mainClass ----------- ---- @@ -236,11 +236,11 @@ The above could be bringing in content that looks like; [source] ---- -package org.qi4j.demo.tenminute; +package org.apache.zest.demo.tenminute; -import org.qi4j.api.concern.Concerns; -import org.qi4j.api.entity.EntityComposite; -import org.qi4j.api.sideeffect.SideEffects; +import org.apache.zest.api.concern.Concerns; +import org.apache.zest.api.entity.EntityComposite; +import org.apache.zest.api.sideeffect.SideEffects; // START SNIPPET: sideEffect @SideEffects( MailNotifySideEffect.class ) @@ -259,7 +259,7 @@ which will be rendered as; [snippet,java] ----------- -source=tutorials/introduction/tenminutes/src/main/java/org/qi4j/demo/tenminute/OrderEntity.java +source=tutorials/introduction/tenminutes/src/main/java/org/apache/zest/demo/tenminute/OrderEntity.java tag=mainClass ----------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/manual/src/docs/userguide/glossary.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/userguide/glossary.txt b/manual/src/docs/userguide/glossary.txt index 38a1205..e523451 100644 --- a/manual/src/docs/userguide/glossary.txt +++ b/manual/src/docs/userguide/glossary.txt @@ -231,7 +231,7 @@ This term has no definition yet. Learn how to contribute in <<community-docs>>. [[def-invocation-stack,Invocation Stack]]Invocation Stack:: + -- -For each method, Qi4J will create and re-use an Invocation Stack. It will be built with the sequence of +For each method, Zest⢠will create and re-use an Invocation Stack. It will be built with the sequence of <<def-modifier,Modifiers>> and an end-point that will link into the stateful <<def-mixin>>. It is important to recognize that, for memory footprint reasons, Invocation Stacks are shared across http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/manual/src/docs/website/intro.txt ---------------------------------------------------------------------- diff --git a/manual/src/docs/website/intro.txt b/manual/src/docs/website/intro.txt index 8b86d4a..1e17772 100644 --- a/manual/src/docs/website/intro.txt +++ b/manual/src/docs/website/intro.txt @@ -36,7 +36,7 @@ include::../../../../tutorials/introduction/src/docs/what-is-composite-oriented- :leveloffset: 2 -// include::../../../../tutorials/introduction/src/docs/qi4j-cop.txt[] +// include::../../../../tutorials/introduction/src/docs/zest-cop.txt[] // // :leveloffset: 2 http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/tests/regression/README-for-regression-reporting.txt ---------------------------------------------------------------------- diff --git a/tests/regression/README-for-regression-reporting.txt b/tests/regression/README-for-regression-reporting.txt index 5a8cb40..b4dcb3e 100644 --- a/tests/regression/README-for-regression-reporting.txt +++ b/tests/regression/README-for-regression-reporting.txt @@ -3,14 +3,14 @@ Regression Test reporting follows the following steps; 1. Go to http://ops4j1.jira.com/browse/QI and create a new JIRA issue about the problem. -2. Create a package named org.qi4j.tests.regression.qi123 (for QI-123) in $QI4J/tests/regression/src/main/java. +2. Create a package named org.apache.zest.tests.regression.qi123 (for QI-123) in $ZEST/tests/regression/src/main/java. NOTE: observe that the test MUST sit in the src/MAIN/java and not under src/test 3. Create a JUnit or TestNG test capturing the issue described in JIRA. 4. Commit and push this to the 'origin develop' branch. -5. Ping the community on the qi4j-dev forum at Google Groups. +5. Ping the community on the [email protected] mailing list. Once the reported problem has been solved, the test will be moved to the sub-project's unit test area. http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/tools/envisage/src/docs/envisage.txt ---------------------------------------------------------------------- diff --git a/tools/envisage/src/docs/envisage.txt b/tools/envisage/src/docs/envisage.txt index 01551c0..fb3a8b3 100644 --- a/tools/envisage/src/docs/envisage.txt +++ b/tools/envisage/src/docs/envisage.txt @@ -29,7 +29,7 @@ Envisage can be easily used directly and prior your Application activation: [snippet,java] ---- -source=tools/envisage/src/test/java/org/qi4j/envisage/school/EnvisageSchoolSample.java +source=tools/envisage/src/test/java/org/apache/zest/envisage/school/EnvisageSchoolSample.java tag=envisage ---- http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/Qi4jApplicationComponent.java ---------------------------------------------------------------------- diff --git a/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/Qi4jApplicationComponent.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/Qi4jApplicationComponent.java new file mode 100644 index 0000000..9bebb6b --- /dev/null +++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/Qi4jApplicationComponent.java @@ -0,0 +1,131 @@ +/* Copyright 2008 Edward Yakop. +* +* 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.ide.plugin.idea; + +import com.intellij.codeInspection.InspectionToolProvider; +import com.intellij.facet.FacetTypeRegistry; +import com.intellij.ide.fileTemplates.FileTemplateDescriptor; +import com.intellij.ide.fileTemplates.FileTemplateGroupDescriptor; +import com.intellij.ide.fileTemplates.FileTemplateGroupDescriptorFactory; +import com.intellij.openapi.components.ApplicationComponent; +import com.intellij.openapi.fileTypes.FileTypeManager; +import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; +import org.apache.zest.ide.plugin.idea.appliesTo.inspections.AppliesToAnnotationDeclaredCorrectlyInspection; +import org.apache.zest.ide.plugin.idea.common.facet.Qi4jFacetType; +import org.apache.zest.ide.plugin.idea.concerns.inspections.ConcernsAnnotationDeclaredCorrectlyInspection; +import org.apache.zest.ide.plugin.idea.injections.invocation.inspections.InvocationAnnotationDeclaredCorrectlyInspection; +import org.apache.zest.ide.plugin.idea.injections.service.inspections.ServiceAnnotationDeclaredCorrectlyInspection; +import org.apache.zest.ide.plugin.idea.injections.structure.inspections.StructureAnnotationDeclaredCorrectlyInspection; +import org.apache.zest.ide.plugin.idea.mixins.inspections.MixinImplementsMixinType; +import org.apache.zest.ide.plugin.idea.mixins.inspections.MixinsAnnotationDeclaredOnMixinType; +import org.apache.zest.ide.plugin.idea.sideEffects.inspections.SideEffectsAnnotationDeclaredCorrectlyInspection; + +import javax.swing.*; + +import static org.apache.zest.ide.plugin.idea.common.resource.Qi4jResourceBundle.message; + +/** + * @author [email protected] + * @since 0.1 + */ +public final class Qi4jApplicationComponent + implements ApplicationComponent, InspectionToolProvider, FileTemplateGroupDescriptorFactory +{ + @NonNls + private static String[] FILE_TEMPLATES = { + "GenericConcernOf.java" + }; + + private final Qi4jFacetType qi4jFacetType; + + public Qi4jApplicationComponent() + { + qi4jFacetType = new Qi4jFacetType(); + } + + @NotNull + public final String getComponentName() + { + return "Qi4jApplicationComponent"; + } + + public final void initComponent() + { + registerFacet(); + registerIntentions(); + } + + private void registerFacet() + { + FacetTypeRegistry facetTypeRegistry = FacetTypeRegistry.getInstance(); + facetTypeRegistry.registerFacetType( qi4jFacetType ); + } + + private void registerIntentions() + { +// IntentionManager intentionManager = IntentionManager.getInstance(); +// intentionManager.registerIntentionAndMetaData( new AddConcernOnType(), "intention.category.control.flow" ); + } + + public final void disposeComponent() + { + unregisterFacet(); + } + + private void unregisterFacet() + { + FacetTypeRegistry facetTypeRegistry = FacetTypeRegistry.getInstance(); + facetTypeRegistry.unregisterFacetType( qi4jFacetType ); + } + + public final Class[] getInspectionClasses() + { + return new Class[]{ + // Concerns + ConcernsAnnotationDeclaredCorrectlyInspection.class, + // Mixins + MixinImplementsMixinType.class, + MixinsAnnotationDeclaredOnMixinType.class, + // Side effects + SideEffectsAnnotationDeclaredCorrectlyInspection.class, + // Injections + InvocationAnnotationDeclaredCorrectlyInspection.class, + ServiceAnnotationDeclaredCorrectlyInspection.class, + StructureAnnotationDeclaredCorrectlyInspection.class, + // AppliesTo + AppliesToAnnotationDeclaredCorrectlyInspection.class + }; + } + + public final FileTemplateGroupDescriptor getFileTemplatesDescriptor() + { + FileTemplateGroupDescriptor group = new FileTemplateGroupDescriptor( + message( "qi4j.file.template.group.title" ), null + ); + + FileTypeManager fileTypeManager = FileTypeManager.getInstance(); + for( @NonNls String template : FILE_TEMPLATES ) + { + Icon icon = fileTypeManager.getFileTypeByFileName( template ).getIcon(); + group.addTemplate( new FileTemplateDescriptor( template, icon ) ); + } + + return group; + } + +} http://git-wip-us.apache.org/repos/asf/zest-java/blob/fc41bb18/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/appliesTo/common/Qi4jAppliesToConstants.java ---------------------------------------------------------------------- diff --git a/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/appliesTo/common/Qi4jAppliesToConstants.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/appliesTo/common/Qi4jAppliesToConstants.java new file mode 100644 index 0000000..745e31b --- /dev/null +++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/appliesTo/common/Qi4jAppliesToConstants.java @@ -0,0 +1,31 @@ +/* Copyright 2008 Edward Yakop. +* +* 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.ide.plugin.idea.appliesTo.common; + +/** + * @author [email protected] + * @since 0.1 + */ +public final class Qi4jAppliesToConstants +{ + public static final String QUALIFIED_NAME_APPLIES_TO = "org.qi4j.api.common.AppliesTo"; + public static final String QUALIFIED_NAME_APPLIES_TO_FILTER = "org.qi4j.api.common.AppliesToFilter"; + + private Qi4jAppliesToConstants() + { + } +} \ No newline at end of file
