Repository: any23 Updated Branches: refs/heads/master 83c1fcfe2 -> 2df4845e8
ANY23-293 Package log4j configuration with core appassembler Project: http://git-wip-us.apache.org/repos/asf/any23/repo Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/2df4845e Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/2df4845e Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/2df4845e Branch: refs/heads/master Commit: 2df4845e8694e6c8206a25e0585e16bcfe293a07 Parents: 83c1fcf Author: Lewis John McGibbney <[email protected]> Authored: Wed Jun 15 23:00:05 2016 -0700 Committer: Lewis John McGibbney <[email protected]> Committed: Wed Jun 15 23:00:05 2016 -0700 ---------------------------------------------------------------------- core/pom.xml | 3 +++ core/src/main/assembly/bin.xml | 8 ++++++++ core/src/test/resources/log4j.properties | 2 +- csvutils/src/test/resources/log4j.properties | 14 ++++++++++++++ mime/src/test/resources/log4j.properties | 14 ++++++++++++++ .../src/test/resources/log4j.properties | 14 ++++++++++++++ service/src/test/resources/log4j.properties | 14 ++++++++++++++ 7 files changed, 68 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/2df4845e/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 6f13f1f..3947163 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -208,6 +208,9 @@ <name>any23</name> </program> </programs> + <configurationDirectory>conf</configurationDirectory> + <configurationSourceDirectory>${basedir}/src/test/resources</configurationSourceDirectory> + <copyConfigurationDirectory>true</copyConfigurationDirectory> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/any23/blob/2df4845e/core/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/core/src/main/assembly/bin.xml b/core/src/main/assembly/bin.xml index e775ad5..ce264a6 100644 --- a/core/src/main/assembly/bin.xml +++ b/core/src/main/assembly/bin.xml @@ -76,6 +76,14 @@ <exclude>*.xml</exclude> </excludes> </fileSet> + + <!-- + | Configuration and Resources + --> + <fileSet> + <directory>${project.build.directory}/appassembler/conf/</directory> + <outputDirectory>/conf</outputDirectory> + </fileSet> </fileSets> </assembly> http://git-wip-us.apache.org/repos/asf/any23/blob/2df4845e/core/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/core/src/test/resources/log4j.properties b/core/src/test/resources/log4j.properties index 4634d6b..32492dd 100644 --- a/core/src/test/resources/log4j.properties +++ b/core/src/test/resources/log4j.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -log4j.rootCategory=DEBUG, O +log4j.rootCategory=INFO, O # Stdout log4j.appender.O=org.apache.log4j.ConsoleAppender http://git-wip-us.apache.org/repos/asf/any23/blob/2df4845e/csvutils/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/csvutils/src/test/resources/log4j.properties b/csvutils/src/test/resources/log4j.properties index 2a65ccf..a7ad0af 100644 --- a/csvutils/src/test/resources/log4j.properties +++ b/csvutils/src/test/resources/log4j.properties @@ -1,3 +1,17 @@ +# 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. log4j.rootCategory=INFO, R, O # Stdout http://git-wip-us.apache.org/repos/asf/any23/blob/2df4845e/mime/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/mime/src/test/resources/log4j.properties b/mime/src/test/resources/log4j.properties index 4aa0d92..1a9ad34 100644 --- a/mime/src/test/resources/log4j.properties +++ b/mime/src/test/resources/log4j.properties @@ -1,3 +1,17 @@ +# 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. log4j.rootCategory=INFO, O # Stdout http://git-wip-us.apache.org/repos/asf/any23/blob/2df4845e/plugins/office-scraper/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/plugins/office-scraper/src/test/resources/log4j.properties b/plugins/office-scraper/src/test/resources/log4j.properties index 4aa0d92..1a9ad34 100644 --- a/plugins/office-scraper/src/test/resources/log4j.properties +++ b/plugins/office-scraper/src/test/resources/log4j.properties @@ -1,3 +1,17 @@ +# 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. log4j.rootCategory=INFO, O # Stdout http://git-wip-us.apache.org/repos/asf/any23/blob/2df4845e/service/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/service/src/test/resources/log4j.properties b/service/src/test/resources/log4j.properties index 4aa0d92..1a9ad34 100644 --- a/service/src/test/resources/log4j.properties +++ b/service/src/test/resources/log4j.properties @@ -1,3 +1,17 @@ +# 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. log4j.rootCategory=INFO, O # Stdout
