Repository: zest-qi4j Updated Branches: refs/heads/develop c59468c72 -> fe619882c
* Added documentation to Voldemort * Added Copyright headers. * Fixed compile errors in Javadocs under Java 8. Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/484e3118 Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/484e3118 Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/484e3118 Branch: refs/heads/develop Commit: 484e3118160b9ea39958a6c29a05134d39804c9f Parents: c59468c Author: Niclas Hedhman <[email protected]> Authored: Wed Jun 10 10:36:15 2015 +0800 Committer: Niclas Hedhman <[email protected]> Committed: Wed Jun 10 10:36:15 2015 +0800 ---------------------------------------------------------------------- .../qi4j/api/configuration/Configuration.java | 4 +-- .../org/qi4j/api/unitofwork/UnitOfWork.java | 20 ++++++----- extensions/entitystore-voldemort/dev-status.xml | 4 +-- .../src/docs/es-voldemort.txt | 24 ++++++++++++-- .../voldemort/VoldemortConfiguration.java | 35 ++++++++++++++++++-- .../entitystore/voldemort/VoldemortTest.java | 4 +++ .../lang-beanshell/src/docs/lang-beanshell.txt | 24 ++++++++++++++ .../org/qi4j/lang/beanshell/HelloSpeaker.java | 24 ++++++++++++++ .../qi4j/lang/beanshell/BeanShellComposite.bsh | 12 ++++++- .../java/org/qi4j/lang/groovy/HelloSpeaker.java | 3 +- .../org/qi4j/lang/groovy/Mixin1.groovy | 11 ++++++ .../org/qi4j/lang/javascript/DomainType.js | 11 ++++++ .../org/qi4j/lang/jruby/MyDomainType.rb | 12 +++++++ .../scala/ExclamationGenericConcern.scala | 11 ++++++ .../qi4j/sample/scala/HelloThereConcern.scala | 11 ++++++ .../qi4j/sample/scala/HelloWorldComposite.scala | 11 ++++++ .../sample/scala/HelloWorldComposite2.scala | 11 ++++++ .../sample/scala/HelloWorldCompositeTest.java | 11 ++++++ .../org/qi4j/sample/scala/HelloWorldMixin.scala | 11 ++++++ .../qi4j/sample/scala/HelloWorldMixin2.scala | 11 ++++++ .../qi4j/sample/scala/HelloWorldMixin3.scala | 11 ++++++ .../org/qi4j/sample/scala/TestEntity.scala | 11 ++++++ .../org/qi4j/sample/scala/TestService.scala | 11 ++++++ 23 files changed, 278 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/484e3118/core/api/src/main/java/org/qi4j/api/configuration/Configuration.java ---------------------------------------------------------------------- diff --git a/core/api/src/main/java/org/qi4j/api/configuration/Configuration.java b/core/api/src/main/java/org/qi4j/api/configuration/Configuration.java index bb97640..6207ce2 100644 --- a/core/api/src/main/java/org/qi4j/api/configuration/Configuration.java +++ b/core/api/src/main/java/org/qi4j/api/configuration/Configuration.java @@ -52,7 +52,7 @@ import static org.qi4j.functional.Iterables.first; * <p> * If a new Configuration instance is created then it will be populated with properties * from the properties file whose filesystem name is the same as the identity (e.g. "MyService.properties"). - * If a service is not given a name via the {@link org.qi4j.bootstrap.ServiceDeclaration#identifiedBy(String)}, the + * If a service is not given a name via the {@code org.qi4j.bootstrap.ServiceDeclaration#identifiedBy(String)}, the * name will default to the FQCN of the ServiceComposite type. * </p> * <p> @@ -129,7 +129,7 @@ public interface Configuration<T> /** * Updates the values of the managed user ConfigurationComposite instance from the underlying - * {@link org.qi4j.spi.entitystore.EntityStore}. Any modified values in the current user configuration that + * {@code org.qi4j.spi.entitystore.EntityStore}. Any modified values in the current user configuration that * has not been saved, via {@link #save()} method, will be lost. */ void refresh(); http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/484e3118/core/api/src/main/java/org/qi4j/api/unitofwork/UnitOfWork.java ---------------------------------------------------------------------- diff --git a/core/api/src/main/java/org/qi4j/api/unitofwork/UnitOfWork.java b/core/api/src/main/java/org/qi4j/api/unitofwork/UnitOfWork.java index 7721265..2ce6855 100644 --- a/core/api/src/main/java/org/qi4j/api/unitofwork/UnitOfWork.java +++ b/core/api/src/main/java/org/qi4j/api/unitofwork/UnitOfWork.java @@ -353,17 +353,18 @@ public interface UnitOfWork extends MetaInfoHolder, AutoCloseable /** * Converts the provided Entity to a Value of the same type. * This is a convenience method to convert an EntityComposite to a ValueComposite. - * <p/> + * <p> * All Property values are transferred across as-is, and the Association, ManyAssociation * and NamedAssociatino values are kept in the ValueComposite as EntityReferences * until they are dereferenced (get() and other methods), and IF a UnitOfWork is * present at dereferencing the corresponding EntityCompoiste is retrieved from the * EntityStore. If there is not an UnitOfWork present, an exception is thrown. - * <p/> + * </p> + * <p> * For this to work, the Composites (both Entity and Value) must not declare the * EntityComposite and ValueComposite super types, but rely on the declaration in * the assembly, and also extend the Identity supertype. - * + * </p> * Example; * <pre><code> * public interface Person extends Identity { ... }; @@ -386,22 +387,25 @@ public interface UnitOfWork extends MetaInfoHolder, AutoCloseable /** * Converts the provided Value to an Entity of the same type. * This is a convenience method to convert a ValueComposite to an EntityComposite. - * <p/> + * <p> * All Property values are transferred across as-is (no deep copy in case mutable * types (DISCOURAGED!) are used), and the Association, ManyAssociation * and NamedAssociatino that were in the ValueComposite as EntityReferences are * transferred into the EntityComposite correctly, and can be dereferenced. - * <p/> + * </p> + * <p> * This method MUST be called within a UnitOfWork. - * <p/> + * </p> + * <p> * If an Entity with the Identity in the ValueComposite already exists, then that * Entity is updated with the values from the ValueComposite. If an Entity of * that Identity doesn't exist and new one is created. - * <p/> + * </p> + * <p> * For this to work, the Composites (both Entity and Value) must not declare the * EntityComposite and ValueComposite super types, but rely on the declaration in * the assembly, and also extend the Identity supertype. - * + * </p> * Example; * <pre><code> * public interface Person extends Identity { ... }; http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/484e3118/extensions/entitystore-voldemort/dev-status.xml ---------------------------------------------------------------------- diff --git a/extensions/entitystore-voldemort/dev-status.xml b/extensions/entitystore-voldemort/dev-status.xml index 9a22175..8a97f26 100644 --- a/extensions/entitystore-voldemort/dev-status.xml +++ b/extensions/entitystore-voldemort/dev-status.xml @@ -8,10 +8,10 @@ <codebase>beta</codebase> <!-- none, brief, good, complete --> - <documentation>none</documentation> + <documentation>good</documentation> <!-- none, some, good, complete --> - <unittests>some</unittests> + <unittests>good</unittests> </status> <licenses> <license>ALv2</license> http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/484e3118/extensions/entitystore-voldemort/src/docs/es-voldemort.txt ---------------------------------------------------------------------- diff --git a/extensions/entitystore-voldemort/src/docs/es-voldemort.txt b/extensions/entitystore-voldemort/src/docs/es-voldemort.txt index 9e8bf42..53d1fc1 100644 --- a/extensions/entitystore-voldemort/src/docs/es-voldemort.txt +++ b/extensions/entitystore-voldemort/src/docs/es-voldemort.txt @@ -6,8 +6,26 @@ source=extensions/entitystore-voldemort/dev-status.xml -------------- -Voldemort EntityStore - -NOTE: This Extension has no documentation yet. Learn how to contribute in <<community-docs>>. +EntityStore service backed by http://www.project-voldemort.com/voldemort/[Voldemort]. include::../../build/docs/buildinfo/artifact.txt[] + +== Assembly == + +Assembly is done using the provided Assembler. + +[snippet,java] +---- +source=extensions/entitystore-voldemort/src/test/java/org/qi4j/entitystore/voldemort/VoldemortTest.java +tag=assembly +---- + +== Configuration == + +Most of the configuration of Voldemort is available in the Qi4j Configuration Entity. + +[snippet,java] +---- +source=extensions/entitystore-voldemort/src/main/java/org/qi4j/entitystore/voldemort/VoldemortConfiguration.java +tag=config +---- http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/484e3118/extensions/entitystore-voldemort/src/main/java/org/qi4j/entitystore/voldemort/VoldemortConfiguration.java ---------------------------------------------------------------------- diff --git a/extensions/entitystore-voldemort/src/main/java/org/qi4j/entitystore/voldemort/VoldemortConfiguration.java b/extensions/entitystore-voldemort/src/main/java/org/qi4j/entitystore/voldemort/VoldemortConfiguration.java index 3ae5ea5..2da36ba 100644 --- a/extensions/entitystore-voldemort/src/main/java/org/qi4j/entitystore/voldemort/VoldemortConfiguration.java +++ b/extensions/entitystore-voldemort/src/main/java/org/qi4j/entitystore/voldemort/VoldemortConfiguration.java @@ -23,17 +23,37 @@ import org.qi4j.api.common.Optional; import org.qi4j.api.configuration.ConfigurationComposite; import org.qi4j.api.property.Property; +/** + * The configuration entity for the Voldemort EntityStore. + * <p> + * Most of these properties are used to call the corresponding setters in the + * {@code voldemort.client.ClientConfig} object passed to Voldemort runtime upon start. + * The {@code voldemort.client.ClientConfig} is instantiated by the default constructor. + * + * </p> + */ public interface VoldemortConfiguration extends ConfigurationComposite { @Optional Property<String> storeName(); -// @Optional + // @Optional // Property<Integer> clientZoneId(); // @Optional Property<Integer> connectionTimeout(); + /** + * The Bootstrap URL for Voldemort runtime to use. + * <p> + * The configuration property is optional. Default: "tcp://localhost:8581" + * </p> + * <p> + * This value is used to call voldemort.client.ClientConfig#setBootstrapUrls(java.util.List) + * </p> + * + * @return The property containing the bootstrap URL configuration. + */ @Optional Property<List<String>> bootstrapUrl(); @@ -82,9 +102,21 @@ public interface VoldemortConfiguration extends ConfigurationComposite @Optional Property<Integer> maxTotalConnections(); + /** Voldemort has avolved the format over time, and this property sets which request format to use. + * See {@code voldemort.client.protocol.RequestFormatType} in Voldemort for further details. + * + * @return The configuration property that contains the request type formet used in Voldemort. + */ @Optional Property<String> requestFormatType(); + /** Sets the routing tier of this Voldemort runtime. + * <p> + * Possible values are 'client' and 'server'. See {@code voldemort.client.RoutingTier} in + * Voldemort for details. + * </p> + * @return the confirguration property that contains the Routing Tier setting for Voldemort. + */ @Optional Property<String> routingTier(); @@ -105,5 +137,4 @@ public interface VoldemortConfiguration extends ConfigurationComposite @Optional Property<Integer> threadIdleTime(); - } http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/484e3118/extensions/entitystore-voldemort/src/test/java/org/qi4j/entitystore/voldemort/VoldemortTest.java ---------------------------------------------------------------------- diff --git a/extensions/entitystore-voldemort/src/test/java/org/qi4j/entitystore/voldemort/VoldemortTest.java b/extensions/entitystore-voldemort/src/test/java/org/qi4j/entitystore/voldemort/VoldemortTest.java index 55a59a6..05eaa6b 100644 --- a/extensions/entitystore-voldemort/src/test/java/org/qi4j/entitystore/voldemort/VoldemortTest.java +++ b/extensions/entitystore-voldemort/src/test/java/org/qi4j/entitystore/voldemort/VoldemortTest.java @@ -64,19 +64,23 @@ public class VoldemortTest } } + // START SNIPPET: assembly @Override public void assemble( ModuleAssembly module ) throws AssemblyException { + // END SNIPPET: assembly super.assemble( module ); ModuleAssembly config = module.layer().module( "config" ); new EntityTestAssembler().assemble( config ); new OrgJsonValueSerializationAssembler().assemble( module ); + // START SNIPPET: assembly new VoldemortAssembler(). visibleIn( Visibility.layer ). withConfig( config, Visibility.layer ). assemble( module ); + // END SNIPPET: assembly } private File setupVoldemortHome() http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/484e3118/libraries/lang-beanshell/src/docs/lang-beanshell.txt ---------------------------------------------------------------------- diff --git a/libraries/lang-beanshell/src/docs/lang-beanshell.txt b/libraries/lang-beanshell/src/docs/lang-beanshell.txt index a870bdf..7a08f81 100644 --- a/libraries/lang-beanshell/src/docs/lang-beanshell.txt +++ b/libraries/lang-beanshell/src/docs/lang-beanshell.txt @@ -11,3 +11,27 @@ Beanshell Scripting Library NOTE: This Library has no documentation yet. Learn how to contribute in <<community-docs>>. include::../../build/docs/buildinfo/artifact.txt[] + + +The Beanshell Scripting Library is a Generic mixin that implements interfaces +by delegating to Beanshell method. Each method in an interface is declared by a +BeanShell method in a file located in classpath with the name _INTEFRACE_FQDN_.bsh, +where the INTEFRACE_FQDN includes the package, and has "." replaced with "/". + + Example: + org/qi4j/samples/hello/domain/HelloWorldSpeaker.bsh + +That means that the HelloWorldSpeaker.bsh file may be co-located with the +class files in the same package. It is currently not supported to place +the BeanShell implementation of the mixin in a different package than the +interface it implements. + +To use BeanShell to implement the Mixin functionality for a given interface, +simply declare the +BeanShellMixin+ like any other mixin, either in the interface +or at assembly time. + +[snippet,java] +---- +source=libraries/lang-beanshell/src/test/java/org/qi4j/lang/beanshell/HelloSpeaker.java +tag=mixin +---- http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/484e3118/libraries/lang-beanshell/src/test/java/org/qi4j/lang/beanshell/HelloSpeaker.java ---------------------------------------------------------------------- diff --git a/libraries/lang-beanshell/src/test/java/org/qi4j/lang/beanshell/HelloSpeaker.java b/libraries/lang-beanshell/src/test/java/org/qi4j/lang/beanshell/HelloSpeaker.java new file mode 100644 index 0000000..893891e --- /dev/null +++ b/libraries/lang-beanshell/src/test/java/org/qi4j/lang/beanshell/HelloSpeaker.java @@ -0,0 +1,24 @@ +/* + * Copyright 2007 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.qi4j.lang.beanshell; + +import org.qi4j.api.mixin.Mixins; + +// START SNIPPET: mixin +import org.qi4j.lang.beanshell.BeanShellMixin; + +@Mixins(BeanShellMixin.class) +public interface HelloSpeaker +{ + void sayHello(); +} +// END SNIPPET: mixin http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/484e3118/libraries/lang-beanshell/src/test/resources/org/qi4j/lang/beanshell/BeanShellComposite.bsh ---------------------------------------------------------------------- diff --git a/libraries/lang-beanshell/src/test/resources/org/qi4j/lang/beanshell/BeanShellComposite.bsh b/libraries/lang-beanshell/src/test/resources/org/qi4j/lang/beanshell/BeanShellComposite.bsh index fa55bac..fc2b16b 100644 --- a/libraries/lang-beanshell/src/test/resources/org/qi4j/lang/beanshell/BeanShellComposite.bsh +++ b/libraries/lang-beanshell/src/test/resources/org/qi4j/lang/beanshell/BeanShellComposite.bsh @@ -1,4 +1,14 @@ - +/* + * Copyright 2007 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. +*/ import org.qi4j.lang.beanshell.Mixin1; public class Mixin1Impl http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/484e3118/libraries/lang-groovy/src/test/java/org/qi4j/lang/groovy/HelloSpeaker.java ---------------------------------------------------------------------- diff --git a/libraries/lang-groovy/src/test/java/org/qi4j/lang/groovy/HelloSpeaker.java b/libraries/lang-groovy/src/test/java/org/qi4j/lang/groovy/HelloSpeaker.java index a4527f0..369918e 100644 --- a/libraries/lang-groovy/src/test/java/org/qi4j/lang/groovy/HelloSpeaker.java +++ b/libraries/lang-groovy/src/test/java/org/qi4j/lang/groovy/HelloSpeaker.java @@ -15,9 +15,8 @@ import org.qi4j.api.mixin.Mixins; // START SNIPPET: mixin import org.qi4j.lang.groovy.GroovyMixin; -// END SNIPPET: mixin -// START SNIPPET: mixin + @Mixins(GroovyMixin.class) public interface HelloSpeaker { http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/484e3118/libraries/lang-groovy/src/test/resources/org/qi4j/lang/groovy/Mixin1.groovy ---------------------------------------------------------------------- diff --git a/libraries/lang-groovy/src/test/resources/org/qi4j/lang/groovy/Mixin1.groovy b/libraries/lang-groovy/src/test/resources/org/qi4j/lang/groovy/Mixin1.groovy index 637e39d..29429cc 100644 --- a/libraries/lang-groovy/src/test/resources/org/qi4j/lang/groovy/Mixin1.groovy +++ b/libraries/lang-groovy/src/test/resources/org/qi4j/lang/groovy/Mixin1.groovy @@ -1,3 +1,14 @@ +/* + * Copyright 2007 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. +*/ public class Mixin1 { def This http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/484e3118/libraries/lang-javascript/src/test/resources/org/qi4j/lang/javascript/DomainType.js ---------------------------------------------------------------------- diff --git a/libraries/lang-javascript/src/test/resources/org/qi4j/lang/javascript/DomainType.js b/libraries/lang-javascript/src/test/resources/org/qi4j/lang/javascript/DomainType.js index 91a7a62..848ebfe 100644 --- a/libraries/lang-javascript/src/test/resources/org/qi4j/lang/javascript/DomainType.js +++ b/libraries/lang-javascript/src/test/resources/org/qi4j/lang/javascript/DomainType.js @@ -1,3 +1,14 @@ +/* + * Copyright 2007 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. + */ // This is a line comment. /* A block comment should not interfere */ http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/484e3118/libraries/lang-jruby/src/test/resources/org/qi4j/lang/jruby/MyDomainType.rb ---------------------------------------------------------------------- diff --git a/libraries/lang-jruby/src/test/resources/org/qi4j/lang/jruby/MyDomainType.rb b/libraries/lang-jruby/src/test/resources/org/qi4j/lang/jruby/MyDomainType.rb index 8c405c9..b64d1fe 100644 --- a/libraries/lang-jruby/src/test/resources/org/qi4j/lang/jruby/MyDomainType.rb +++ b/libraries/lang-jruby/src/test/resources/org/qi4j/lang/jruby/MyDomainType.rb @@ -1,3 +1,15 @@ +/* + * Copyright 2007 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. +*/ + class MyDomainType def do1 return "do1() in Ruby mixin." http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/484e3118/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/ExclamationGenericConcern.scala ---------------------------------------------------------------------- diff --git a/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/ExclamationGenericConcern.scala b/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/ExclamationGenericConcern.scala index 29b71ff..823592d 100644 --- a/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/ExclamationGenericConcern.scala +++ b/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/ExclamationGenericConcern.scala @@ -1,3 +1,14 @@ +/* + * 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.qi4j.sample.scala import java.lang.reflect.Method http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/484e3118/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloThereConcern.scala ---------------------------------------------------------------------- diff --git a/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloThereConcern.scala b/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloThereConcern.scala index 5c50b7b..2cf07bd 100644 --- a/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloThereConcern.scala +++ b/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloThereConcern.scala @@ -1,3 +1,14 @@ +/* + * 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.qi4j.sample.scala import org.qi4j.api.concern.ConcernOf http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/484e3118/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldComposite.scala ---------------------------------------------------------------------- diff --git a/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldComposite.scala b/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldComposite.scala index 64ba652..1321f42 100644 --- a/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldComposite.scala +++ b/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldComposite.scala @@ -1,3 +1,14 @@ +/* + * 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.qi4j.sample.scala import org.qi4j.api.composite.TransientComposite http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/484e3118/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldComposite2.scala ---------------------------------------------------------------------- diff --git a/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldComposite2.scala b/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldComposite2.scala index a86c1cc..621143c 100644 --- a/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldComposite2.scala +++ b/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldComposite2.scala @@ -1,3 +1,14 @@ +/* + * 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.qi4j.sample.scala trait HelloWorldComposite2 http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/484e3118/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldCompositeTest.java ---------------------------------------------------------------------- diff --git a/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldCompositeTest.java b/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldCompositeTest.java index ebc4aae..40b6ec1 100644 --- a/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldCompositeTest.java +++ b/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldCompositeTest.java @@ -1,3 +1,14 @@ +/* + * 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.qi4j.sample.scala; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/484e3118/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldMixin.scala ---------------------------------------------------------------------- diff --git a/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldMixin.scala b/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldMixin.scala index 1a2a2b0..e630f99 100644 --- a/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldMixin.scala +++ b/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldMixin.scala @@ -1,3 +1,14 @@ +/* + * 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.qi4j.sample.scala trait HelloWorldMixin http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/484e3118/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldMixin2.scala ---------------------------------------------------------------------- diff --git a/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldMixin2.scala b/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldMixin2.scala index 45d7e0b..389943d 100644 --- a/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldMixin2.scala +++ b/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldMixin2.scala @@ -1,3 +1,14 @@ +/* + * 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.qi4j.sample.scala import org.qi4j.library.constraints.annotation.MaxLength http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/484e3118/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldMixin3.scala ---------------------------------------------------------------------- diff --git a/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldMixin3.scala b/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldMixin3.scala index cc61030..5b504bc 100644 --- a/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldMixin3.scala +++ b/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/HelloWorldMixin3.scala @@ -1,3 +1,14 @@ +/* + * 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.qi4j.sample.scala /** http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/484e3118/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/TestEntity.scala ---------------------------------------------------------------------- diff --git a/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/TestEntity.scala b/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/TestEntity.scala index 611ca33..d7e0da4 100644 --- a/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/TestEntity.scala +++ b/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/TestEntity.scala @@ -1,3 +1,14 @@ +/* + * 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.qi4j.sample.scala import org.qi4j.api.entity.EntityComposite http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/484e3118/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/TestService.scala ---------------------------------------------------------------------- diff --git a/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/TestService.scala b/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/TestService.scala index 9c09674..fdbd54b 100644 --- a/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/TestService.scala +++ b/libraries/lang-scala/src/test/scala/org/qi4j/sample/scala/TestService.scala @@ -1,3 +1,14 @@ +/* + * 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.qi4j.sample.scala import org.qi4j.api.service.ServiceComposite
