You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by ni...@apache.org on 2015/07/30 21:49:13 UTC
[74/80] zest-java git commit: Tightening everything up after massive
namespace change. Removal of practically all "Qi4j" names and references.
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/etc/qi4j-api-checkstyle.xml
----------------------------------------------------------------------
diff --git a/etc/qi4j-api-checkstyle.xml b/etc/qi4j-api-checkstyle.xml
deleted file mode 100644
index d9c55c2..0000000
--- a/etc/qi4j-api-checkstyle.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<!--***********************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- ***********************************************************-->
-
-<!-- Documentation is availableService at
- http://checkstyle.sourceforge.net/availablechecks.html
--->
-<module name="Checker">
- <property name="severity" value="warning"/>
- <module name="NewlineAtEndOfFile"/>
- <module name="Translation"/>
- <module name="JavadocPackage"/>
- <module name="TreeWalker">
- <module name="MutableException"/>
-
- <module name="CyclomaticComplexity">
- <property name="max" value="7"/>
- </module>
- <module name="Indentation"/>
- <module name="CovariantEquals"/>
- <module name="FileContentsHolder"/>
- <module name="ArrayTypeStyle"/>
- <!-- 2005-Oct-05
- final in method arguments is just ugly in my opinion,
- communicates very little, and is not preventing much
- problem. Remove it for now.
- <module name="FinalParameters">
- <property name="severity" value="ignore"/>
- <property name="tokens" value="METHOD_DEF, CTOR_DEF"/>
- </module>
- -->
-
- <!--
- <module name="GenericIllegalRegexp">
- <property name="severity" value="ignore"/>
- <property name="format" value="\s+$"/>
- <property name="message" value="Line has trailing spaces."/>
- </module>
- -->
-
- <module name="ModifierOrder"/>
- <module name="RedundantModifier">
- <property name="severity" value="ignore"/>
- <property name="tokens" value="METHOD_DEF, VARIABLE_DEF"/>
- </module>
-
- <module name="TodoComment"/>
- <module name="UpperEll"/>
- <module name="AvoidNestedBlocks"/>
- <module name="EmptyBlock">
- <property name="tokens"
- value="LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_IF, LITERAL_FOR, LITERAL_TRY, LITERAL_WHILE, STATIC_INIT"/>
- </module>
- <module name="LeftCurly">
- <property name="option" value="nl"/>
- <property name="tokens"
- value="CLASS_DEF, CTOR_DEF, INTERFACE_DEF, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF"/>
-
- </module>
- <module name="NeedBraces"/>
- <module name="RightCurly">
- <property name="option" value="alone"/>
- <property name="tokens" value="LITERAL_CATCH, LITERAL_ELSE, LITERAL_TRY"/>
- </module>
- <module name="AvoidInlineConditionals"/>
- <module name="DoubleCheckedLocking"/>
- <module name="EmptyStatement"/>
-
- <module name="EqualsHashCode"/>
- <!--<module name="HiddenField"/>-->
- <module name="IllegalInstantiation"/>
- <module name="InnerAssignment"/>
- <module name="MagicNumber">
- <property name="tokens" value="NUM_DOUBLE, NUM_FLOAT"/>
- <property name="ignoreNumbers" value="-1, 0, 1, 2, 10, 50, 60, 100, 1000, 3600"/>
- </module>
- <module name="MissingSwitchDefault"/>
-
- <!--
- Niclas 2005-09-16:
- This check seems somewhat broken, since
- a = b == false;
- is more readable in my view than
- a = !b
- but the former will trigger this rule. Therefor I disable it.
- <module name="SimplifyBooleanExpression">
- </module>
- -->
- <module name="SimplifyBooleanReturn"/>
- <module name="StringLiteralEquality"/>
- <module name="NestedIfDepth">
- <property name="max" value="3"/>
- </module>
- <module name="NestedTryDepth">
- <property name="max" value="2"/>
- </module>
-
- <module name="SuperClone"/>
- <module name="SuperFinalize"/>
- <module name="IllegalCatch">
- <property name="illegalClassNames" value="java.lang.Exception, java.lang.Throwable, java.lang.Error"/>
- </module>
- <module name="IllegalThrows">
- <property name="illegalClassNames"
- value="java.lang.Exception, java.lang.Throwable, java.lang.RuntimeException, java.lang.Error"/>
- </module>
- <module name="PackageDeclaration"/>
-
- <module name="JUnitTestCase"/>
- <module name="DeclarationOrder"/>
- <module name="ParameterAssignment"/>
- <!--<module name="MissingCtor"/>-->
- <module name="MultipleVariableDeclarations"/>
- <module name="DesignForExtension">
- <property name="severity" value="ignore"/>
- </module>
- <module name="FinalClass"/>
-
- <module name="HideUtilityClassConstructor"/>
- <module name="VisibilityModifier"/>
- <module name="AvoidStarImport"/>
- <module name="IllegalImport"/>
- <module name="RedundantImport"/>
- <module name="UnusedImports"/>
- <module name="ImportOrder">
- <property name="groups" value=""/>
- <property name="ordered" value="true"/>
- <property name="option" value="under"/>
- <property name="separated" value="true"/>
- <property name="caseSensitive" value="true"/>
- </module>
-
- <!--TODO Removing this until Javadoc effort has picked up -->
- <!--<module name="JavadocMethod"/>-->
- <!--<module name="JavadocType"/>-->
- <!--<module name="JavadocVariable">-->
- <!--<property name="scope" value="package"/>-->
- <!--</module>-->
- <module name="ConstantName">
- <property name="format" value="^[A-Z0-9_$]*$"/>
- </module>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName">
- <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
- </module>
- <module name="MethodName"/>
- <module name="PackageName"/>
-
- <module name="ParameterName"/>
- <module name="StaticVariableName">
- <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
- </module>
- <module name="TypeName"/>
- <module name="LineLength">
-
- <property name="max" value="120"/>
- </module>
- <module name="MethodLength"/>
- <module name="AnonInnerLength">
- <property name="max" value="60"/>
- </module>
- <module name="ParameterNumber">
- <property name="max" value="12"/>
- </module>
-
- <module name="EmptyForIteratorPad"/>
- <module name="NoWhitespaceAfter">
- <property name="tokens" value="BNOT,DEC,DOT,INC,UNARY_MINUS,UNARY_PLUS"/>
- </module>
- <!--<module name="OperatorWrap"/>-->
- <module name="ParenPad">
- <property name="option" value="space"/>
- <property name="tokens" value="CTOR_CALL, LPAREN, METHOD_CALL, RPAREN, SUPER_CTOR_CALL"/>
- </module>
-
- <!--
- <module name="TabCharacter"/>
- -->
-
- <module name="WhitespaceAfter"/>
- <module name="WhitespaceAround">
- <property name="tokens"
- value="BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_DO, LITERAL_RETURN, LITERAL_TRY, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN"/>
- </module>
- </module>
-
- <module name="FileLength">
- <property name="max" value="1000"/>
- </module>
-
-</module>
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/etc/qi4j-runtime-checkstyle.xml
----------------------------------------------------------------------
diff --git a/etc/qi4j-runtime-checkstyle.xml b/etc/qi4j-runtime-checkstyle.xml
deleted file mode 100644
index a50e0db..0000000
--- a/etc/qi4j-runtime-checkstyle.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<!--***********************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- ***********************************************************-->
-
-<!-- Documentation is availableService at
- http://checkstyle.sourceforge.net/availablechecks.html
--->
-<module name="Checker">
- <property name="severity" value="warning"/>
- <module name="NewlineAtEndOfFile"/>
- <module name="Translation"/>
- <!--TODO Removing this until Javadoc effort has picked up -->
- <!--<module name="JavadocPackage"/>-->
- <module name="TreeWalker">
- <module name="MutableException"/>
-
- <module name="CyclomaticComplexity">
- <property name="max" value="7"/>
- </module>
- <module name="Indentation"/>
- <module name="CovariantEquals"/>
- <module name="FileContentsHolder"/>
- <module name="ArrayTypeStyle"/>
- <!-- 2005-Oct-05
- final in method arguments is just ugly in my opinion,
- communicates very little, and is not preventing much
- problem. Remove it for now.
- <module name="FinalParameters">
- <property name="severity" value="ignore"/>
- <property name="tokens" value="METHOD_DEF, CTOR_DEF"/>
- </module>
- -->
-
- <!--
- <module name="GenericIllegalRegexp">
- <property name="severity" value="ignore"/>
- <property name="format" value="\s+$"/>
- <property name="message" value="Line has trailing spaces."/>
- </module>
- -->
-
- <module name="ModifierOrder"/>
- <module name="RedundantModifier">
- <property name="severity" value="ignore"/>
- <property name="tokens" value="METHOD_DEF, VARIABLE_DEF"/>
- </module>
-
- <module name="TodoComment"/>
- <module name="UpperEll"/>
- <module name="AvoidNestedBlocks"/>
- <module name="EmptyBlock">
- <property name="tokens"
- value="LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_IF, LITERAL_FOR, LITERAL_TRY, LITERAL_WHILE, STATIC_INIT"/>
- </module>
- <module name="LeftCurly">
- <property name="option" value="nl"/>
- <property name="tokens"
- value="CLASS_DEF, CTOR_DEF, INTERFACE_DEF, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF"/>
-
- </module>
- <module name="NeedBraces"/>
- <module name="RightCurly">
- <property name="option" value="alone"/>
- <property name="tokens" value="LITERAL_CATCH, LITERAL_ELSE, LITERAL_TRY"/>
- </module>
- <module name="AvoidInlineConditionals"/>
- <module name="DoubleCheckedLocking"/>
- <module name="EmptyStatement"/>
-
- <module name="EqualsHashCode"/>
- <!--<module name="HiddenField"/>-->
- <module name="IllegalInstantiation"/>
- <module name="InnerAssignment"/>
- <module name="MagicNumber">
- <property name="tokens" value="NUM_DOUBLE, NUM_FLOAT"/>
- <property name="ignoreNumbers" value="-1, 0, 1, 2, 10, 50, 60, 100, 1000, 3600"/>
- </module>
- <module name="MissingSwitchDefault"/>
-
- <!--
- Niclas 2005-09-16:
- This check seems somewhat broken, since
- a = b == false;
- is more readable in my view than
- a = !b
- but the former will trigger this rule. Therefor I disable it.
- <module name="SimplifyBooleanExpression">
- </module>
- -->
- <module name="SimplifyBooleanReturn"/>
- <module name="StringLiteralEquality"/>
- <module name="NestedIfDepth">
- <property name="max" value="3"/>
- </module>
- <module name="NestedTryDepth">
- <property name="max" value="2"/>
- </module>
-
- <module name="SuperClone"/>
- <module name="SuperFinalize"/>
- <module name="IllegalCatch">
- <property name="illegalClassNames" value="java.lang.Exception, java.lang.Throwable, java.lang.Error"/>
- </module>
- <module name="IllegalThrows">
- <property name="illegalClassNames"
- value="java.lang.Exception, java.lang.Throwable, java.lang.RuntimeException, java.lang.Error"/>
- </module>
- <module name="PackageDeclaration"/>
-
- <module name="JUnitTestCase"/>
- <module name="DeclarationOrder"/>
- <module name="ParameterAssignment"/>
- <!--<module name="MissingCtor"/>-->
- <module name="MultipleVariableDeclarations"/>
- <module name="DesignForExtension">
- <property name="severity" value="ignore"/>
- </module>
- <module name="FinalClass"/>
-
- <module name="HideUtilityClassConstructor"/>
- <module name="VisibilityModifier"/>
- <module name="AvoidStarImport"/>
- <module name="IllegalImport"/>
- <module name="RedundantImport"/>
- <module name="UnusedImports"/>
- <module name="ImportOrder">
- <property name="groups" value=""/>
- <property name="ordered" value="true"/>
- <property name="option" value="under"/>
- <property name="separated" value="true"/>
- <property name="caseSensitive" value="true"/>
- </module>
- <!--TODO Removing this until Javadoc effort has picked up -->
- <!--<module name="JavadocType"/>-->
- <module name="ConstantName">
- <property name="format" value="^[A-Z0-9_$]*$"/>
- </module>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName">
- <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
- </module>
- <module name="MethodName"/>
- <module name="PackageName"/>
-
- <module name="ParameterName"/>
- <module name="StaticVariableName">
- <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
- </module>
- <module name="TypeName"/>
- <module name="LineLength">
-
- <property name="max" value="120"/>
- </module>
- <module name="MethodLength"/>
- <module name="AnonInnerLength">
- <property name="max" value="60"/>
- </module>
- <module name="ParameterNumber">
- <property name="max" value="12"/>
- </module>
-
- <module name="EmptyForIteratorPad"/>
- <module name="NoWhitespaceAfter">
- <property name="tokens" value="BNOT,DEC,DOT,INC,UNARY_MINUS,UNARY_PLUS"/>
- </module>
- <!--<module name="OperatorWrap"/>-->
- <module name="ParenPad">
- <property name="option" value="space"/>
- <property name="tokens" value="CTOR_CALL, LPAREN, METHOD_CALL, RPAREN, SUPER_CTOR_CALL"/>
- </module>
-
- <!--
- <module name="TabCharacter"/>
- -->
-
- <module name="WhitespaceAfter"/>
- <module name="WhitespaceAround">
- <property name="tokens"
- value="BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_DO, LITERAL_RETURN, LITERAL_TRY, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN"/>
- </module>
- </module>
-
- <module name="FileLength">
- <property name="max" value="1000"/>
- </module>
-
-</module>
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/etc/qi4j-tests-checkstyle.xml
----------------------------------------------------------------------
diff --git a/etc/qi4j-tests-checkstyle.xml b/etc/qi4j-tests-checkstyle.xml
deleted file mode 100644
index be1fca6..0000000
--- a/etc/qi4j-tests-checkstyle.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<!--***********************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- ***********************************************************-->
-
-<!-- Documentation is availableService at
- http://checkstyle.sourceforge.net/availablechecks.html
--->
-<module name="Checker">
- <property name="severity" value="warning"/>
- <module name="NewlineAtEndOfFile"/>
- <module name="Translation"/>
- <module name="TreeWalker">
- <module name="MutableException"/>
-
- <module name="CyclomaticComplexity">
- <property name="max" value="7"/>
- </module>
- <module name="Indentation"/>
- <module name="CovariantEquals"/>
- <module name="FileContentsHolder"/>
- <module name="ArrayTypeStyle"/>
- <!--
- <module name="GenericIllegalRegexp">
- <property name="severity" value="ignore"/>
- <property name="format" value="\s+$"/>
- <property name="message" value="Line has trailing spaces."/>
- </module>
- -->
-
- <module name="ModifierOrder"/>
- <module name="RedundantModifier">
- <property name="severity" value="ignore"/>
- <property name="tokens" value="METHOD_DEF, VARIABLE_DEF"/>
- </module>
-
- <module name="TodoComment"/>
- <module name="UpperEll"/>
- <module name="AvoidNestedBlocks"/>
- <module name="EmptyBlock">
- <property name="tokens"
- value="LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_IF, LITERAL_FOR, LITERAL_TRY, LITERAL_WHILE, STATIC_INIT"/>
- </module>
- <module name="LeftCurly">
- <property name="option" value="nl"/>
- <property name="tokens"
- value="CLASS_DEF, CTOR_DEF, INTERFACE_DEF, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF"/>
-
- </module>
- <module name="NeedBraces"/>
- <module name="RightCurly">
- <property name="option" value="alone"/>
- <property name="tokens" value="LITERAL_CATCH, LITERAL_ELSE, LITERAL_TRY"/>
- </module>
- <module name="AvoidInlineConditionals"/>
- <module name="DoubleCheckedLocking"/>
- <module name="EmptyStatement"/>
-
- <module name="EqualsHashCode"/>
- <!--<module name="HiddenField"/>-->
- <module name="IllegalInstantiation"/>
- <module name="InnerAssignment"/>
- <module name="MagicNumber">
- <property name="tokens" value="NUM_DOUBLE, NUM_FLOAT"/>
- <property name="ignoreNumbers" value="-1, 0, 1, 2, 10, 50, 60, 100, 1000, 3600"/>
- </module>
- <module name="MissingSwitchDefault"/>
-
- <!--
- Niclas 2005-09-16:
- This check seems somewhat broken, since
- a = b == false;
- is more readable in my view than
- a = !b
- but the former will trigger this rule. Therefor I disable it.
- <module name="SimplifyBooleanExpression">
- </module>
- -->
- <module name="SimplifyBooleanReturn"/>
- <module name="StringLiteralEquality"/>
- <module name="NestedIfDepth">
- <property name="max" value="3"/>
- </module>
- <module name="NestedTryDepth">
- <property name="max" value="2"/>
- </module>
-
- <module name="SuperClone"/>
- <module name="SuperFinalize"/>
- <!-- Ok in tests...
- <module name="IllegalCatch">
- <property name="illegalClassNames" value="java.lang.Exception, java.lang.Throwable, java.lang.Error"/>
- </module>
- <module name="IllegalThrows">
- <property name="illegalClassNames"
- value="java.lang.Exception, java.lang.Throwable, java.lang.RuntimeException, java.lang.Error"/>
- </module>
- -->
- <module name="PackageDeclaration"/>
-
- <module name="JUnitTestCase"/>
- <module name="DeclarationOrder"/>
- <module name="ParameterAssignment"/>
- <!--<module name="MissingCtor"/>-->
- <module name="MultipleVariableDeclarations"/>
- <module name="DesignForExtension">
- <property name="severity" value="ignore"/>
- </module>
- <module name="FinalClass"/>
-
- <module name="HideUtilityClassConstructor"/>
- <module name="VisibilityModifier"/>
- <module name="AvoidStarImport"/>
- <module name="IllegalImport"/>
- <module name="RedundantImport"/>
- <module name="UnusedImports"/>
- <module name="ImportOrder">
- <property name="groups" value=""/>
- <property name="ordered" value="true"/>
- <property name="separated" value="false"/>
- <property name="caseSensitive" value="true"/>
- <property name="option" value="under"/>
- </module>
- <module name="ConstantName">
- <property name="format" value="^[A-Z0-9_$]*$"/>
- </module>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName">
- <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
- </module>
- <module name="MethodName"/>
- <module name="PackageName"/>
-
- <module name="ParameterName"/>
- <module name="StaticVariableName">
- <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
- </module>
- <module name="TypeName"/>
- <module name="LineLength">
-
- <property name="max" value="120"/>
- </module>
- <module name="MethodLength"/>
- <module name="AnonInnerLength">
- <property name="max" value="60"/>
- </module>
- <module name="ParameterNumber">
- <property name="max" value="12"/>
- </module>
-
- <module name="EmptyForIteratorPad"/>
- <module name="NoWhitespaceAfter">
- <property name="tokens" value="BNOT,DEC,DOT,INC,UNARY_MINUS,UNARY_PLUS"/>
- </module>
- <!--<module name="OperatorWrap"/>-->
- <module name="ParenPad">
- <property name="option" value="space"/>
- <property name="tokens" value="CTOR_CALL, LPAREN, METHOD_CALL, RPAREN, SUPER_CTOR_CALL"/>
- </module>
-
- <!--
- <module name="TabCharacter"/>
- -->
-
- <module name="WhitespaceAfter"/>
- <module name="WhitespaceAround">
- <property name="tokens"
- value="BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_DO, LITERAL_RETURN, LITERAL_TRY, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN"/>
- </module>
- </module>
-
- <module name="FileLength">
- <property name="max" value="1000"/>
- </module>
-
-</module>
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/etc/zest-api-checkstyle.xml
----------------------------------------------------------------------
diff --git a/etc/zest-api-checkstyle.xml b/etc/zest-api-checkstyle.xml
new file mode 100644
index 0000000..d9c55c2
--- /dev/null
+++ b/etc/zest-api-checkstyle.xml
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<!--***********************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+
+<!-- Documentation is availableService at
+ http://checkstyle.sourceforge.net/availablechecks.html
+-->
+<module name="Checker">
+ <property name="severity" value="warning"/>
+ <module name="NewlineAtEndOfFile"/>
+ <module name="Translation"/>
+ <module name="JavadocPackage"/>
+ <module name="TreeWalker">
+ <module name="MutableException"/>
+
+ <module name="CyclomaticComplexity">
+ <property name="max" value="7"/>
+ </module>
+ <module name="Indentation"/>
+ <module name="CovariantEquals"/>
+ <module name="FileContentsHolder"/>
+ <module name="ArrayTypeStyle"/>
+ <!-- 2005-Oct-05
+ final in method arguments is just ugly in my opinion,
+ communicates very little, and is not preventing much
+ problem. Remove it for now.
+ <module name="FinalParameters">
+ <property name="severity" value="ignore"/>
+ <property name="tokens" value="METHOD_DEF, CTOR_DEF"/>
+ </module>
+ -->
+
+ <!--
+ <module name="GenericIllegalRegexp">
+ <property name="severity" value="ignore"/>
+ <property name="format" value="\s+$"/>
+ <property name="message" value="Line has trailing spaces."/>
+ </module>
+ -->
+
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier">
+ <property name="severity" value="ignore"/>
+ <property name="tokens" value="METHOD_DEF, VARIABLE_DEF"/>
+ </module>
+
+ <module name="TodoComment"/>
+ <module name="UpperEll"/>
+ <module name="AvoidNestedBlocks"/>
+ <module name="EmptyBlock">
+ <property name="tokens"
+ value="LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_IF, LITERAL_FOR, LITERAL_TRY, LITERAL_WHILE, STATIC_INIT"/>
+ </module>
+ <module name="LeftCurly">
+ <property name="option" value="nl"/>
+ <property name="tokens"
+ value="CLASS_DEF, CTOR_DEF, INTERFACE_DEF, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF"/>
+
+ </module>
+ <module name="NeedBraces"/>
+ <module name="RightCurly">
+ <property name="option" value="alone"/>
+ <property name="tokens" value="LITERAL_CATCH, LITERAL_ELSE, LITERAL_TRY"/>
+ </module>
+ <module name="AvoidInlineConditionals"/>
+ <module name="DoubleCheckedLocking"/>
+ <module name="EmptyStatement"/>
+
+ <module name="EqualsHashCode"/>
+ <!--<module name="HiddenField"/>-->
+ <module name="IllegalInstantiation"/>
+ <module name="InnerAssignment"/>
+ <module name="MagicNumber">
+ <property name="tokens" value="NUM_DOUBLE, NUM_FLOAT"/>
+ <property name="ignoreNumbers" value="-1, 0, 1, 2, 10, 50, 60, 100, 1000, 3600"/>
+ </module>
+ <module name="MissingSwitchDefault"/>
+
+ <!--
+ Niclas 2005-09-16:
+ This check seems somewhat broken, since
+ a = b == false;
+ is more readable in my view than
+ a = !b
+ but the former will trigger this rule. Therefor I disable it.
+ <module name="SimplifyBooleanExpression">
+ </module>
+ -->
+ <module name="SimplifyBooleanReturn"/>
+ <module name="StringLiteralEquality"/>
+ <module name="NestedIfDepth">
+ <property name="max" value="3"/>
+ </module>
+ <module name="NestedTryDepth">
+ <property name="max" value="2"/>
+ </module>
+
+ <module name="SuperClone"/>
+ <module name="SuperFinalize"/>
+ <module name="IllegalCatch">
+ <property name="illegalClassNames" value="java.lang.Exception, java.lang.Throwable, java.lang.Error"/>
+ </module>
+ <module name="IllegalThrows">
+ <property name="illegalClassNames"
+ value="java.lang.Exception, java.lang.Throwable, java.lang.RuntimeException, java.lang.Error"/>
+ </module>
+ <module name="PackageDeclaration"/>
+
+ <module name="JUnitTestCase"/>
+ <module name="DeclarationOrder"/>
+ <module name="ParameterAssignment"/>
+ <!--<module name="MissingCtor"/>-->
+ <module name="MultipleVariableDeclarations"/>
+ <module name="DesignForExtension">
+ <property name="severity" value="ignore"/>
+ </module>
+ <module name="FinalClass"/>
+
+ <module name="HideUtilityClassConstructor"/>
+ <module name="VisibilityModifier"/>
+ <module name="AvoidStarImport"/>
+ <module name="IllegalImport"/>
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+ <module name="ImportOrder">
+ <property name="groups" value=""/>
+ <property name="ordered" value="true"/>
+ <property name="option" value="under"/>
+ <property name="separated" value="true"/>
+ <property name="caseSensitive" value="true"/>
+ </module>
+
+ <!--TODO Removing this until Javadoc effort has picked up -->
+ <!--<module name="JavadocMethod"/>-->
+ <!--<module name="JavadocType"/>-->
+ <!--<module name="JavadocVariable">-->
+ <!--<property name="scope" value="package"/>-->
+ <!--</module>-->
+ <module name="ConstantName">
+ <property name="format" value="^[A-Z0-9_$]*$"/>
+ </module>
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName">
+ <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
+ </module>
+ <module name="MethodName"/>
+ <module name="PackageName"/>
+
+ <module name="ParameterName"/>
+ <module name="StaticVariableName">
+ <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
+ </module>
+ <module name="TypeName"/>
+ <module name="LineLength">
+
+ <property name="max" value="120"/>
+ </module>
+ <module name="MethodLength"/>
+ <module name="AnonInnerLength">
+ <property name="max" value="60"/>
+ </module>
+ <module name="ParameterNumber">
+ <property name="max" value="12"/>
+ </module>
+
+ <module name="EmptyForIteratorPad"/>
+ <module name="NoWhitespaceAfter">
+ <property name="tokens" value="BNOT,DEC,DOT,INC,UNARY_MINUS,UNARY_PLUS"/>
+ </module>
+ <!--<module name="OperatorWrap"/>-->
+ <module name="ParenPad">
+ <property name="option" value="space"/>
+ <property name="tokens" value="CTOR_CALL, LPAREN, METHOD_CALL, RPAREN, SUPER_CTOR_CALL"/>
+ </module>
+
+ <!--
+ <module name="TabCharacter"/>
+ -->
+
+ <module name="WhitespaceAfter"/>
+ <module name="WhitespaceAround">
+ <property name="tokens"
+ value="BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_DO, LITERAL_RETURN, LITERAL_TRY, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN"/>
+ </module>
+ </module>
+
+ <module name="FileLength">
+ <property name="max" value="1000"/>
+ </module>
+
+</module>
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/etc/zest-runtime-checkstyle.xml
----------------------------------------------------------------------
diff --git a/etc/zest-runtime-checkstyle.xml b/etc/zest-runtime-checkstyle.xml
new file mode 100644
index 0000000..a50e0db
--- /dev/null
+++ b/etc/zest-runtime-checkstyle.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<!--***********************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+
+<!-- Documentation is availableService at
+ http://checkstyle.sourceforge.net/availablechecks.html
+-->
+<module name="Checker">
+ <property name="severity" value="warning"/>
+ <module name="NewlineAtEndOfFile"/>
+ <module name="Translation"/>
+ <!--TODO Removing this until Javadoc effort has picked up -->
+ <!--<module name="JavadocPackage"/>-->
+ <module name="TreeWalker">
+ <module name="MutableException"/>
+
+ <module name="CyclomaticComplexity">
+ <property name="max" value="7"/>
+ </module>
+ <module name="Indentation"/>
+ <module name="CovariantEquals"/>
+ <module name="FileContentsHolder"/>
+ <module name="ArrayTypeStyle"/>
+ <!-- 2005-Oct-05
+ final in method arguments is just ugly in my opinion,
+ communicates very little, and is not preventing much
+ problem. Remove it for now.
+ <module name="FinalParameters">
+ <property name="severity" value="ignore"/>
+ <property name="tokens" value="METHOD_DEF, CTOR_DEF"/>
+ </module>
+ -->
+
+ <!--
+ <module name="GenericIllegalRegexp">
+ <property name="severity" value="ignore"/>
+ <property name="format" value="\s+$"/>
+ <property name="message" value="Line has trailing spaces."/>
+ </module>
+ -->
+
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier">
+ <property name="severity" value="ignore"/>
+ <property name="tokens" value="METHOD_DEF, VARIABLE_DEF"/>
+ </module>
+
+ <module name="TodoComment"/>
+ <module name="UpperEll"/>
+ <module name="AvoidNestedBlocks"/>
+ <module name="EmptyBlock">
+ <property name="tokens"
+ value="LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_IF, LITERAL_FOR, LITERAL_TRY, LITERAL_WHILE, STATIC_INIT"/>
+ </module>
+ <module name="LeftCurly">
+ <property name="option" value="nl"/>
+ <property name="tokens"
+ value="CLASS_DEF, CTOR_DEF, INTERFACE_DEF, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF"/>
+
+ </module>
+ <module name="NeedBraces"/>
+ <module name="RightCurly">
+ <property name="option" value="alone"/>
+ <property name="tokens" value="LITERAL_CATCH, LITERAL_ELSE, LITERAL_TRY"/>
+ </module>
+ <module name="AvoidInlineConditionals"/>
+ <module name="DoubleCheckedLocking"/>
+ <module name="EmptyStatement"/>
+
+ <module name="EqualsHashCode"/>
+ <!--<module name="HiddenField"/>-->
+ <module name="IllegalInstantiation"/>
+ <module name="InnerAssignment"/>
+ <module name="MagicNumber">
+ <property name="tokens" value="NUM_DOUBLE, NUM_FLOAT"/>
+ <property name="ignoreNumbers" value="-1, 0, 1, 2, 10, 50, 60, 100, 1000, 3600"/>
+ </module>
+ <module name="MissingSwitchDefault"/>
+
+ <!--
+ Niclas 2005-09-16:
+ This check seems somewhat broken, since
+ a = b == false;
+ is more readable in my view than
+ a = !b
+ but the former will trigger this rule. Therefor I disable it.
+ <module name="SimplifyBooleanExpression">
+ </module>
+ -->
+ <module name="SimplifyBooleanReturn"/>
+ <module name="StringLiteralEquality"/>
+ <module name="NestedIfDepth">
+ <property name="max" value="3"/>
+ </module>
+ <module name="NestedTryDepth">
+ <property name="max" value="2"/>
+ </module>
+
+ <module name="SuperClone"/>
+ <module name="SuperFinalize"/>
+ <module name="IllegalCatch">
+ <property name="illegalClassNames" value="java.lang.Exception, java.lang.Throwable, java.lang.Error"/>
+ </module>
+ <module name="IllegalThrows">
+ <property name="illegalClassNames"
+ value="java.lang.Exception, java.lang.Throwable, java.lang.RuntimeException, java.lang.Error"/>
+ </module>
+ <module name="PackageDeclaration"/>
+
+ <module name="JUnitTestCase"/>
+ <module name="DeclarationOrder"/>
+ <module name="ParameterAssignment"/>
+ <!--<module name="MissingCtor"/>-->
+ <module name="MultipleVariableDeclarations"/>
+ <module name="DesignForExtension">
+ <property name="severity" value="ignore"/>
+ </module>
+ <module name="FinalClass"/>
+
+ <module name="HideUtilityClassConstructor"/>
+ <module name="VisibilityModifier"/>
+ <module name="AvoidStarImport"/>
+ <module name="IllegalImport"/>
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+ <module name="ImportOrder">
+ <property name="groups" value=""/>
+ <property name="ordered" value="true"/>
+ <property name="option" value="under"/>
+ <property name="separated" value="true"/>
+ <property name="caseSensitive" value="true"/>
+ </module>
+ <!--TODO Removing this until Javadoc effort has picked up -->
+ <!--<module name="JavadocType"/>-->
+ <module name="ConstantName">
+ <property name="format" value="^[A-Z0-9_$]*$"/>
+ </module>
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName">
+ <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
+ </module>
+ <module name="MethodName"/>
+ <module name="PackageName"/>
+
+ <module name="ParameterName"/>
+ <module name="StaticVariableName">
+ <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
+ </module>
+ <module name="TypeName"/>
+ <module name="LineLength">
+
+ <property name="max" value="120"/>
+ </module>
+ <module name="MethodLength"/>
+ <module name="AnonInnerLength">
+ <property name="max" value="60"/>
+ </module>
+ <module name="ParameterNumber">
+ <property name="max" value="12"/>
+ </module>
+
+ <module name="EmptyForIteratorPad"/>
+ <module name="NoWhitespaceAfter">
+ <property name="tokens" value="BNOT,DEC,DOT,INC,UNARY_MINUS,UNARY_PLUS"/>
+ </module>
+ <!--<module name="OperatorWrap"/>-->
+ <module name="ParenPad">
+ <property name="option" value="space"/>
+ <property name="tokens" value="CTOR_CALL, LPAREN, METHOD_CALL, RPAREN, SUPER_CTOR_CALL"/>
+ </module>
+
+ <!--
+ <module name="TabCharacter"/>
+ -->
+
+ <module name="WhitespaceAfter"/>
+ <module name="WhitespaceAround">
+ <property name="tokens"
+ value="BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_DO, LITERAL_RETURN, LITERAL_TRY, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN"/>
+ </module>
+ </module>
+
+ <module name="FileLength">
+ <property name="max" value="1000"/>
+ </module>
+
+</module>
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/etc/zest-tests-checkstyle.xml
----------------------------------------------------------------------
diff --git a/etc/zest-tests-checkstyle.xml b/etc/zest-tests-checkstyle.xml
new file mode 100644
index 0000000..be1fca6
--- /dev/null
+++ b/etc/zest-tests-checkstyle.xml
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<!--***********************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+
+<!-- Documentation is availableService at
+ http://checkstyle.sourceforge.net/availablechecks.html
+-->
+<module name="Checker">
+ <property name="severity" value="warning"/>
+ <module name="NewlineAtEndOfFile"/>
+ <module name="Translation"/>
+ <module name="TreeWalker">
+ <module name="MutableException"/>
+
+ <module name="CyclomaticComplexity">
+ <property name="max" value="7"/>
+ </module>
+ <module name="Indentation"/>
+ <module name="CovariantEquals"/>
+ <module name="FileContentsHolder"/>
+ <module name="ArrayTypeStyle"/>
+ <!--
+ <module name="GenericIllegalRegexp">
+ <property name="severity" value="ignore"/>
+ <property name="format" value="\s+$"/>
+ <property name="message" value="Line has trailing spaces."/>
+ </module>
+ -->
+
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier">
+ <property name="severity" value="ignore"/>
+ <property name="tokens" value="METHOD_DEF, VARIABLE_DEF"/>
+ </module>
+
+ <module name="TodoComment"/>
+ <module name="UpperEll"/>
+ <module name="AvoidNestedBlocks"/>
+ <module name="EmptyBlock">
+ <property name="tokens"
+ value="LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_IF, LITERAL_FOR, LITERAL_TRY, LITERAL_WHILE, STATIC_INIT"/>
+ </module>
+ <module name="LeftCurly">
+ <property name="option" value="nl"/>
+ <property name="tokens"
+ value="CLASS_DEF, CTOR_DEF, INTERFACE_DEF, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF"/>
+
+ </module>
+ <module name="NeedBraces"/>
+ <module name="RightCurly">
+ <property name="option" value="alone"/>
+ <property name="tokens" value="LITERAL_CATCH, LITERAL_ELSE, LITERAL_TRY"/>
+ </module>
+ <module name="AvoidInlineConditionals"/>
+ <module name="DoubleCheckedLocking"/>
+ <module name="EmptyStatement"/>
+
+ <module name="EqualsHashCode"/>
+ <!--<module name="HiddenField"/>-->
+ <module name="IllegalInstantiation"/>
+ <module name="InnerAssignment"/>
+ <module name="MagicNumber">
+ <property name="tokens" value="NUM_DOUBLE, NUM_FLOAT"/>
+ <property name="ignoreNumbers" value="-1, 0, 1, 2, 10, 50, 60, 100, 1000, 3600"/>
+ </module>
+ <module name="MissingSwitchDefault"/>
+
+ <!--
+ Niclas 2005-09-16:
+ This check seems somewhat broken, since
+ a = b == false;
+ is more readable in my view than
+ a = !b
+ but the former will trigger this rule. Therefor I disable it.
+ <module name="SimplifyBooleanExpression">
+ </module>
+ -->
+ <module name="SimplifyBooleanReturn"/>
+ <module name="StringLiteralEquality"/>
+ <module name="NestedIfDepth">
+ <property name="max" value="3"/>
+ </module>
+ <module name="NestedTryDepth">
+ <property name="max" value="2"/>
+ </module>
+
+ <module name="SuperClone"/>
+ <module name="SuperFinalize"/>
+ <!-- Ok in tests...
+ <module name="IllegalCatch">
+ <property name="illegalClassNames" value="java.lang.Exception, java.lang.Throwable, java.lang.Error"/>
+ </module>
+ <module name="IllegalThrows">
+ <property name="illegalClassNames"
+ value="java.lang.Exception, java.lang.Throwable, java.lang.RuntimeException, java.lang.Error"/>
+ </module>
+ -->
+ <module name="PackageDeclaration"/>
+
+ <module name="JUnitTestCase"/>
+ <module name="DeclarationOrder"/>
+ <module name="ParameterAssignment"/>
+ <!--<module name="MissingCtor"/>-->
+ <module name="MultipleVariableDeclarations"/>
+ <module name="DesignForExtension">
+ <property name="severity" value="ignore"/>
+ </module>
+ <module name="FinalClass"/>
+
+ <module name="HideUtilityClassConstructor"/>
+ <module name="VisibilityModifier"/>
+ <module name="AvoidStarImport"/>
+ <module name="IllegalImport"/>
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+ <module name="ImportOrder">
+ <property name="groups" value=""/>
+ <property name="ordered" value="true"/>
+ <property name="separated" value="false"/>
+ <property name="caseSensitive" value="true"/>
+ <property name="option" value="under"/>
+ </module>
+ <module name="ConstantName">
+ <property name="format" value="^[A-Z0-9_$]*$"/>
+ </module>
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName">
+ <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
+ </module>
+ <module name="MethodName"/>
+ <module name="PackageName"/>
+
+ <module name="ParameterName"/>
+ <module name="StaticVariableName">
+ <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
+ </module>
+ <module name="TypeName"/>
+ <module name="LineLength">
+
+ <property name="max" value="120"/>
+ </module>
+ <module name="MethodLength"/>
+ <module name="AnonInnerLength">
+ <property name="max" value="60"/>
+ </module>
+ <module name="ParameterNumber">
+ <property name="max" value="12"/>
+ </module>
+
+ <module name="EmptyForIteratorPad"/>
+ <module name="NoWhitespaceAfter">
+ <property name="tokens" value="BNOT,DEC,DOT,INC,UNARY_MINUS,UNARY_PLUS"/>
+ </module>
+ <!--<module name="OperatorWrap"/>-->
+ <module name="ParenPad">
+ <property name="option" value="space"/>
+ <property name="tokens" value="CTOR_CALL, LPAREN, METHOD_CALL, RPAREN, SUPER_CTOR_CALL"/>
+ </module>
+
+ <!--
+ <module name="TabCharacter"/>
+ -->
+
+ <module name="WhitespaceAfter"/>
+ <module name="WhitespaceAround">
+ <property name="tokens"
+ value="BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_DO, LITERAL_RETURN, LITERAL_TRY, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN"/>
+ </module>
+ </module>
+
+ <module name="FileLength">
+ <property name="max" value="1000"/>
+ </module>
+
+</module>
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/cache-ehcache/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/cache-ehcache/build.gradle b/extensions/cache-ehcache/build.gradle
index 9d68d45..82bf060 100644
--- a/extensions/cache-ehcache/build.gradle
+++ b/extensions/cache-ehcache/build.gradle
@@ -23,12 +23,12 @@ jar { manifest { name = "Apache Zest™ Extension: EhCache"}}
dependencies {
- compile(project(':org.qi4j.core:org.qi4j.core.spi'))
- compile(project(':org.qi4j.core:org.qi4j.core.bootstrap'))
+ compile(project(':org.apache.zest.core:org.apache.zest.core.spi'))
+ compile(project(':org.apache.zest.core:org.apache.zest.core.bootstrap'))
compile(libraries.ehcache)
- testCompile( project(':org.qi4j.core:org.qi4j.core.testsupport') )
+ testCompile( project(':org.apache.zest.core:org.apache.zest.core.testsupport') )
- testRuntime( project(':org.qi4j.core:org.qi4j.core.runtime'))
+ testRuntime( project(':org.apache.zest.core:org.apache.zest.core.runtime'))
testRuntime(libraries.logback)
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/cache-ehcache/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/cache-ehcache/dev-status.xml b/extensions/cache-ehcache/dev-status.xml
index b863976..b9b23c4 100644
--- a/extensions/cache-ehcache/dev-status.xml
+++ b/extensions/cache-ehcache/dev-status.xml
@@ -15,10 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
+<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
- http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
+ xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
+ http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
<status>
<!--none,early,beta,stable,mature-->
<codebase>beta</codebase>
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/cache-ehcache/src/main/java/org/apache/zest/cache/ehcache/EhCachePoolMixin.java
----------------------------------------------------------------------
diff --git a/extensions/cache-ehcache/src/main/java/org/apache/zest/cache/ehcache/EhCachePoolMixin.java b/extensions/cache-ehcache/src/main/java/org/apache/zest/cache/ehcache/EhCachePoolMixin.java
index 4f0dc47..0c5d328 100644
--- a/extensions/cache-ehcache/src/main/java/org/apache/zest/cache/ehcache/EhCachePoolMixin.java
+++ b/extensions/cache-ehcache/src/main/java/org/apache/zest/cache/ehcache/EhCachePoolMixin.java
@@ -84,7 +84,7 @@ public abstract class EhCachePoolMixin
{
net.sf.ehcache.config.Configuration configuration = new net.sf.ehcache.config.Configuration();
configureEhCache( configuration );
- CacheConfiguration cc = createCacheConfiguration( "qi4j.ehcache.config.default" );
+ CacheConfiguration cc = createCacheConfiguration( "zest.ehcache.config.default" );
configuration.setDefaultCacheConfiguration( cc );
cacheManager = CacheManager.newInstance( configuration );
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/cache-memcache/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/cache-memcache/build.gradle b/extensions/cache-memcache/build.gradle
index c78356f..636373e 100644
--- a/extensions/cache-memcache/build.gradle
+++ b/extensions/cache-memcache/build.gradle
@@ -23,12 +23,12 @@ jar { manifest { name = "Apache Zest™ Extension - Cache - Memcache"}}
dependencies {
- compile project( ':org.qi4j.core:org.qi4j.core.bootstrap' )
+ compile project( ':org.apache.zest.core:org.apache.zest.core.bootstrap' )
compile libraries.spymemcached
- testCompile project( ':org.qi4j.core:org.qi4j.core.testsupport' )
+ testCompile project( ':org.apache.zest.core:org.apache.zest.core.testsupport' )
- testRuntime project( ':org.qi4j.core:org.qi4j.core.runtime' )
+ testRuntime project( ':org.apache.zest.core:org.apache.zest.core.runtime' )
testRuntime libraries.logback
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/cache-memcache/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/cache-memcache/dev-status.xml b/extensions/cache-memcache/dev-status.xml
index b863976..b9b23c4 100644
--- a/extensions/cache-memcache/dev-status.xml
+++ b/extensions/cache-memcache/dev-status.xml
@@ -15,10 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
+<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
- http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
+ xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
+ http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
<status>
<!--none,early,beta,stable,mature-->
<codebase>beta</codebase>
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-file/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-file/build.gradle b/extensions/entitystore-file/build.gradle
index 5ce6f63..4ef98ad 100644
--- a/extensions/entitystore-file/build.gradle
+++ b/extensions/entitystore-file/build.gradle
@@ -21,15 +21,15 @@ jar { manifest { name = "Apache Zest™ Extension - EntityStore - File system" }
dependencies {
- compile(project(":org.qi4j.core:org.qi4j.core.spi"))
- compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))
- compile(project(":org.qi4j.libraries:org.qi4j.library.constraints"))
- compile(project(":org.qi4j.libraries:org.qi4j.library.locking"))
- compile(project(":org.qi4j.libraries:org.qi4j.library.fileconfig"))
+ compile(project(":org.apache.zest.core:org.apache.zest.core.spi"))
+ compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap"))
+ compile(project(":org.apache.zest.libraries:org.apache.zest.library.constraints"))
+ compile(project(":org.apache.zest.libraries:org.apache.zest.library.locking"))
+ compile(project(":org.apache.zest.libraries:org.apache.zest.library.fileconfig"))
- testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport"))
- testCompile(project(":org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson"))
+ testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport"))
+ testCompile(project(":org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson"))
- testRuntime(project(":org.qi4j.core:org.qi4j.core.runtime"))
+ testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime"))
testRuntime(libraries.logback)
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-file/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-file/dev-status.xml b/extensions/entitystore-file/dev-status.xml
index 94d633f..9f20123 100644
--- a/extensions/entitystore-file/dev-status.xml
+++ b/extensions/entitystore-file/dev-status.xml
@@ -15,10 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
+<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
- http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
+ xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
+ http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
<status>
<!--none,early,beta,stable,mature-->
<codebase>stable</codebase>
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-file/src/docs/es-file.txt
----------------------------------------------------------------------
diff --git a/extensions/entitystore-file/src/docs/es-file.txt b/extensions/entitystore-file/src/docs/es-file.txt
index 9c5057d..6a383f0 100644
--- a/extensions/entitystore-file/src/docs/es-file.txt
+++ b/extensions/entitystore-file/src/docs/es-file.txt
@@ -53,7 +53,7 @@ tag=config
+directory+ is optional and represent the directory where the File EntityStore will keep its persisted state.
-It defaults to System.getProperty( "user.dir" ) + "/qi4j/filestore"
+It defaults to System.getProperty( "user.dir" ) + "/zest/filestore"
If the given path is not absolute, then it's relative to the current working directory.
If you use the <<library-fileconfig>> then this property value is ignored and FileConfig is prefered.
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-file/src/main/java/org/apache/zest/entitystore/file/FileEntityStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-file/src/main/java/org/apache/zest/entitystore/file/FileEntityStoreConfiguration.java b/extensions/entitystore-file/src/main/java/org/apache/zest/entitystore/file/FileEntityStoreConfiguration.java
index d1e8d02..ad2bf46 100644
--- a/extensions/entitystore-file/src/main/java/org/apache/zest/entitystore/file/FileEntityStoreConfiguration.java
+++ b/extensions/entitystore-file/src/main/java/org/apache/zest/entitystore/file/FileEntityStoreConfiguration.java
@@ -35,7 +35,7 @@ public interface FileEntityStoreConfiguration
* The directory where the File Entity Store will be keep its persisted state.
* <p>
* If no configuration is provided at all, then the default location is
- * {@code System.getProperty( "user.dir" ) + "/qi4j/filestore"; }.
+ * {@code System.getProperty( "user.dir" ) + "/zest/filestore"; }.
* If a configuration is given, the entity store will be placed in the
* DATA directory, which is operating system specific.
* </p>
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-file/src/main/java/org/apache/zest/entitystore/file/FileEntityStoreMixin.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-file/src/main/java/org/apache/zest/entitystore/file/FileEntityStoreMixin.java b/extensions/entitystore-file/src/main/java/org/apache/zest/entitystore/file/FileEntityStoreMixin.java
index da3ace7..ce6f74f 100644
--- a/extensions/entitystore-file/src/main/java/org/apache/zest/entitystore/file/FileEntityStoreMixin.java
+++ b/extensions/entitystore-file/src/main/java/org/apache/zest/entitystore/file/FileEntityStoreMixin.java
@@ -79,7 +79,7 @@ public class FileEntityStoreMixin
}
else
{
- pathName = System.getProperty( "user.dir" ) + "/qi4j/filestore/";
+ pathName = System.getProperty( "user.dir" ) + "/zest/filestore/";
}
}
dataDirectory = new File( pathName ).getAbsoluteFile();
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-hazelcast/README.persistent
----------------------------------------------------------------------
diff --git a/extensions/entitystore-hazelcast/README.persistent b/extensions/entitystore-hazelcast/README.persistent
index 43b9016..e8baf5b 100644
--- a/extensions/entitystore-hazelcast/README.persistent
+++ b/extensions/entitystore-hazelcast/README.persistent
@@ -17,7 +17,7 @@ Implementation is set as follow:
<?xml version="1.0" encoding="UTF-8"?>
<hazelcast>
- <map name="qi4j.data">
+ <map name="zest.data">
<map-store enabled="true">
<!--
Name of the class implementing MapLoader and/or MapStore.
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-hazelcast/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-hazelcast/build.gradle b/extensions/entitystore-hazelcast/build.gradle
index edce38d..be4dd24 100644
--- a/extensions/entitystore-hazelcast/build.gradle
+++ b/extensions/entitystore-hazelcast/build.gradle
@@ -23,16 +23,16 @@ jar { manifest { name = "Apache Zest™ Extension - EntityStore - Hazelcast" }}
dependencies {
- compile(project(":org.qi4j.core:org.qi4j.core.api"))
- compile(project(":org.qi4j.core:org.qi4j.core.spi"))
- compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))
- compile(project(":org.qi4j.libraries:org.qi4j.library.locking"))
+ compile(project(":org.apache.zest.core:org.apache.zest.core.api"))
+ compile(project(":org.apache.zest.core:org.apache.zest.core.spi"))
+ compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap"))
+ compile(project(":org.apache.zest.libraries:org.apache.zest.library.locking"))
compile(libraries.hazelcast)
- testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport"))
- testCompile(project(":org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson"))
+ testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport"))
+ testCompile(project(":org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson"))
- testRuntime(project(":org.qi4j.core:org.qi4j.core.runtime"))
+ testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime"))
testRuntime(libraries.logback)
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-hazelcast/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-hazelcast/dev-status.xml b/extensions/entitystore-hazelcast/dev-status.xml
index ac63cda..22993de 100644
--- a/extensions/entitystore-hazelcast/dev-status.xml
+++ b/extensions/entitystore-hazelcast/dev-status.xml
@@ -15,10 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
+<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
- http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
+ xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
+ http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
<status>
<!--none,early,beta,stable,mature-->
<codebase>stable</codebase>
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-hazelcast/src/main/java/org/apache/zest/entitystore/hazelcast/HazelcastEntityStoreMixin.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-hazelcast/src/main/java/org/apache/zest/entitystore/hazelcast/HazelcastEntityStoreMixin.java b/extensions/entitystore-hazelcast/src/main/java/org/apache/zest/entitystore/hazelcast/HazelcastEntityStoreMixin.java
index de218b0..b547ee3 100644
--- a/extensions/entitystore-hazelcast/src/main/java/org/apache/zest/entitystore/hazelcast/HazelcastEntityStoreMixin.java
+++ b/extensions/entitystore-hazelcast/src/main/java/org/apache/zest/entitystore/hazelcast/HazelcastEntityStoreMixin.java
@@ -50,7 +50,7 @@ public class HazelcastEntityStoreMixin
implements ServiceActivation, HazelcastAccessors, MapEntityStore
{
- private static final String DEFAULT_MAPNAME = "qi4j:entitystore:data";
+ private static final String DEFAULT_MAPNAME = "zest:entitystore:data";
@This
private Configuration<HazelcastConfiguration> config;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-hazelcast/src/test/resources/org/apache/zest/entitystore/hazelcast/HazelcastEntityStoreService.properties
----------------------------------------------------------------------
diff --git a/extensions/entitystore-hazelcast/src/test/resources/org/apache/zest/entitystore/hazelcast/HazelcastEntityStoreService.properties b/extensions/entitystore-hazelcast/src/test/resources/org/apache/zest/entitystore/hazelcast/HazelcastEntityStoreService.properties
index 69cf7eb..2b6a688 100644
--- a/extensions/entitystore-hazelcast/src/test/resources/org/apache/zest/entitystore/hazelcast/HazelcastEntityStoreService.properties
+++ b/extensions/entitystore-hazelcast/src/test/resources/org/apache/zest/entitystore/hazelcast/HazelcastEntityStoreService.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-mapName=qi4j.data
\ No newline at end of file
+mapName=zest.data
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-hazelcast/src/test/resources/org/apache/zest/entitystore/hazelcast/hazelcast.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-hazelcast/src/test/resources/org/apache/zest/entitystore/hazelcast/hazelcast.xml b/extensions/entitystore-hazelcast/src/test/resources/org/apache/zest/entitystore/hazelcast/hazelcast.xml
index 28b13fa..6deed43 100644
--- a/extensions/entitystore-hazelcast/src/test/resources/org/apache/zest/entitystore/hazelcast/hazelcast.xml
+++ b/extensions/entitystore-hazelcast/src/test/resources/org/apache/zest/entitystore/hazelcast/hazelcast.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
<hazelcast>
- <map name="qi4j.data">
+ <map name="zest.data">
<map-store enabled="true">
<!--
Name of the class implementing MapLoader and/or MapStore.
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-jclouds/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jclouds/build.gradle b/extensions/entitystore-jclouds/build.gradle
index 23596c3..eea67fd 100644
--- a/extensions/entitystore-jclouds/build.gradle
+++ b/extensions/entitystore-jclouds/build.gradle
@@ -23,17 +23,17 @@ jar { manifest { name = "Apache Zest™ Extension - EntityStore - JClouds" } }
dependencies {
- compile project( ":org.qi4j.core:org.qi4j.core.bootstrap" )
- compile project( ":org.qi4j.libraries:org.qi4j.library.locking" )
+ compile project( ":org.apache.zest.core:org.apache.zest.core.bootstrap" )
+ compile project( ":org.apache.zest.libraries:org.apache.zest.library.locking" )
compile libraries.slf4j_api
compile libraries.jclouds_core
compile libraries.jclouds_blobstore
- testCompile project( ":org.qi4j.core:org.qi4j.core.testsupport" )
- testCompile( project( ":org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson" ) )
+ testCompile project( ":org.apache.zest.core:org.apache.zest.core.testsupport" )
+ testCompile( project( ":org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson" ) )
testCompile libraries.jclouds_filesystem
- testRuntime project( ":org.qi4j.core:org.qi4j.core.runtime" )
+ testRuntime project( ":org.apache.zest.core:org.apache.zest.core.runtime" )
testRuntime libraries.logback
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-jclouds/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jclouds/dev-status.xml b/extensions/entitystore-jclouds/dev-status.xml
index 7b2bb11..0b564d7 100644
--- a/extensions/entitystore-jclouds/dev-status.xml
+++ b/extensions/entitystore-jclouds/dev-status.xml
@@ -15,10 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
+<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
- http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
+ xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
+ http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
<status>
<codebase>stable</codebase>
<!--none,early,beta,stable,mature-->
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-jclouds/src/main/java/org/apache/zest/entitystore/jclouds/JCloudsMapEntityStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jclouds/src/main/java/org/apache/zest/entitystore/jclouds/JCloudsMapEntityStoreConfiguration.java b/extensions/entitystore-jclouds/src/main/java/org/apache/zest/entitystore/jclouds/JCloudsMapEntityStoreConfiguration.java
index d1e75c5..a63bf62 100644
--- a/extensions/entitystore-jclouds/src/main/java/org/apache/zest/entitystore/jclouds/JCloudsMapEntityStoreConfiguration.java
+++ b/extensions/entitystore-jclouds/src/main/java/org/apache/zest/entitystore/jclouds/JCloudsMapEntityStoreConfiguration.java
@@ -37,7 +37,7 @@ public interface JCloudsMapEntityStoreConfiguration
*/
@UseDefaults Property<Map<String, String>> properties();
/**
- * Name of the JClouds container to use. Defaults to 'qi4j-entities'.
+ * Name of the JClouds container to use. Defaults to 'zest-entities'.
*/
@Optional Property<String> container();
// END SNIPPET: config
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-jclouds/src/main/java/org/apache/zest/entitystore/jclouds/JCloudsMapEntityStoreMixin.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jclouds/src/main/java/org/apache/zest/entitystore/jclouds/JCloudsMapEntityStoreMixin.java b/extensions/entitystore-jclouds/src/main/java/org/apache/zest/entitystore/jclouds/JCloudsMapEntityStoreMixin.java
index b5ec56c..bc60d93 100644
--- a/extensions/entitystore-jclouds/src/main/java/org/apache/zest/entitystore/jclouds/JCloudsMapEntityStoreMixin.java
+++ b/extensions/entitystore-jclouds/src/main/java/org/apache/zest/entitystore/jclouds/JCloudsMapEntityStoreMixin.java
@@ -73,7 +73,7 @@ public class JCloudsMapEntityStoreMixin
implements ServiceActivation, MapEntityStore
{
- private static final Logger LOGGER = LoggerFactory.getLogger( "org.qi4j.entitystore.jclouds" );
+ private static final Logger LOGGER = LoggerFactory.getLogger( "org.apache.zest.entitystore.jclouds" );
private static final Map<String, ApiMetadata> allApis = Maps.uniqueIndex(
Apis.viewableAs( BlobStoreContext.class ),
@@ -116,7 +116,7 @@ public class JCloudsMapEntityStoreMixin
}
if( container == null )
{
- container = "qi4j-entities";
+ container = "zest-entities";
}
storeContext = ContextBuilder.newBuilder( provider ).
credentials( identifier, credentials ).
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-jdbm/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jdbm/build.gradle b/extensions/entitystore-jdbm/build.gradle
index c317c15..b20ecd4 100644
--- a/extensions/entitystore-jdbm/build.gradle
+++ b/extensions/entitystore-jdbm/build.gradle
@@ -23,15 +23,15 @@ jar { manifest {name = "Apache Zest™ Extension - EntityStore - JDBM" }}
dependencies {
- compile project( ":org.qi4j.core:org.qi4j.core.bootstrap" )
- compile project( ":org.qi4j.libraries:org.qi4j.library.locking" )
- compile project( ":org.qi4j.libraries:org.qi4j.library.fileconfig" )
+ compile project( ":org.apache.zest.core:org.apache.zest.core.bootstrap" )
+ compile project( ":org.apache.zest.libraries:org.apache.zest.library.locking" )
+ compile project( ":org.apache.zest.libraries:org.apache.zest.library.fileconfig" )
compile libraries.jdbm
- testCompile project( ":org.qi4j.core:org.qi4j.core.testsupport" )
- testCompile(project(":org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson"))
+ testCompile project( ":org.apache.zest.core:org.apache.zest.core.testsupport" )
+ testCompile(project(":org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson"))
- testRuntime project( ":org.qi4j.core:org.qi4j.core.runtime" )
+ testRuntime project( ":org.apache.zest.core:org.apache.zest.core.runtime" )
testRuntime libraries.logback
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-jdbm/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jdbm/dev-status.xml b/extensions/entitystore-jdbm/dev-status.xml
index ac63cda..22993de 100644
--- a/extensions/entitystore-jdbm/dev-status.xml
+++ b/extensions/entitystore-jdbm/dev-status.xml
@@ -15,10 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
+<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
- http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
+ xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
+ http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
<status>
<!--none,early,beta,stable,mature-->
<codebase>stable</codebase>
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-jdbm/src/docs/es-jdbm.txt
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jdbm/src/docs/es-jdbm.txt b/extensions/entitystore-jdbm/src/docs/es-jdbm.txt
index 0c6d3c8..3ef8224 100644
--- a/extensions/entitystore-jdbm/src/docs/es-jdbm.txt
+++ b/extensions/entitystore-jdbm/src/docs/es-jdbm.txt
@@ -51,6 +51,6 @@ tag=config
+file+ is optional and represent the file where the JDBM EntityStore will keep its persisted state.
-It defaults to System.getProperty( "user.dir" ) + "/qi4j/jdbmstore.data"
+It defaults to System.getProperty( "user.dir" ) + "/zest/jdbmstore.data"
If the given path is not absolute, then it's relative to the current working directory.
If you use the <<library-fileconfig>> then this property value is ignored and FileConfig is prefered.
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-jdbm/src/main/java/org/apache/zest/entitystore/jdbm/JdbmConfiguration.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jdbm/src/main/java/org/apache/zest/entitystore/jdbm/JdbmConfiguration.java b/extensions/entitystore-jdbm/src/main/java/org/apache/zest/entitystore/jdbm/JdbmConfiguration.java
index a1942ec..ac3582f 100644
--- a/extensions/entitystore-jdbm/src/main/java/org/apache/zest/entitystore/jdbm/JdbmConfiguration.java
+++ b/extensions/entitystore-jdbm/src/main/java/org/apache/zest/entitystore/jdbm/JdbmConfiguration.java
@@ -32,7 +32,7 @@ public interface JdbmConfiguration
/**
* The file where the JDBM data will be stored
* <p>
- * Default: System.getProperty( "user.dir" ) + "/qi4j/jdbmstore.data";
+ * Default: System.getProperty( "user.dir" ) + "/zest/jdbmstore.data";
* </p>
* @return path to data file relative to current path
*/
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-jdbm/src/main/java/org/apache/zest/entitystore/jdbm/JdbmEntityStoreMixin.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jdbm/src/main/java/org/apache/zest/entitystore/jdbm/JdbmEntityStoreMixin.java b/extensions/entitystore-jdbm/src/main/java/org/apache/zest/entitystore/jdbm/JdbmEntityStoreMixin.java
index ac6c31e..c5dca5b 100644
--- a/extensions/entitystore-jdbm/src/main/java/org/apache/zest/entitystore/jdbm/JdbmEntityStoreMixin.java
+++ b/extensions/entitystore-jdbm/src/main/java/org/apache/zest/entitystore/jdbm/JdbmEntityStoreMixin.java
@@ -415,7 +415,7 @@ public class JdbmEntityStoreMixin
}
else
{
- pathname = System.getProperty( "user.dir" ) + "/qi4j/jdbm.data";
+ pathname = System.getProperty( "user.dir" ) + "/zest/jdbm.data";
}
}
File dataFile = new File( pathname );
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-jdbm/src/test/java/org/apache/zest/entitystore/jdbm/DocumentationSupport.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jdbm/src/test/java/org/apache/zest/entitystore/jdbm/DocumentationSupport.java b/extensions/entitystore-jdbm/src/test/java/org/apache/zest/entitystore/jdbm/DocumentationSupport.java
index 2faba59..eed4747 100644
--- a/extensions/entitystore-jdbm/src/test/java/org/apache/zest/entitystore/jdbm/DocumentationSupport.java
+++ b/extensions/entitystore-jdbm/src/test/java/org/apache/zest/entitystore/jdbm/DocumentationSupport.java
@@ -19,9 +19,9 @@ package org.apache.zest.entitystore.jdbm;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.entitystore.jdbm.assembly.JdbmEntityStoreAssembler;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
-public class DocumentationSupport extends AbstractQi4jTest
+public class DocumentationSupport extends AbstractZestTest
{
// START SNIPPET: UsingAssembler
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-leveldb/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-leveldb/build.gradle b/extensions/entitystore-leveldb/build.gradle
index de2a431..a773a55 100644
--- a/extensions/entitystore-leveldb/build.gradle
+++ b/extensions/entitystore-leveldb/build.gradle
@@ -23,18 +23,18 @@ jar { manifest { name = "Apache Zest™ Extension - EntityStore - LevelDB" }}
dependencies {
- compile project( ":org.qi4j.core:org.qi4j.core.bootstrap" )
- compile project( ":org.qi4j.libraries:org.qi4j.library.locking" )
- compile project( ":org.qi4j.libraries:org.qi4j.library.fileconfig" )
+ compile project( ":org.apache.zest.core:org.apache.zest.core.bootstrap" )
+ compile project( ":org.apache.zest.libraries:org.apache.zest.library.locking" )
+ compile project( ":org.apache.zest.libraries:org.apache.zest.library.fileconfig" )
compile libraries.leveldb_api
runtime libraries.leveldb_java
runtime libraries.leveldb_jni_all
- testCompile project( ":org.qi4j.core:org.qi4j.core.testsupport" )
- testCompile(project(":org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson"))
+ testCompile project( ":org.apache.zest.core:org.apache.zest.core.testsupport" )
+ testCompile(project(":org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson"))
- testRuntime project( ":org.qi4j.core:org.qi4j.core.runtime" )
+ testRuntime project( ":org.apache.zest.core:org.apache.zest.core.runtime" )
testRuntime libraries.logback
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-leveldb/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-leveldb/dev-status.xml b/extensions/entitystore-leveldb/dev-status.xml
index 91d4a63..b1de3e8 100644
--- a/extensions/entitystore-leveldb/dev-status.xml
+++ b/extensions/entitystore-leveldb/dev-status.xml
@@ -15,10 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
+<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
- http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
+ xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
+ http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
<status>
<!--none,early,beta,stable,mature-->
<codebase>beta</codebase>
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-leveldb/src/main/java/org/apache/zest/entitystore/leveldb/package.html
----------------------------------------------------------------------
diff --git a/extensions/entitystore-leveldb/src/main/java/org/apache/zest/entitystore/leveldb/package.html b/extensions/entitystore-leveldb/src/main/java/org/apache/zest/entitystore/leveldb/package.html
index 720a3ff..07f7c0e 100644
--- a/extensions/entitystore-leveldb/src/main/java/org/apache/zest/entitystore/leveldb/package.html
+++ b/extensions/entitystore-leveldb/src/main/java/org/apache/zest/entitystore/leveldb/package.html
@@ -24,7 +24,7 @@ limitations under the License.
<p>
By default use the native implementation through JNI bindings and fallback to the pure java implementation
if not available on the current platform. Used implementation can be forced using the
- {@link org.qi4j.entitystore.leveldb.LevelDBEntityStoreConfiguration#flavour()} property.
+ {@link org.apache.zest.entitystore.leveldb.LevelDBEntityStoreConfiguration#flavour()} property.
</p>
<p>See:</p>
<ul>
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-memory/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-memory/build.gradle b/extensions/entitystore-memory/build.gradle
index 97f1f31..45f608c 100644
--- a/extensions/entitystore-memory/build.gradle
+++ b/extensions/entitystore-memory/build.gradle
@@ -21,12 +21,12 @@ jar { manifest { name = "Apache Zest™ Extension - EntityStore - Memory" }}
dependencies {
- compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))
+ compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap"))
- testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport"))
- testCompile(project(":org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson"))
+ testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport"))
+ testCompile(project(":org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson"))
- testRuntime(project(":org.qi4j.core:org.qi4j.core.runtime"))
+ testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime"))
testRuntime(libraries.logback)
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-memory/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-memory/dev-status.xml b/extensions/entitystore-memory/dev-status.xml
index 73ed2b0..0bcef5e 100644
--- a/extensions/entitystore-memory/dev-status.xml
+++ b/extensions/entitystore-memory/dev-status.xml
@@ -15,10 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
+<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
- http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
+ xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
+ http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
<status>
<codebase>stable</codebase>
<!--none,early,beta,stable,mature-->
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-mongodb/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-mongodb/build.gradle b/extensions/entitystore-mongodb/build.gradle
index 9570a1f..117cbed 100644
--- a/extensions/entitystore-mongodb/build.gradle
+++ b/extensions/entitystore-mongodb/build.gradle
@@ -23,14 +23,14 @@ jar { manifest { name = "Apache Zest™ Extension - EntityStore - MongoDB" }}
dependencies {
- compile project( ":org.qi4j.core:org.qi4j.core.bootstrap" )
- compile project( ":org.qi4j.libraries:org.qi4j.library.locking" )
+ compile project( ":org.apache.zest.core:org.apache.zest.core.bootstrap" )
+ compile project( ":org.apache.zest.libraries:org.apache.zest.library.locking" )
compile libraries.mongodb
- testCompile project( ":org.qi4j.core:org.qi4j.core.testsupport" )
- testCompile(project(":org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson"))
+ testCompile project( ":org.apache.zest.core:org.apache.zest.core.testsupport" )
+ testCompile(project(":org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson"))
- testRuntime project( ":org.qi4j.core:org.qi4j.core.runtime" )
+ testRuntime project( ":org.apache.zest.core:org.apache.zest.core.runtime" )
testRuntime libraries.logback
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-mongodb/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-mongodb/dev-status.xml b/extensions/entitystore-mongodb/dev-status.xml
index ac63cda..22993de 100644
--- a/extensions/entitystore-mongodb/dev-status.xml
+++ b/extensions/entitystore-mongodb/dev-status.xml
@@ -15,10 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
+<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
- http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
+ xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
+ http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
<status>
<!--none,early,beta,stable,mature-->
<codebase>stable</codebase>