Repository: incubator-tamaya-sandbox Updated Branches: refs/heads/configjsr 117c0a918 -> 54b627b95
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/54b627b9/validation/src/test/resources/META-INF/configmodel.properties ---------------------------------------------------------------------- diff --git a/validation/src/test/resources/META-INF/configmodel.properties b/validation/src/test/resources/META-INF/configmodel.properties deleted file mode 100644 index a7956dc..0000000 --- a/validation/src/test/resources/META-INF/configmodel.properties +++ /dev/null @@ -1,96 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy current 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. -# - -################################################################################### -# Example of a configuration metamodel expressed via properties. -#################################################################################### - -# Metamodel information -_model.provider=ConfigModel Extension - -# reusable parameter definition, referenceable as MyNumber -_MyNumber.model.target=Parameter -_MyNumber.model.type=Integer -_MyNumber.model.description=a (reusable) number type parameter (optional) - -#################################################################################### -# Description of Configuration Sections (minimal, can be extended by other modules). -# By default its interpreted as a section ! -#################################################################################### - -# a (section) -_a.model.target=Section -_a.params2.model.target=Parameter -_a.params2.model.type=String -_a.params2.model.required=true -_a.params2.model.description=a required parameter - -_a.paramInt.model.target=Parameter -_a.paramInt.model.type=ref:MyNumber -_a.paramInt.model.description=an optional parameter (default) - -_a._number.model.target=Parameter -_a._number.model.type=Integer -_a._number.model.deprecated=true -_a._number.model.mappedTo=a.paramInt - -# a.b.c (section) -_a.b.c.model.target=Section -_a.b.c.model.description=Just a test section - -# a.b.c.aRequiredSection (section) -_a.b.c.aRequiredSection.model.target=Section -_a.b.c.aRequiredSection.model.required=true -_a.b.c.aRequiredSection.model.description=A section containing required parameters is called a required section.\ - Sections can also explicitly be defined to be required, but without\ - specifying the paramteres to be contained., - -# a.b.c.aRequiredSection.subsection (section) -_a.b.c.aRequiredSection.subsection.model.target=Section - -_a.b.c.aRequiredSection.subsection.param0.model.model.target=Parameter -_a.b.c.aRequiredSection.subsection.param0.type=String -_a.b.c.aRequiredSection.subsection.param0.model.description=a minmally documented String parameter -# A minmal String parameter -_a.b.c.aRequiredSection.subsection.param00.model.target=Parameter -_a.b.c.aRequiredSection.subsection.param00.model.type=String - -# a.b.c.aRequiredSection.subsection (section) -_a.b.c.aRequiredSection.subsection.param1.model.target=Parameter -_a.b.c.aRequiredSection.subsection.param1.model.type = String -_a.b.c.aRequiredSection.subsection.param1.model.required = true -_a.b.c.aRequiredSection.subsection.intParam.model.target=Parameter -_a.b.c.aRequiredSection.subsection.intParam.model.type = Integer -_a.b.c.aRequiredSection.subsection.intParam.model.description=an optional parameter (default) - -# a.b.c.aRequiredSection.nonempty-subsection (section) -_a.b.c.aRequiredSection.nonempty-subsection.model.target=Section -_a.b.c.aRequiredSection.nonempty-subsection.model.required=true - -# a.b.c.aRequiredSection.optional-subsection (section) -_a.b.c.aRequiredSection.optional-subsection.model.target=Section - -# a.b.c.aValidatedSection (section) -_a.b.c.aValidatedSection.model.target=Section -_a.b.c.aValidatedSection.model.description=A validated section. -_a.b.c.aValidatedSection.model.validator=org.apache.tamaya.model.TestValidator - - - - http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/54b627b9/validation/src/test/resources/META-INF/configvalidation.properties ---------------------------------------------------------------------- diff --git a/validation/src/test/resources/META-INF/configvalidation.properties b/validation/src/test/resources/META-INF/configvalidation.properties new file mode 100644 index 0000000..a7956dc --- /dev/null +++ b/validation/src/test/resources/META-INF/configvalidation.properties @@ -0,0 +1,96 @@ +# +# 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 current 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. +# + +################################################################################### +# Example of a configuration metamodel expressed via properties. +#################################################################################### + +# Metamodel information +_model.provider=ConfigModel Extension + +# reusable parameter definition, referenceable as MyNumber +_MyNumber.model.target=Parameter +_MyNumber.model.type=Integer +_MyNumber.model.description=a (reusable) number type parameter (optional) + +#################################################################################### +# Description of Configuration Sections (minimal, can be extended by other modules). +# By default its interpreted as a section ! +#################################################################################### + +# a (section) +_a.model.target=Section +_a.params2.model.target=Parameter +_a.params2.model.type=String +_a.params2.model.required=true +_a.params2.model.description=a required parameter + +_a.paramInt.model.target=Parameter +_a.paramInt.model.type=ref:MyNumber +_a.paramInt.model.description=an optional parameter (default) + +_a._number.model.target=Parameter +_a._number.model.type=Integer +_a._number.model.deprecated=true +_a._number.model.mappedTo=a.paramInt + +# a.b.c (section) +_a.b.c.model.target=Section +_a.b.c.model.description=Just a test section + +# a.b.c.aRequiredSection (section) +_a.b.c.aRequiredSection.model.target=Section +_a.b.c.aRequiredSection.model.required=true +_a.b.c.aRequiredSection.model.description=A section containing required parameters is called a required section.\ + Sections can also explicitly be defined to be required, but without\ + specifying the paramteres to be contained., + +# a.b.c.aRequiredSection.subsection (section) +_a.b.c.aRequiredSection.subsection.model.target=Section + +_a.b.c.aRequiredSection.subsection.param0.model.model.target=Parameter +_a.b.c.aRequiredSection.subsection.param0.type=String +_a.b.c.aRequiredSection.subsection.param0.model.description=a minmally documented String parameter +# A minmal String parameter +_a.b.c.aRequiredSection.subsection.param00.model.target=Parameter +_a.b.c.aRequiredSection.subsection.param00.model.type=String + +# a.b.c.aRequiredSection.subsection (section) +_a.b.c.aRequiredSection.subsection.param1.model.target=Parameter +_a.b.c.aRequiredSection.subsection.param1.model.type = String +_a.b.c.aRequiredSection.subsection.param1.model.required = true +_a.b.c.aRequiredSection.subsection.intParam.model.target=Parameter +_a.b.c.aRequiredSection.subsection.intParam.model.type = Integer +_a.b.c.aRequiredSection.subsection.intParam.model.description=an optional parameter (default) + +# a.b.c.aRequiredSection.nonempty-subsection (section) +_a.b.c.aRequiredSection.nonempty-subsection.model.target=Section +_a.b.c.aRequiredSection.nonempty-subsection.model.required=true + +# a.b.c.aRequiredSection.optional-subsection (section) +_a.b.c.aRequiredSection.optional-subsection.model.target=Section + +# a.b.c.aValidatedSection (section) +_a.b.c.aValidatedSection.model.target=Section +_a.b.c.aValidatedSection.model.description=A validated section. +_a.b.c.aValidatedSection.model.validator=org.apache.tamaya.model.TestValidator + + + + http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/54b627b9/validation/src/test/resources/META-INF/javaconfig.properties ---------------------------------------------------------------------- diff --git a/validation/src/test/resources/META-INF/javaconfig.properties b/validation/src/test/resources/META-INF/javaconfig.properties new file mode 100644 index 0000000..b0b8c22 --- /dev/null +++ b/validation/src/test/resources/META-INF/javaconfig.properties @@ -0,0 +1,22 @@ +# +# 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 current 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. +# +a.test.existing.aParam=existingValue +a.test.existing.optionalParam=optionalValue +a.test.existing.aABCParam=ABCparam +a.test.existing.aABCParam2=MMM http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/54b627b9/validation/src/test/resources/META-INF/javaconfiguration.properties ---------------------------------------------------------------------- diff --git a/validation/src/test/resources/META-INF/javaconfiguration.properties b/validation/src/test/resources/META-INF/javaconfiguration.properties deleted file mode 100644 index b0b8c22..0000000 --- a/validation/src/test/resources/META-INF/javaconfiguration.properties +++ /dev/null @@ -1,22 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy current 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. -# -a.test.existing.aParam=existingValue -a.test.existing.optionalParam=optionalValue -a.test.existing.aABCParam=ABCparam -a.test.existing.aABCParam2=MMM http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/54b627b9/validation/src/test/resources/META-INF/services/org.apache.tamaya.model.spi.ModelProviderSpi ---------------------------------------------------------------------- diff --git a/validation/src/test/resources/META-INF/services/org.apache.tamaya.model.spi.ModelProviderSpi b/validation/src/test/resources/META-INF/services/org.apache.tamaya.model.spi.ModelProviderSpi index 9b29fda..bf1cd11 100644 --- a/validation/src/test/resources/META-INF/services/org.apache.tamaya.model.spi.ModelProviderSpi +++ b/validation/src/test/resources/META-INF/services/org.apache.tamaya.model.spi.ModelProviderSpi @@ -16,4 +16,4 @@ # specific language governing permissions and limitations # under the License. # -org.apache.tamaya.model.ConfigModelProviderTest \ No newline at end of file +org.apache.tamaya.validation.ConfigModelProviderTest \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/54b627b9/validation/src/test/resources/examples/configmodel.ini ---------------------------------------------------------------------- diff --git a/validation/src/test/resources/examples/configmodel.ini b/validation/src/test/resources/examples/configmodel.ini deleted file mode 100644 index 0e10cc1..0000000 --- a/validation/src/test/resources/examples/configmodel.ini +++ /dev/null @@ -1,76 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy current 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. -# - -################################################################################### -# Example of a configuration metamodel expressed via ini(tm). -#################################################################################### - -#################################################################################### -# Description of Configuration Sections (minimal, can be extended by other modules). -# By default its interpreted as a section ! -#################################################################################### -[_a.model] -class = Section -params2.type = String -params2.required = true -params2.description = "a required parameter" -paramInt.ref = MyNumber -paramInt.description = "an optional parameter (default)" -_number.type = Integer -_number.deprecated = true -_number.mappedTo = "a.paramInt" - -[_a.b.c.model] -class = Section -description = Just a test section - -[_a.b.c.aRequiredSection.model] -class = Section -required = true -description = A section containing required parameters is called a required section.\ - Sections can also explicitly be defined to be required, but without\ - specifying the paramteres to be contained., - -[_a.b.c.aRequiredSection.subsection.model] -class = Section -param0.type = String -param0.description = "a minmally documented String parameter" -# A minmal String parameter -param00.type = String -# description is optional -param1.type = String -param1.required = true -intParam.type = Integer -intParam.description = "an optional parameter (default)" - -[_a.b.c.aRequiredSection.nonempty-subsection.model] -class = Section -required = true - -[_a.b.c.aRequiredSection.optional-subsection.model] -class = Section - -[_a.b.c.aValidatedSection.model] -class = Section -description = "A configModel section." -configModels = org.apache.tamaya.model.TestValidator?max=3 - - - - http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/54b627b9/validation/src/test/resources/examples/configmodel.json ---------------------------------------------------------------------- diff --git a/validation/src/test/resources/examples/configmodel.json b/validation/src/test/resources/examples/configmodel.json deleted file mode 100644 index 529f26e..0000000 --- a/validation/src/test/resources/examples/configmodel.json +++ /dev/null @@ -1,108 +0,0 @@ -/* -* Licensed to the Apache Software Foundation (ASF) under one -* or more contributor license agreements. See the NOTICE file -* distributed with this work for additional information -* regarding copyright ownership. The ASF licenses this file -* to you under the Apache License, Version 2.0 (the -* "License"); you may not use this file except in compliance -* with the License. You may obtain a copy current 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. -*/ - -//################################################################################## -// Example of a configuration metamodel expressed via YAML(tm). -// Structure is shown through indentation (one or more spaces). -// Sequence items are denoted by a dash, -// key value pairs within a map are separated by a colon. -//################################################################################## - -//################################################################################## -// Metamodel information -//################################################################################## -{ - "_model": { - "provider": "ConfigModel Extension", - // reusable parameter definition - }, - "_MyNumber.model": { - "class": "Parameter", - "type": "Integer", - "template": true, - "description": "an (reusable) number type parameter (optional)" - }, - //################################################################################## - // Description of Configuration Sections (minimal, can be extended by other modules). - //################################################################################## - "_a.model": { - "class": "Section", - // required, default is parameter! - }, - "_a.params2.model": { - "required": true, - "description": "a required parameter" - }, - "_a.paramInt.model": { - // references a shared parameter definition. - "ref": "MyNumber", - "description": "an optional parameter (default)" - }, - "_a.number.model": { - "type": "Integer", - "deprecated": true, - // references a deprecated parameter, now mapped to 'a.paramInt'. - "mappedto": "a.paramInt" - }, - "_a.b.c.model": { - "class": "Section", - "description": "Just a test section." - // a subsection, directly configured as child element. - }, - "_a.b.c.aRequiredSection.model": { - "class": "Section", - "required": true, - "description": "A section containing required parameters is called a required section." - }, - // a subsection, configured in its own section. - "_a.b.c.aRequiredSection.subsection.model": { - "class": "Section" - } - "_a.b.c.param0-model": { - "type": "String", - "description": "a minimally documented String parameter" - }, - // A minimally defined String parameter - "_a.b.c.param00": {}, - "_a.b.c.param1": { - "type": "String", - "required": true, - "description": "a required parameter" - }, - "_a.b.c.intParam": { - "type": "Integer", - "required": true, - "description": "an optional parameter (default)" - }, - "_a.b.c.aRequiredSection.nonempty-subsection.model": { - "class": "Section", - "required": true - }, - "_a.b.c.aRequiredSection.optional-subsection.model": { - "class": "Section" - }, - "_a.b.c.aRequiredSection.aValidatedSection.model": { - "class": "Section", - "description": "A validated section.", - "validations": "org.apache.tamaya.model.validation.MaxItemValidator?max=3" - } - } -} - - http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/54b627b9/validation/src/test/resources/examples/configmodel.properties ---------------------------------------------------------------------- diff --git a/validation/src/test/resources/examples/configmodel.properties b/validation/src/test/resources/examples/configmodel.properties deleted file mode 100644 index b61695b..0000000 --- a/validation/src/test/resources/examples/configmodel.properties +++ /dev/null @@ -1,96 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy current 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. -# - -################################################################################### -# Example of a configuration metamodel expressed via properties. -#################################################################################### - -# Metamodel information -_model.provider=ConfigModel Extension - -# reusable parameter definition, referenceable as MyNumber -_MyNumber.model.class=Parameter -_MyNumber.model.type=Integer -_MyNumber.model.description=a (reusable) number type parameter (optional) - -#################################################################################### -# Description of Configuration Sections (minimal, can be extended by other modules). -# By default its interpreted as a section ! -#################################################################################### - -# a (section) -_a.model.class=Section -_a.params2.model.class=Parameter -_a.params2.model.type=String -_a.params2.model.required=true -_a.params2.model.description=a required parameter - -_a.paramInt.model.class=Parameter -_a.paramInt.model.type=ref:MyNumber -_a.paramInt.model.description=an optional parameter (default) - -_a._number.model.class=Parameter -_a._number.model.type=Integer -_a._number.model.deprecated=true -_a._number.model.mappedTo=a.paramInt - -# a.b.c (section) -_a.b.c.class=Section -_a.b.c.description=Just a test section - -# a.b.c.aRequiredSection (section) -_a.b.c.aRequiredSection.model.class=Section -_a.b.c.aRequiredSection.model.required=true -_a.b.c.aRequiredSection.model.description=A section containing required parameters is called a required section.\ - Sections can also explicitly be defined to be required, but without\ - specifying the paramteres to be contained., - -# a.b.c.aRequiredSection.subsection (section) -_a.b.c.aRequiredSection.model.subsection.class=Section - -_a.b.c.aRequiredSection.subsection.param0.model.class=Parameter -_a.b.c.aRequiredSection.subsection.param0.model.type=String -_a.b.c.aRequiredSection.subsection.param0.model.description=a minmally documented String parameter -# A minmal String parameter -_a.b.c.aRequiredSection.subsection.param00.model.class=Parameter -_a.b.c.aRequiredSection.subsection.param00.model.type=String - -# a.b.c.aRequiredSection.subsection (section) -_a.b.c.aRequiredSection.subsection.param1.model.class=Parameter -_a.b.c.aRequiredSection.subsection.param1.model.type = String -_a.b.c.aRequiredSection.subsection.param1.model.required = true -_a.b.c.aRequiredSection.subsection.intParam.model.class=Parameter -_a.b.c.aRequiredSection.subsection.intParam.model.type = Integer -_a.b.c.aRequiredSection.subsection.intParam.model.description=an optional parameter (default) - -# a.b.c.aRequiredSection.nonempty-subsection (section) -_a.b.c.aRequiredSection.nonempty-subsection.model.class=Section -_a.b.c.aRequiredSection.nonempty-subsection.model.required=true - -# a.b.c.aRequiredSection.optional-subsection (section) -_a.b.c.aRequiredSection.optional-subsection.model.class=Section - -# a.b.c.aValidatedSection (section) -_a.b.c.aValidatedSection.model.class=Section -_a.b.c.aValidatedSection.model.description=A validated section. -_a.b.c.aValidatedSection.model.configModels=org.apache.tamaya.model.TestValidator - - - - http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/54b627b9/validation/src/test/resources/examples/configmodel.xml ---------------------------------------------------------------------- diff --git a/validation/src/test/resources/examples/configmodel.xml b/validation/src/test/resources/examples/configmodel.xml deleted file mode 100644 index f23f783..0000000 --- a/validation/src/test/resources/examples/configmodel.xml +++ /dev/null @@ -1,97 +0,0 @@ -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<!--################################################################################ -# Example of a configuration metamodel expressed via YAML(tm). -# Structure is shown through indentation (one or more spaces). -# Sequence items are denoted by a dash, -# key value pairs within a map are separated by a colon. -#################################################################################--> - -<!--################################################################################ -# Metamodel information -#################################################################################--> - -<configuration> - <section name="{model}" __provider="ConfigModel Extension" version="1.0" __release-date="2001-01-23" - author="Anatole Tresch"> - <!-- model-format>alternate format reader type</model-format --> - <__description>Late afternoon is best. - Backup contact is Nancy. - </__description> - - <!--################################################################################ - # Description of Configuration Sections (minimal, can be extended by other modules). - #################################################################################--> - <section name="a"> - <param name="params"> - <type>String</type> - <required>true</required> - <description>a required parameter</description> - </param> - <param name="paramInt"> - <ref>MyNumber</ref> - <required>true</required> - <description>an optional parameter (default)</description> - </param> - <param name="_number"> - <type>Integer</type> - <deprecated>true</deprecated> - <mappedto>a.paramInt</mappedto> - </param> - <section name="b.c"> - <description>Just a test section.</description> - <section name="aRequiredSection"> - <description>A section containing required parameters is called a required section. - Sections can also explicitly be defined to be required, but without - specifying the paramteres to be contained. - </description> - </section> - </section> - </section> - - <section name="a.b.c.aRequiredSection.subsection"> - <param name="param0" type="String">a minmally documented String parameter</param> - <!-- # A minmally defined String parameter --> - <param name="param00"> - <type>String</type> - </param> - <param name="param1"> - <type>String</type> - <required>true</required> - <description>a required parameter</description>description> - </param> - <param name="intParam"> - <type>Integer</type> - <description>an optional parameter (default)</description> - </param> - <section name="b.c"> - <description>Just a test section.</description> - </section> - </section> - <section name="a.b.c.aRequiredSection.nonempty-subsection"> - <required>true</required> - </section> - <section name="a.b.c.aRequiredSection.optional-subsection"/> - <section name="a.b.c.aRequiredSection.aValidatedSection"> - <configModels>org.apache.tamaya.model.configModel.MaxItemValidator?max=3"</configModels> - <description>A configModel section.</description> - </section> - </section> -</configuration> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/54b627b9/validation/src/test/resources/examples/configmodel.yaml ---------------------------------------------------------------------- diff --git a/validation/src/test/resources/examples/configmodel.yaml b/validation/src/test/resources/examples/configmodel.yaml deleted file mode 100644 index 041c801..0000000 --- a/validation/src/test/resources/examples/configmodel.yaml +++ /dev/null @@ -1,106 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy current 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. -# - -################################################################################## -# Example of a configuration metamodel expressed via YAML(tm). -# Structure is shown through indentation (one or more spaces). -# Sequence items are denoted by a dash, -# key value pairs within a map are separated by a colon. -#################################################################################### - -#################################################################################### -# Metamodel information -#################################################################################### -{model}: { - __name : 'testmodel', - __provider : 'ValidationProviderSpi Extension', - __version : '1.0', - __release-date : 2001-01-23, - __author : 'Anatole Tresch', - # model-format: 'alternate format reader type' - __description: > - Late afternoon is best. - Backup contact is Nancy. -} - -#################################################################################### -# Description of Configuration Sections (minimal, can be extended by other modules). -#################################################################################### ---- -{model}.a.params2: { - type : 'String', - required : true, - description : 'a required parameter', - paramInt: 'Integer', 'an optional parameter (default)', -} ---- -{model}.a.paramInt: { - type : 'Integer', - description : 'an optional parameter (default)', -} ---- -{model}.a.b.c: { - description: 'Just a test section.' -} ---- -{model}.a.b.c.aRequiredSection: { - required: true, - description: | - A section containing required parameters is called a required section. - Sections can also explicitly be defined to be required, but without - specifying the paramteres to be contained., -} ---- -{model}.a.b.c.aRequiredSection.subsection: { - param0: { - type: 'String', - description: 'a minmally documented String parameter}' - }, , - param00:{ - type: 'String' # A minmally defined String parameter - }, - param1: { - tpye: 'String', - required: true, - description: 'a required parameter' - }, - intParam: { - type: 'Integer', - description: 'an optional parameter (default)' - } -} -... - ---- -{model}.a.b.c.aRequiredSection.nonempty-subsection: { - required: true -} -... - ---- -{model}.a.b.c.aRequiredSection.optional-subsection: {} -... - ---- -{model}.a.b.c.aRequiredSection.aValidatedSection: { - description: 'A configModel section.', - configModels: 'org.apache.tamaya.model.configModel.MaxItemValidator?max=3' -} - - http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/54b627b9/validation/src/test/resources/examples/configvalidation.ini ---------------------------------------------------------------------- diff --git a/validation/src/test/resources/examples/configvalidation.ini b/validation/src/test/resources/examples/configvalidation.ini new file mode 100644 index 0000000..0e10cc1 --- /dev/null +++ b/validation/src/test/resources/examples/configvalidation.ini @@ -0,0 +1,76 @@ +# +# 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 current 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. +# + +################################################################################### +# Example of a configuration metamodel expressed via ini(tm). +#################################################################################### + +#################################################################################### +# Description of Configuration Sections (minimal, can be extended by other modules). +# By default its interpreted as a section ! +#################################################################################### +[_a.model] +class = Section +params2.type = String +params2.required = true +params2.description = "a required parameter" +paramInt.ref = MyNumber +paramInt.description = "an optional parameter (default)" +_number.type = Integer +_number.deprecated = true +_number.mappedTo = "a.paramInt" + +[_a.b.c.model] +class = Section +description = Just a test section + +[_a.b.c.aRequiredSection.model] +class = Section +required = true +description = A section containing required parameters is called a required section.\ + Sections can also explicitly be defined to be required, but without\ + specifying the paramteres to be contained., + +[_a.b.c.aRequiredSection.subsection.model] +class = Section +param0.type = String +param0.description = "a minmally documented String parameter" +# A minmal String parameter +param00.type = String +# description is optional +param1.type = String +param1.required = true +intParam.type = Integer +intParam.description = "an optional parameter (default)" + +[_a.b.c.aRequiredSection.nonempty-subsection.model] +class = Section +required = true + +[_a.b.c.aRequiredSection.optional-subsection.model] +class = Section + +[_a.b.c.aValidatedSection.model] +class = Section +description = "A configModel section." +configModels = org.apache.tamaya.model.TestValidator?max=3 + + + + http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/54b627b9/validation/src/test/resources/examples/configvalidation.json ---------------------------------------------------------------------- diff --git a/validation/src/test/resources/examples/configvalidation.json b/validation/src/test/resources/examples/configvalidation.json new file mode 100644 index 0000000..529f26e --- /dev/null +++ b/validation/src/test/resources/examples/configvalidation.json @@ -0,0 +1,108 @@ +/* +* 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 current 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. +*/ + +//################################################################################## +// Example of a configuration metamodel expressed via YAML(tm). +// Structure is shown through indentation (one or more spaces). +// Sequence items are denoted by a dash, +// key value pairs within a map are separated by a colon. +//################################################################################## + +//################################################################################## +// Metamodel information +//################################################################################## +{ + "_model": { + "provider": "ConfigModel Extension", + // reusable parameter definition + }, + "_MyNumber.model": { + "class": "Parameter", + "type": "Integer", + "template": true, + "description": "an (reusable) number type parameter (optional)" + }, + //################################################################################## + // Description of Configuration Sections (minimal, can be extended by other modules). + //################################################################################## + "_a.model": { + "class": "Section", + // required, default is parameter! + }, + "_a.params2.model": { + "required": true, + "description": "a required parameter" + }, + "_a.paramInt.model": { + // references a shared parameter definition. + "ref": "MyNumber", + "description": "an optional parameter (default)" + }, + "_a.number.model": { + "type": "Integer", + "deprecated": true, + // references a deprecated parameter, now mapped to 'a.paramInt'. + "mappedto": "a.paramInt" + }, + "_a.b.c.model": { + "class": "Section", + "description": "Just a test section." + // a subsection, directly configured as child element. + }, + "_a.b.c.aRequiredSection.model": { + "class": "Section", + "required": true, + "description": "A section containing required parameters is called a required section." + }, + // a subsection, configured in its own section. + "_a.b.c.aRequiredSection.subsection.model": { + "class": "Section" + } + "_a.b.c.param0-model": { + "type": "String", + "description": "a minimally documented String parameter" + }, + // A minimally defined String parameter + "_a.b.c.param00": {}, + "_a.b.c.param1": { + "type": "String", + "required": true, + "description": "a required parameter" + }, + "_a.b.c.intParam": { + "type": "Integer", + "required": true, + "description": "an optional parameter (default)" + }, + "_a.b.c.aRequiredSection.nonempty-subsection.model": { + "class": "Section", + "required": true + }, + "_a.b.c.aRequiredSection.optional-subsection.model": { + "class": "Section" + }, + "_a.b.c.aRequiredSection.aValidatedSection.model": { + "class": "Section", + "description": "A validated section.", + "validations": "org.apache.tamaya.model.validation.MaxItemValidator?max=3" + } + } +} + + http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/54b627b9/validation/src/test/resources/examples/configvalidation.properties ---------------------------------------------------------------------- diff --git a/validation/src/test/resources/examples/configvalidation.properties b/validation/src/test/resources/examples/configvalidation.properties new file mode 100644 index 0000000..b61695b --- /dev/null +++ b/validation/src/test/resources/examples/configvalidation.properties @@ -0,0 +1,96 @@ +# +# 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 current 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. +# + +################################################################################### +# Example of a configuration metamodel expressed via properties. +#################################################################################### + +# Metamodel information +_model.provider=ConfigModel Extension + +# reusable parameter definition, referenceable as MyNumber +_MyNumber.model.class=Parameter +_MyNumber.model.type=Integer +_MyNumber.model.description=a (reusable) number type parameter (optional) + +#################################################################################### +# Description of Configuration Sections (minimal, can be extended by other modules). +# By default its interpreted as a section ! +#################################################################################### + +# a (section) +_a.model.class=Section +_a.params2.model.class=Parameter +_a.params2.model.type=String +_a.params2.model.required=true +_a.params2.model.description=a required parameter + +_a.paramInt.model.class=Parameter +_a.paramInt.model.type=ref:MyNumber +_a.paramInt.model.description=an optional parameter (default) + +_a._number.model.class=Parameter +_a._number.model.type=Integer +_a._number.model.deprecated=true +_a._number.model.mappedTo=a.paramInt + +# a.b.c (section) +_a.b.c.class=Section +_a.b.c.description=Just a test section + +# a.b.c.aRequiredSection (section) +_a.b.c.aRequiredSection.model.class=Section +_a.b.c.aRequiredSection.model.required=true +_a.b.c.aRequiredSection.model.description=A section containing required parameters is called a required section.\ + Sections can also explicitly be defined to be required, but without\ + specifying the paramteres to be contained., + +# a.b.c.aRequiredSection.subsection (section) +_a.b.c.aRequiredSection.model.subsection.class=Section + +_a.b.c.aRequiredSection.subsection.param0.model.class=Parameter +_a.b.c.aRequiredSection.subsection.param0.model.type=String +_a.b.c.aRequiredSection.subsection.param0.model.description=a minmally documented String parameter +# A minmal String parameter +_a.b.c.aRequiredSection.subsection.param00.model.class=Parameter +_a.b.c.aRequiredSection.subsection.param00.model.type=String + +# a.b.c.aRequiredSection.subsection (section) +_a.b.c.aRequiredSection.subsection.param1.model.class=Parameter +_a.b.c.aRequiredSection.subsection.param1.model.type = String +_a.b.c.aRequiredSection.subsection.param1.model.required = true +_a.b.c.aRequiredSection.subsection.intParam.model.class=Parameter +_a.b.c.aRequiredSection.subsection.intParam.model.type = Integer +_a.b.c.aRequiredSection.subsection.intParam.model.description=an optional parameter (default) + +# a.b.c.aRequiredSection.nonempty-subsection (section) +_a.b.c.aRequiredSection.nonempty-subsection.model.class=Section +_a.b.c.aRequiredSection.nonempty-subsection.model.required=true + +# a.b.c.aRequiredSection.optional-subsection (section) +_a.b.c.aRequiredSection.optional-subsection.model.class=Section + +# a.b.c.aValidatedSection (section) +_a.b.c.aValidatedSection.model.class=Section +_a.b.c.aValidatedSection.model.description=A validated section. +_a.b.c.aValidatedSection.model.configModels=org.apache.tamaya.model.TestValidator + + + + http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/54b627b9/validation/src/test/resources/examples/configvalidation.xml ---------------------------------------------------------------------- diff --git a/validation/src/test/resources/examples/configvalidation.xml b/validation/src/test/resources/examples/configvalidation.xml new file mode 100644 index 0000000..f23f783 --- /dev/null +++ b/validation/src/test/resources/examples/configvalidation.xml @@ -0,0 +1,97 @@ +<!-- +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. +--> + +<!--################################################################################ +# Example of a configuration metamodel expressed via YAML(tm). +# Structure is shown through indentation (one or more spaces). +# Sequence items are denoted by a dash, +# key value pairs within a map are separated by a colon. +#################################################################################--> + +<!--################################################################################ +# Metamodel information +#################################################################################--> + +<configuration> + <section name="{model}" __provider="ConfigModel Extension" version="1.0" __release-date="2001-01-23" + author="Anatole Tresch"> + <!-- model-format>alternate format reader type</model-format --> + <__description>Late afternoon is best. + Backup contact is Nancy. + </__description> + + <!--################################################################################ + # Description of Configuration Sections (minimal, can be extended by other modules). + #################################################################################--> + <section name="a"> + <param name="params"> + <type>String</type> + <required>true</required> + <description>a required parameter</description> + </param> + <param name="paramInt"> + <ref>MyNumber</ref> + <required>true</required> + <description>an optional parameter (default)</description> + </param> + <param name="_number"> + <type>Integer</type> + <deprecated>true</deprecated> + <mappedto>a.paramInt</mappedto> + </param> + <section name="b.c"> + <description>Just a test section.</description> + <section name="aRequiredSection"> + <description>A section containing required parameters is called a required section. + Sections can also explicitly be defined to be required, but without + specifying the paramteres to be contained. + </description> + </section> + </section> + </section> + + <section name="a.b.c.aRequiredSection.subsection"> + <param name="param0" type="String">a minmally documented String parameter</param> + <!-- # A minmally defined String parameter --> + <param name="param00"> + <type>String</type> + </param> + <param name="param1"> + <type>String</type> + <required>true</required> + <description>a required parameter</description>description> + </param> + <param name="intParam"> + <type>Integer</type> + <description>an optional parameter (default)</description> + </param> + <section name="b.c"> + <description>Just a test section.</description> + </section> + </section> + <section name="a.b.c.aRequiredSection.nonempty-subsection"> + <required>true</required> + </section> + <section name="a.b.c.aRequiredSection.optional-subsection"/> + <section name="a.b.c.aRequiredSection.aValidatedSection"> + <configModels>org.apache.tamaya.model.configModel.MaxItemValidator?max=3"</configModels> + <description>A configModel section.</description> + </section> + </section> +</configuration> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/54b627b9/validation/src/test/resources/examples/configvalidation.yaml ---------------------------------------------------------------------- diff --git a/validation/src/test/resources/examples/configvalidation.yaml b/validation/src/test/resources/examples/configvalidation.yaml new file mode 100644 index 0000000..041c801 --- /dev/null +++ b/validation/src/test/resources/examples/configvalidation.yaml @@ -0,0 +1,106 @@ +# +# 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 current 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. +# + +################################################################################## +# Example of a configuration metamodel expressed via YAML(tm). +# Structure is shown through indentation (one or more spaces). +# Sequence items are denoted by a dash, +# key value pairs within a map are separated by a colon. +#################################################################################### + +#################################################################################### +# Metamodel information +#################################################################################### +{model}: { + __name : 'testmodel', + __provider : 'ValidationProviderSpi Extension', + __version : '1.0', + __release-date : 2001-01-23, + __author : 'Anatole Tresch', + # model-format: 'alternate format reader type' + __description: > + Late afternoon is best. + Backup contact is Nancy. +} + +#################################################################################### +# Description of Configuration Sections (minimal, can be extended by other modules). +#################################################################################### +--- +{model}.a.params2: { + type : 'String', + required : true, + description : 'a required parameter', + paramInt: 'Integer', 'an optional parameter (default)', +} +--- +{model}.a.paramInt: { + type : 'Integer', + description : 'an optional parameter (default)', +} +--- +{model}.a.b.c: { + description: 'Just a test section.' +} +--- +{model}.a.b.c.aRequiredSection: { + required: true, + description: | + A section containing required parameters is called a required section. + Sections can also explicitly be defined to be required, but without + specifying the paramteres to be contained., +} +--- +{model}.a.b.c.aRequiredSection.subsection: { + param0: { + type: 'String', + description: 'a minmally documented String parameter}' + }, , + param00:{ + type: 'String' # A minmally defined String parameter + }, + param1: { + tpye: 'String', + required: true, + description: 'a required parameter' + }, + intParam: { + type: 'Integer', + description: 'an optional parameter (default)' + } +} +... + +--- +{model}.a.b.c.aRequiredSection.nonempty-subsection: { + required: true +} +... + +--- +{model}.a.b.c.aRequiredSection.optional-subsection: {} +... + +--- +{model}.a.b.c.aRequiredSection.aValidatedSection: { + description: 'A configModel section.', + configModels: 'org.apache.tamaya.model.configModel.MaxItemValidator?max=3' +} + +
