Skip to content

Commit

Permalink
WELD-2237 Upgrade jboss-logging-processor to 2.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mkouba committed Sep 27, 2016
1 parent c8d7c4a commit 131580e
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2015, Red Hat, Inc., and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.weld.environment.logging;


Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,34 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2015, Red Hat, Inc., and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.weld.environment.logging;


import org.jboss.logging.BasicLogger;
import org.jboss.logging.Logger.Level;
import org.jboss.logging.annotations.Cause;
import org.jboss.logging.annotations.LogMessage;
import org.jboss.logging.annotations.Message;
import org.jboss.logging.annotations.MessageLogger;

/**
*
* @author Matej Briškár
* @author Martin Kouba
*/
@MessageLogger(projectCode = WeldEnvironmentLogger.WELD_ENV_PROJECT_CODE)
public interface WeldEnvironmentLogger extends BasicLogger {

String CATCHING_MARKER = "Catching";
Expand All @@ -36,5 +53,4 @@ public interface WeldEnvironmentLogger extends BasicLogger {
@Message(id = 0, value = CATCHING_MARKER)
void catchingTrace(@Cause Throwable throwable);


}
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ public interface ReflectionLogger extends WeldLogger {
@Message(id = 621, value = "Interceptor binding {0} with @Target defined as {1} should not be applied on interceptor binding {2} with @Target definition: {3}", format = Format.MESSAGE_FORMAT)
void invalidInterceptorBindingTargetDeclaration(Object param1, Object param2, Object param3, Object param4);

// LOGTOOL-104 we had to change the cause type
@Message(id = 622, value = "IllegalArgumentException invoking {2} on {1} ({0}) with parameters {3}", format = Format.MESSAGE_FORMAT)
WeldException illegalArgumentExceptionOnReflectionInvocation(Class<?> clazz, Object instance, Method method, String parameters,
@Cause java.lang.IllegalArgumentException cause);
WeldException illegalArgumentExceptionOnReflectionInvocation(Class<?> clazz, Object instance, Method method, String parameters, @Cause Throwable cause);

@Message(id = 623, value = "Unknown type {0}.", format = Format.MESSAGE_FORMAT)
IllegalArgumentException unknownType(Type type);
Expand Down
4 changes: 4 additions & 0 deletions impl/src/main/java/org/jboss/weld/logging/WeldLogger.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,21 @@
*/
package org.jboss.weld.logging;

import static org.jboss.weld.logging.WeldLogger.WELD_PROJECT_CODE;

import org.jboss.logging.BasicLogger;
import org.jboss.logging.Logger.Level;
import org.jboss.logging.annotations.Cause;
import org.jboss.logging.annotations.LogMessage;
import org.jboss.logging.annotations.Message;
import org.jboss.logging.annotations.MessageLogger;

/**
* A source of localized log/bundle messages and exceptions. Note that this interface extends {@link BasicLogger} so that regular logger methods are available.
*
* @author Martin Kouba
*/
@MessageLogger(projectCode = WELD_PROJECT_CODE)
public interface WeldLogger extends BasicLogger {

String CATCHING_MARKER = "Catching";
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<jboss.jms.api.version>1.0.0.Final</jboss.jms.api.version>
<jboss.jsf.api.version>2.2.4</jboss.jsf.api.version>
<jboss.logging.version>3.2.1.Final</jboss.logging.version>
<jboss.logging.processor.version>1.1.0.Final</jboss.logging.processor.version>
<jboss.logging.processor.version>2.0.1.Final</jboss.logging.processor.version>
<jboss.logmanager.version>1.2.2.GA</jboss.logmanager.version>
<jboss.spec.el-api.version>1.0.0.Alpha1</jboss.spec.el-api.version>
<jsf.impl.version>2.2.10</jsf.impl.version>
Expand Down

0 comments on commit 131580e

Please sign in to comment.