Cleanup: missing license, missing artifact in assemblies
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a8960c55 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a8960c55 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a8960c55 Branch: refs/heads/master Commit: a8960c55971cb349d10bf41f37a2172ab3cdbd9d Parents: e1cd8bc Author: Nikita Timofeev <stari...@gmail.com> Authored: Wed Apr 26 12:57:37 2017 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Wed Apr 26 12:57:37 2017 +0300 ---------------------------------------------------------------------- .../resources/assemblies/assembly-generic.xml | 2 +- .../main/resources/assemblies/assembly-mac.xml | 2 +- .../resources/assemblies/assembly-windows.xml | 2 +- .../java/org/slf4j/impl/StaticLoggerBinder.java | 40 +++++++++++++++----- 4 files changed, 34 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/a8960c55/assembly/src/main/resources/assemblies/assembly-generic.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/resources/assemblies/assembly-generic.xml b/assembly/src/main/resources/assemblies/assembly-generic.xml index f5342aa..8439a57 100644 --- a/assembly/src/main/resources/assemblies/assembly-generic.xml +++ b/assembly/src/main/resources/assemblies/assembly-generic.xml @@ -102,7 +102,7 @@ <!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks --> <includes> <include>commons-collections:commons-collections</include> - <include>slf4-api:slf4j-api</include> + <include>org.slf4j:slf4j-api</include> <include>commons-lang:commons-lang</include> <include>org.apache.velocity:velocity</include> <include>foundrylogic.vpp:vpp</include> http://git-wip-us.apache.org/repos/asf/cayenne/blob/a8960c55/assembly/src/main/resources/assemblies/assembly-mac.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/resources/assemblies/assembly-mac.xml b/assembly/src/main/resources/assemblies/assembly-mac.xml index 361bea7..90cbe1a 100644 --- a/assembly/src/main/resources/assemblies/assembly-mac.xml +++ b/assembly/src/main/resources/assemblies/assembly-mac.xml @@ -102,7 +102,7 @@ <!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks --> <includes> <include>commons-collections:commons-collections</include> - <include>slf4j-api:slf4j-api</include> + <include>org.slf4j:slf4j-api</include> <include>commons-lang:commons-lang</include> <include>org.apache.velocity:velocity</include> <include>foundrylogic.vpp:vpp</include> http://git-wip-us.apache.org/repos/asf/cayenne/blob/a8960c55/assembly/src/main/resources/assemblies/assembly-windows.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/resources/assemblies/assembly-windows.xml b/assembly/src/main/resources/assemblies/assembly-windows.xml index 7d1d470..1ae16e2 100644 --- a/assembly/src/main/resources/assemblies/assembly-windows.xml +++ b/assembly/src/main/resources/assemblies/assembly-windows.xml @@ -102,7 +102,7 @@ <!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks --> <includes> <include>commons-collections:commons-collections</include> - <include>slf4j-api:slf-api</include> + <include>org.slf4j:slf-api</include> <include>commons-lang:commons-lang</include> <include>org.apache.velocity:velocity</include> <include>foundrylogic.vpp:vpp</include> http://git-wip-us.apache.org/repos/asf/cayenne/blob/a8960c55/modeler/cayenne-modeler/src/main/java/org/slf4j/impl/StaticLoggerBinder.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/modeler/cayenne-modeler/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index 7dd03aa..e4d6162 100644 --- a/modeler/cayenne-modeler/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/modeler/cayenne-modeler/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -1,22 +1,44 @@ +/***************************************************************** + * 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. + ****************************************************************/ + package org.slf4j.impl; import org.apache.cayenne.modeler.util.ModelerLogFactory; import org.slf4j.ILoggerFactory; import org.slf4j.spi.LoggerFactoryBinder; -/* -* StaticLoggerBinder bind and replace standard SLF4J LoggerFactory to ModelerLogFactory. -* This is used because in Cayenne Modeler we use custom logger implementation (ModelerLogger) -* for logging in System.err and modeler logger. -* */ +/** + * StaticLoggerBinder bind and replace standard SLF4J LoggerFactory to ModelerLogFactory. + * This is used because in Cayenne Modeler we use custom logger implementation (ModelerLogger) + * for logging in System.err and modeler logger. + * + * @since 4.0 + */ public class StaticLoggerBinder implements LoggerFactoryBinder { - private final static StaticLoggerBinder singleton = new StaticLoggerBinder(); + private final static StaticLoggerBinder SINGLETON = new StaticLoggerBinder(); + private final static String LOGGER_FACTORY_CLASS_STR = ModelerLogFactory.class.getName(); + private final ILoggerFactory loggerFactory = new ModelerLogFactory(); - private static final String loggerFactoryClassStr = ModelerLogFactory.class.getName(); public static StaticLoggerBinder getSingleton() { - return singleton; + return SINGLETON; } public ILoggerFactory getLoggerFactory() { @@ -24,6 +46,6 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { } public String getLoggerFactoryClassStr() { - return this.loggerFactoryClassStr; + return LOGGER_FACTORY_CLASS_STR; } }
