Author: jlmonteiro
Date: Mon Jul 3 14:13:05 2017
New Revision: 1800681
URL: http://svn.apache.org/viewvc?rev=1800681&view=rev
Log:
OWB-1135 - Remove duplication for openwebbeans/Messages - patch from Daniel
Soro - Thanks
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/JULLoggerFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLoggerFacade.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansConstants.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/JULLoggerFactory.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/JULLoggerFactory.java?rev=1800681&r1=1800680&r2=1800681&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/JULLoggerFactory.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/JULLoggerFactory.java
Mon Jul 3 14:13:05 2017
@@ -18,6 +18,8 @@
*/
package org.apache.webbeans.logger;
+import org.apache.webbeans.util.WebBeansConstants;
+
import java.util.Locale;
import java.util.ResourceBundle;
import java.util.logging.Logger;
@@ -27,12 +29,12 @@ public class JULLoggerFactory implements
@Override
public Logger getLogger(Class<?> clazz, Locale desiredLocale)
{
- return Logger.getLogger(clazz.getName(),
ResourceBundle.getBundle("openwebbeans/Messages", desiredLocale).toString());
+ return Logger.getLogger(clazz.getName(),
ResourceBundle.getBundle(WebBeansConstants.WEB_BEANS_MESSAGES,
desiredLocale).toString());
}
@Override
public Logger getLogger(Class<?> clazz)
{
- return Logger.getLogger(clazz.getName(),"openwebbeans/Messages");
+ return
Logger.getLogger(clazz.getName(),WebBeansConstants.WEB_BEANS_MESSAGES);
}
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLoggerFacade.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLoggerFacade.java?rev=1800681&r1=1800680&r2=1800681&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLoggerFacade.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLoggerFacade.java
Mon Jul 3 14:13:05 2017
@@ -23,6 +23,7 @@ package org.apache.webbeans.logger;
*/
import org.apache.webbeans.config.OWBLogConst;
+import org.apache.webbeans.util.WebBeansConstants;
import java.text.MessageFormat;
import java.util.Locale;
@@ -46,7 +47,7 @@ public final class WebBeansLoggerFacade
private static final WebBeansLoggerFactory FACTORY;
- static final ResourceBundle WB_BUNDLE =
ResourceBundle.getBundle("openwebbeans/Messages");
+ static final ResourceBundle WB_BUNDLE =
ResourceBundle.getBundle(WebBeansConstants.WEB_BEANS_MESSAGES);
static
{
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansConstants.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansConstants.java?rev=1800681&r1=1800680&r2=1800681&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansConstants.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansConstants.java
Mon Jul 3 14:13:05 2017
@@ -55,5 +55,6 @@ public final class WebBeansConstants
/**JNDI name of the {@link javax.enterprise.inject.spi.BeanManager}
instance*/
public static final String WEB_BEANS_MANAGER_JNDI_NAME =
"java:comp/BeanManager";
+ public final static String WEB_BEANS_MESSAGES =
"openwebbeans/Messages";
}