hi we use jboss-logging-tools 2.0.1.Final for Wildfly 10+ upgrading.
i used: openjdk version "1.8.0_91" OpenJDK Runtime Environment (build 1.8.0_91-b14) OpenJDK Server VM (build 25.91-b14, mixed mode) Apache Maven 3.3.3 javax.enterprise:cdi-api:jar:1.2 javax.inject:javax.inject:jar:1 org.jboss.weld:weld-api:jar:2.3.Final org.jboss.weld:weld-spi:jar:2.3.Final org.jboss.classfilewriter:jboss-classfilewriter:jar:1.1.2.Final org.jboss.spec.javax.ejb:jboss-ejb-api_3.2_spec:jar:1.0.0.Final org.jboss.spec.javax.servlet:jboss-servlet-api_3.1_spec:jar:1.0.0.Final org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:jar:1.0.0.Final org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:jar:1.0.0.Final org.hibernate.javax.persistence:hibernate-jpa-2.1-api:jar:1.0.0.Final com.google.guava:guava:jar:18.0 org.jboss.spec.javax.el:jboss-el-api_3.0_spec:jar:1.0.5.Final org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec:jar:1.0.0.Final org.jboss.logging:jboss-logging-processor:jar:2.0.1.Final org.jboss.logging:jboss-logging-annotations:jar:2.0.1.Final org.jboss.jdeparser:jdeparser:jar:2.0.0.Final org.jboss.logging:jboss-logging:jar:3.2.1.Final net.sourceforge.findbugs:annotations:jar:1.3.2
I applied these patch:
— a/environments/common/src/main/java/org/jboss/weld/environment/logging/WeldEnvironmentLogger.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/logging/WeldEnvironmentLogger.java @@ -1,17 +1,20 @@ package org.jboss.weld.environment.logging;
+import static org.jboss.weld.environment.logging.WeldEnvironmentLogger.WELD_ENV_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;
/** *
-
@author Matej Briškár
-
@author Martin Kouba
*/ +@MessageLogger(projectCode = WELD_ENV_PROJECT_CODE) public interface WeldEnvironmentLogger extends BasicLogger {
String CATCHING_MARKER = "Catching"; diff --git a/impl/src/main/java/org/jboss/weld/logging/WeldLogger.java b/impl/src/main/java/org/jboss/weld/logging/WeldLogger.java index 184d3d7..f4a0778 100644 — a/impl/src/main/java/org/jboss/weld/logging/WeldLogger.java +++ b/impl/src/main/java/org/jboss/weld/logging/WeldLogger.java @@ -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;
/**
String CATCHING_MARKER = "Catching"; –
we don't have (use) Jetty 6 in Fedora
— core-2.3.2.Final/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/WeldServletLifecycle.java 2015-12-08 16:06:29.000000000 +0100 +++ core-2.3.2.Final.gwtdev/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/WeldServletLifecycle.java 2016-06-07 21:18:05.466473052 +0200 @@ -56,7 +56,6 @@ import org.jboss.weld.environment.deployment.discovery.DiscoveryStrategy; import org.jboss.weld.environment.deployment.discovery.DiscoveryStrategyFactory; import org.jboss.weld.environment.deployment.discovery.jandex.Jandex; -import org.jboss.weld.environment.gwtdev.GwtDevHostedModeContainer; import org.jboss.weld.environment.jetty.JettyContainer; import org.jboss.weld.environment.logging.CommonLogger; import org.jboss.weld.environment.servlet.deployment.ServletContextBeanArchiveHandler; @@ -362,7 +361,7 @@ container = checkContainers(ctx, dump, extContainers); if (container == null) { // 3. Built-in containers in predefined order - container = checkContainers(ctx, dump, Arrays.asList(TomcatContainer.INSTANCE, JettyContainer.INSTANCE, UndertowContainer.INSTANCE, GwtDevHostedModeContainer.INSTANCE)); + container = checkContainers(ctx, dump, Arrays.asList(TomcatContainer.INSTANCE, JettyContainer.INSTANCE, UndertowContainer.INSTANCE)); }
} return container;
|