You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2010/02/15 22:15:39 UTC
svn commit: r910337 - in /openwebbeans/trunk:
samples/conversation-sample/src/main/webapp/WEB-INF/
webbeans-impl/src/main/java/org/apache/webbeans/config/
webbeans-impl/src/main/java/org/apache/webbeans/decorator/
webbeans-impl/src/main/java/org/apache...
Author: gerdogdu
Date: Mon Feb 15 21:15:32 2010
New Revision: 910337
URL: http://svn.apache.org/viewvc?rev=910337&view=rev
Log:
[OWB-278] Remove DEBUG messages from resource bundle since they don't need to be translated thanks to Paul J. Reder
Modified:
openwebbeans/trunk/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OWBLogConst.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/DefaultLifecycle.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansResolver.java
openwebbeans/trunk/webbeans-impl/src/main/resources/openwebbeans/Messages.properties
openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java
openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
Modified: openwebbeans/trunk/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml?rev=910337&r1=910336&r2=910337&view=diff
==============================================================================
--- openwebbeans/trunk/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ openwebbeans/trunk/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml Mon Feb 15 21:15:32 2010
@@ -27,7 +27,7 @@
<from-view-id>/buy.xhtml</from-view-id>
<navigation-case>
<from-outcome>toListingPage</from-outcome>
- <to-view-id>/listing.xhtml</to-view-id>
+ <to-view-id>/listing.xhtml</to-view-id>
<redirect/>
</navigation-case>
</navigation-rule>
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=910337&r1=910336&r2=910337&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java Mon Feb 15 21:15:32 2010
@@ -240,7 +240,7 @@
*/
private void validateInjectionPoints()
{
- logger.info(OWBLogConst.INFO_0013);
+ logger.debug("Validation of injection points has started.");
BeanManagerImpl manager = BeanManagerImpl.getManager();
Set<Bean<?>> beans = new HashSet<Bean<?>>();
@@ -254,7 +254,7 @@
}
- logger.info(OWBLogConst.INFO_0014);
+ logger.debug("Validation of the decorator's injection points has started.");
//Validate Decorators
validate(beans);
@@ -269,7 +269,7 @@
beans.add(wbInt);
}
- logger.info(OWBLogConst.INFO_0015);
+ logger.debug("Validation of the interceptor's injection points has started.");
//Validate Interceptors
validate(beans);
@@ -282,7 +282,7 @@
validate(beans);
- logger.info(OWBLogConst.INFO_0016);
+ logger.info(OWBLogConst.INFO_0008);
}
/**
@@ -342,7 +342,7 @@
*/
protected void deployFromClassPath(ScannerService scanner) throws ClassNotFoundException
{
- logger.info(OWBLogConst.INFO_0017);
+ logger.debug("Deploying configurations from class files has started.");
// Start from the class
Set<Class<?>> classIndex = scanner.getBeanClasses();
@@ -359,7 +359,7 @@
{
if(EJBWebBeansConfigurator.isSessionBean(implClass))
{
- logger.info(OWBLogConst.INFO_0019, new Object[]{implClass.getName()});
+ logger.info(OWBLogConst.INFO_0010, new Object[]{implClass.getName()});
defineEnterpriseWebBean(implClass);
}
@@ -367,7 +367,7 @@
}
}
- logger.info(OWBLogConst.INFO_0020);
+ logger.debug("Deploying configurations from class files has ended.");
}
@@ -381,7 +381,7 @@
*/
protected void deployFromXML(ScannerService scanner) throws WebBeansDeploymentException
{
- logger.info(OWBLogConst.INFO_0021);
+ logger.debug("Deploying configurations from XML files has started.");
Set<URL> xmlLocations = scanner.getBeanXmls();
Iterator<URL> it = xmlLocations.iterator();
@@ -416,7 +416,7 @@
}
}
- logger.info(OWBLogConst.INFO_0022);
+ logger.debug("Deploying configurations from XML has ended successfully.");
}
@@ -426,7 +426,7 @@
*/
protected void checkSpecializations(ScannerService scanner)
{
- logger.info(OWBLogConst.INFO_0029);
+ logger.debug("Checking Specialization constraints has started.");
try
{
@@ -470,7 +470,7 @@
}
- logger.info(OWBLogConst.INFO_0030);
+ logger.debug("Checking Specialization constraints has ended.");
}
@@ -531,7 +531,7 @@
*/
protected void checkStereoTypes(ScannerService scanner)
{
- logger.info(OWBLogConst.INFO_0031);
+ logger.debug("Checking StereoType constraints has started.");
addDefaultStereoTypes();
@@ -556,7 +556,7 @@
}
}
- logger.info(OWBLogConst.INFO_0032);
+ logger.debug("Checking StereoType constraints has ended.");
}
/**
@@ -607,7 +607,7 @@
//Decorator
if(WebBeansAnnotatedTypeUtil.isAnnotatedTypeDecorator(annotatedType))
{
- logger.info(OWBLogConst.INFO_0027, new Object[]{annotatedType.getJavaClass().getName()});
+ logger.info(OWBLogConst.INFO_0012, new Object[]{annotatedType.getJavaClass().getName()});
if(annotationTypeSet)
{
WebBeansAnnotatedTypeUtil.defineDecorator(annotatedType);
@@ -620,7 +620,7 @@
//Interceptor
else if(WebBeansAnnotatedTypeUtil.isAnnotatedTypeInterceptor(annotatedType))
{
- logger.info(OWBLogConst.INFO_0024, new Object[]{annotatedType.getJavaClass().getName()});
+ logger.info(OWBLogConst.INFO_0011, new Object[]{annotatedType.getJavaClass().getName()});
if(annotationTypeSet)
{
WebBeansAnnotatedTypeUtil.defineInterceptor(annotatedType);
@@ -632,7 +632,7 @@
}
else
{
- logger.info(OWBLogConst.INFO_0018, new Object[]{annotatedType.getJavaClass().getName()});
+ logger.info(OWBLogConst.INFO_0009, new Object[]{annotatedType.getJavaClass().getName()});
WebBeansUtil.defineManagedBean(managedBeanCreator, annotatedType);
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OWBLogConst.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OWBLogConst.java?rev=910337&r1=910336&r2=910337&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OWBLogConst.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OWBLogConst.java Mon Feb 15 21:15:32 2010
@@ -21,21 +21,6 @@
{
public final static String DEFAULT_MSGS_PROPERTIES_NAME = "javax.openwebbeans.Messages";
- public final static String DEBUG_0001 = "DEBUG_0001"; // Application is configured as JSP. Adding EL Resolver.
- public final static String DEBUG_0002 = "DEBUG_0002"; // Resolving systemId with :
- public final static String DEBUG_0003 = "DEBUG_0003"; // Resolving is successful with systemId :
- public final static String DEBUG_0004 = "DEBUG_0004"; // Resolving failed using default SAXResolver for systemId :
- public final static String DEBUG_0005 = "DEBUG_0005"; // Starting a new request :
- public final static String DEBUG_0006 = "DEBUG_0006"; // Destroying a request :
- public final static String DEBUG_0007 = "DEBUG_0007"; // Starting a session with session id :
- public final static String DEBUG_0008 = "DEBUG_0008"; // Destroying a session with session id :
- public final static String DEBUG_0009 = "DEBUG_0009"; // PluginLoader startUp called.
- public final static String DEBUG_0010 = "DEBUG_0010"; // PluginLoader is already started.
- public final static String DEBUG_0011 = "DEBUG_0011"; // PluginLoader shutDown called.
- public final static String DEBUG_0012 = "DEBUG_0012"; // PluginLoader is already shut down.
-
- public final static String TRACE_0001 = "TRACE_0001"; // Notifying with event payload :
-
public final static String TEXT_INTERCEPT_CLASS = "TEXT_INTERCEPT_CLASS"; // Interceptor Class :
public final static String TEXT_ANNO_CLASS = "TEXT_ANNO_CLASS"; // Annotated Decorator Class :
public final static String TEXT_XML_CLASS = "TEXT_XML_CLASS"; // XML based Decorator Class :
@@ -48,41 +33,21 @@
public final static String TEXT_JAVA_TYPENAME = "TEXT_JAVA_TYPENAME"; // Java type with name :
public final static String INFO_0001 = "INFO_0001"; // Using discovery service implementation class : [{1}]
- public final static String INFO_0002 = "INFO_0002"; // OpenWebBeans Container is starting.
- public final static String INFO_0003 = "INFO_0003"; // Scanning classpaths for beans artifacts.
- public final static String INFO_0004 = "INFO_0004"; // Deploying scanned beans.
- public final static String INFO_0005 = "INFO_0005"; // OpenWebBeans Container is started, it took {1} ms.
- public final static String INFO_0006 = "INFO_0006"; // OpenWebBeans Container is stopping.
- public final static String INFO_0007 = "INFO_0007"; // OpenWebBeans Container has stopped.
- public final static String INFO_0008 = "INFO_0008"; // OpenWebBeans Container is stopped for context path,
- public final static String INFO_0009 = "INFO_0009"; // Session is passivated. Session id : [{1}]
- public final static String INFO_0010 = "INFO_0010"; // Session is activated. Session id : [{1}]
- public final static String INFO_0011 = "INFO_0011"; // Starting configuration of Web Beans {1}
- public final static String INFO_0012 = "INFO_0012"; // Finished configuration of Web Beans {1}
- public final static String INFO_0013 = "INFO_0013"; // Validation of injection points are started.
- public final static String INFO_0014 = "INFO_0014"; // Validation of the decorator's injection points are started.
- public final static String INFO_0015 = "INFO_0015"; // Validation of the interceptor's injection points are started.
- public final static String INFO_0016 = "INFO_0016"; // All injection points are validated succesfully.
- public final static String INFO_0017 = "INFO_0017"; // Deploying configurations from class files is started.
- public final static String INFO_0018 = "INFO_0018"; // Found Managed Bean with class name : [{1}]
- public final static String INFO_0019 = "INFO_0019"; // Found Enterprise Bean with class name : [{1}]
- public final static String INFO_0020 = "INFO_0020"; // Deploying configurations from class files is ended.
- public final static String INFO_0021 = "INFO_0021"; // Deploying configurations from XML files is started.
- public final static String INFO_0022 = "INFO_0022"; // Deploying configurations from XML is ended succesfully.
- public final static String INFO_0023 = "INFO_0023"; // Configuring the Interceptors is started.
- public final static String INFO_0024 = "INFO_0024"; // Found Managed Bean Interceptor with class name : [{1}]
- public final static String INFO_0025 = "INFO_0025"; // Configuring the Interceptors is ended.
- public final static String INFO_0026 = "INFO_0026"; // Configuring the Decorators is started.
- public final static String INFO_0027 = "INFO_0027"; // Found Managed Bean Decorator with class name : [{1}]
- public final static String INFO_0028 = "INFO_0028"; // Configuring the Decorators is ended.
- public final static String INFO_0029 = "INFO_0029"; // Checking Specialization constraints is started.
- public final static String INFO_0030 = "INFO_0030"; // Checking Specialization constraints is ended.
- public final static String INFO_0031 = "INFO_0031"; // Checking StereoTypes constraints is started.
- public final static String INFO_0032 = "INFO_0032"; // Checking StereoTypes constraints is ended.
- public final static String INFO_0033 = "INFO_0033"; // Adding OpenWebBeansPlugin :
- public final static String INFO_0041 = "INFO_0041"; // Destroying the conversation context with cid: [{0}] for view: [{1}]
- public final static String INFO_0042 = "INFO_0042"; // Restoring conversation with cid: [{0}] for view: [{1}]
- public final static String INFO_0043 = "INFO_0043"; // Creating a new transitional conversation for view: [{0}]
+ public final static String INFO_0002 = "INFO_0002"; // OpenWebBeans Container is started, it took {1} ms.
+ public final static String INFO_0003 = "INFO_0003"; // OpenWebBeans Container is stopped for context path,
+ public final static String INFO_0004 = "INFO_0004"; // Session is passivated. Session id : [{1}]
+ public final static String INFO_0005 = "INFO_0005"; // Session is activated. Session id : [{1}]
+ public final static String INFO_0006 = "INFO_0006"; // Starting configuration of Web Beans {1}
+ public final static String INFO_0007 = "INFO_0007"; // Finished configuration of Web Beans {1}
+ public final static String INFO_0008 = "INFO_0008"; // All injection points are validated successfully.
+ public final static String INFO_0009 = "INFO_0009"; // Found Managed Bean with class name : [{1}]
+ public final static String INFO_0010 = "INFO_0010"; // Found Enterprise Bean with class name : [{1}]
+ public final static String INFO_0011 = "INFO_0011"; // Found Managed Bean Interceptor with class name : [{1}]
+ public final static String INFO_0012 = "INFO_0012"; // Found Managed Bean Decorator with class name : [{1}]
+ public final static String INFO_0013 = "INFO_0013"; // Adding OpenWebBeansPlugin :
+ public final static String INFO_0014 = "INFO_0014"; // Destroying the conversation context with cid: [{0}] for view: [{1}]
+ public final static String INFO_0015 = "INFO_0015"; // Restoring conversation with cid: [{0}] for view: [{1}]
+ public final static String INFO_0016 = "INFO_0016"; // Creating a new transitional conversation for view: [{0}]
public final static String WARN_0001 = "WARN_0001"; // No plugins to shutDown.
public final static String WARN_0002 = "WARN_0002"; // Alternative XML content is wrong. Child of <alternatives> must be <class>,<stereotype> but found :
@@ -94,21 +59,21 @@
public final static String ERROR_0001 = "ERROR_0001"; // Unable to inject resource for : [{1}]
public final static String ERROR_0002 = "ERROR_0002"; // Initialization of the WebBeans container has failed.
- public final static String ERROR_0003 = "ERROR_0003"; // An exception has occured in the transactional observer.
+ public final static String ERROR_0003 = "ERROR_0003"; // An exception has occurred in the transactional observer.
public final static String ERROR_0004 = "ERROR_0004"; // Unable to initialize InitialContext object.
public final static String ERROR_0005 = "ERROR_0005"; // Unable to bind object with name : [{1}]
public final static String ERROR_0006 = "ERROR_0006"; // Security exception. Cannot access decorator class: [{1}] method : [{2}]
public final static String ERROR_0007 = "ERROR_0007"; // Delegate field is not found on the given decorator class : [{1}]
- public final static String ERROR_0008 = "ERROR_0008"; // Error occured while executing {1}
+ public final static String ERROR_0008 = "ERROR_0008"; // Error occurred while executing {1}
public final static String ERROR_0009 = "ERROR_0009"; // Error while shutting down the plugin : [{1}]
- public final static String ERROR_0010 = "ERROR_0010"; // An error occured while closing the JMS instance.
+ public final static String ERROR_0010 = "ERROR_0010"; // An error occurred while closing the JMS instance.
public final static String ERROR_0011 = "ERROR_0011"; // Method security access violation for method : [{1}] in decorator class : [{2}]
public final static String ERROR_0012 = "ERROR_0012"; // Exception in calling method : [{1}] in decorator class : [{2}]. Look in the log for target checked exception.
public final static String ERROR_0013 = "ERROR_0013"; // Got an Exception while starting a fresh session!
public final static String ERROR_0014 = "ERROR_0014"; // Method illegal access for method : [{1}] in decorator class : [{2}]
public final static String ERROR_0015 = "ERROR_0015"; // Illegal access exception for field : [{1}] in decorator class : [{2}]
- public final static String ERROR_0016 = "ERROR_0016"; // IllegalArgumentException has occured while calling the field: [{1}] on the class: [{2}]
- public final static String ERROR_0017 = "ERROR_0017"; // IllegalAccessException has occured while calling the field: [{1}] on the class: [{2}]
+ public final static String ERROR_0016 = "ERROR_0016"; // IllegalArgumentException has occurred while calling the field: [{1}] on the class: [{2}]
+ public final static String ERROR_0017 = "ERROR_0017"; // IllegalAccessException has occurred while calling the field: [{1}] on the class: [{2}]
public final static String FATAL_0001 = "FATAL_0001"; // Exception thrown while destroying bean instance : {1}
public final static String FATAL_0002 = "FATAL_0002"; // Unable to read root element of the given input stream.
@@ -118,7 +83,7 @@
public final static String EXCEPT_0001 = "EXCEPT_0001"; // Wrong initialization object.
public final static String EXCEPT_0002 = "EXCEPT_0002"; // Wrong ended object.
public final static String EXCEPT_0003 = "EXCEPT_0003"; // Specialized class [
- public final static String EXCEPT_0004 = "EXCEPT_0004"; // ] must extendanothre class.
+ public final static String EXCEPT_0004 = "EXCEPT_0004"; // ] must extend another class.
public final static String EXCEPT_XML = "EXCEPT_XML"; // XML Specialization Error :
public final static String EXCEPT_0005 = "EXCEPT_0005"; // More than one class specialized the same super class :
public final static String EXCEPT_0006 = "EXCEPT_0006"; // Got Exceptions while sending shutdown to the following plugins :
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java?rev=910337&r1=910336&r2=910337&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java Mon Feb 15 21:15:32 2010
@@ -53,12 +53,8 @@
public static <T> void configureXMLDecoratorClass(AbstractInjectionTargetBean<T> delegate, XMLInjectionPointModel model)
{
- logger.info(OWBLogConst.INFO_0011, new Object[]{logger.getTokenString(OWBLogConst.TEXT_XML_CLASS), delegate.getReturnType().getName()});
-
+ logger.debug("Configuring XML decorator class : " + delegate.getReturnType());
WebBeansXMLDecorator<T> decorator = new WebBeansXMLDecorator<T>(delegate, model);
-
- logger.info(OWBLogConst.INFO_0012, new Object[]{logger.getTokenString(OWBLogConst.TEXT_XML_CLASS), delegate.getReturnType()});
-
BeanManagerImpl.getManager().addDecorator(decorator);
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java?rev=910337&r1=910336&r2=910337&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java Mon Feb 15 21:15:32 2010
@@ -41,7 +41,6 @@
import org.apache.webbeans.component.AbstractOwbBean;
import org.apache.webbeans.component.AbstractInjectionTargetBean;
import org.apache.webbeans.component.InjectionTargetBean;
-import org.apache.webbeans.config.OWBLogConst;
import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.container.InjectionResolver;
import org.apache.webbeans.exception.WebBeansException;
@@ -154,7 +153,7 @@
@SuppressWarnings("unchecked")
public void notify(T event)
{
- logger.trace(OWBLogConst.TRACE_0001, new Object[]{event.toString()});
+ logger.trace("Notifying with event payload : ", new Object[]{event.toString()});
AbstractOwbBean<Object> baseComponent = (AbstractOwbBean<Object>) bean;
AbstractOwbBean<Object> specializedComponent = null;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/DefaultLifecycle.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/DefaultLifecycle.java?rev=910337&r1=910336&r2=910337&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/DefaultLifecycle.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/DefaultLifecycle.java Mon Feb 15 21:15:32 2010
@@ -107,7 +107,7 @@
public void requestStarted(ServletRequestEvent event)
{
- logger.debug(OWBLogConst.DEBUG_0005, new Object[]{event.getServletRequest().getRemoteAddr()});
+ logger.debug("Starting a new request : ", new Object[]{event.getServletRequest().getRemoteAddr()});
ContextFactory.initializeThreadLocals();
@@ -136,19 +136,19 @@
public void requestEnded(ServletRequestEvent event)
{
- logger.debug(OWBLogConst.DEBUG_0006, new Object[]{event.getServletRequest().getRemoteAddr()});
+ logger.debug("Destroying a request : ", new Object[]{event.getServletRequest().getRemoteAddr()});
ContextFactory.destroyRequestContext((HttpServletRequest) event.getServletRequest());
}
public void sessionStarted(HttpSessionEvent event)
{
- logger.debug(OWBLogConst.DEBUG_0007, new Object[]{event.getSession().getId()});
+ logger.debug("Starting a session with session id : ", new Object[]{event.getSession().getId()});
ContextFactory.initSessionContext(event.getSession());
}
public void sessionEnded(HttpSessionEvent event)
{
- logger.debug(OWBLogConst.DEBUG_0008, new Object[]{event.getSession().getId()});
+ logger.debug("Destroying a session with session id : ", new Object[]{event.getSession().getId()});
ContextFactory.destroySessionContext(event.getSession());
ConversationManager conversationManager = ConversationManager.getInstance();
@@ -171,7 +171,7 @@
}
// Initalize Application Context
- logger.info(OWBLogConst.INFO_0002);
+ logger.debug("OpenWebBeans Container is starting.");
long begin = System.currentTimeMillis();
@@ -193,18 +193,18 @@
service = Executors.newScheduledThreadPool(1);
service.scheduleWithFixedDelay(new ConversationCleaner(), delay, delay, TimeUnit.MILLISECONDS);
- logger.info(OWBLogConst.INFO_0003);
+ logger.debug("Scanning classpaths for beans artifacts.");
this.discovery.scan();
- logger.info(OWBLogConst.INFO_0004);
+ logger.debug("Deploying scanned beans.");
deployer.deploy(this.discovery);
//Application is configured as JSP
if(OpenWebBeansConfiguration.getInstance().isJspApplication())
{
- logger.debug(OWBLogConst.DEBUG_0001);
+ logger.debug("Application is configured as JSP. Adding EL Resolver.");
JspApplicationContext applicationCtx = JspFactory.getDefaultFactory().getJspApplicationContext(servletContext);
applicationCtx.addELResolver(new WebBeansELResolver());
@@ -212,7 +212,7 @@
long end = System.currentTimeMillis();
- logger.info(OWBLogConst.INFO_0005, new Object[]{Long.toString(end - begin)});
+ logger.info(OWBLogConst.INFO_0002, new Object[]{Long.toString(end - begin)});
}
public void applicationEnded(Object endObject)
@@ -229,7 +229,7 @@
throw new WebBeansException(logger.getTokenString(OWBLogConst.EXCEPT_0002));
}
}
- logger.info(OWBLogConst.INFO_0006);
+ logger.debug("OpenWebBeans Container is stopping.");
//Fire shut down
this.rootManager.fireEvent(new BeforeShutdownImpl(), new Annotation[0]);
@@ -251,17 +251,17 @@
//Clear singleton list
WebBeansFinder.clearInstances();
- logger.info(OWBLogConst.INFO_0008, new Object[]{servletContext != null ? servletContext.getContextPath() : null});
+ logger.info(OWBLogConst.INFO_0003, new Object[]{servletContext != null ? servletContext.getContextPath() : null});
}
public void sessionPassivated(HttpSessionEvent event)
{
- logger.info(OWBLogConst.INFO_0009, new Object[]{event.getSession().getId()});
+ logger.info(OWBLogConst.INFO_0004, new Object[]{event.getSession().getId()});
}
public void sessionActivated(HttpSessionEvent event)
{
- logger.info(OWBLogConst.INFO_0010, new Object[]{event.getSession().getId()});
+ logger.info(OWBLogConst.INFO_0005, new Object[]{event.getSession().getId()});
}
private static class ConversationCleaner implements Runnable
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java?rev=910337&r1=910336&r2=910337&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java Mon Feb 15 21:15:32 2010
@@ -94,7 +94,7 @@
{
if(this.started.compareAndSet(false, true))
{
- logger.info(OWBLogConst.INFO_0002);
+ logger.debug("OpenWebBeans Container is starting.");
long begin = System.currentTimeMillis();
//Singleton context
@@ -103,17 +103,17 @@
// load all optional plugins
PluginLoader.getInstance().startUp();
- logger.info(OWBLogConst.INFO_0003);
+ logger.debug("Scanning classpaths for beans artifacts.");
this.discoveryService.scan();
- logger.info(OWBLogConst.INFO_0004);
+ logger.debug("Deploying scanned beans.");
this.beansDeployer.deploy(this.discoveryService);
long end = System.currentTimeMillis();
- logger.info(OWBLogConst.INFO_0005, new Object[]{Long.toString(end - begin)});
+ logger.info(OWBLogConst.INFO_0002, new Object[]{Long.toString(end - begin)});
}
else
@@ -127,7 +127,7 @@
{
if(this.stopped.compareAndSet(false, true))
{
- logger.info(OWBLogConst.INFO_0006);
+ logger.debug("OpenWebBeans Container is stopping.");
//Fire shut down
@@ -148,7 +148,7 @@
//Clear singleton list
WebBeansFinder.clearInstances();
- logger.info(OWBLogConst.INFO_0007);
+ logger.debug("OpenWebBeans Container has stopped.");
}
else
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java?rev=910337&r1=910336&r2=910337&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java Mon Feb 15 21:15:32 2010
@@ -84,7 +84,7 @@
{
if(this.started.compareAndSet(false, true))
{
- logger.debug(OWBLogConst.DEBUG_0009);
+ logger.debug("PluginLoader startUp called.");
ArrayList<OpenWebBeansPlugin> ps = new ArrayList<OpenWebBeansPlugin>();
ServiceLoader<OpenWebBeansPlugin> owbPluginsLoader = ServiceLoader.load(OpenWebBeansPlugin.class);
@@ -92,7 +92,7 @@
while(pluginIter.hasNext())
{
OpenWebBeansPlugin plugin = pluginIter.next();
- logger.info(OWBLogConst.INFO_0033, new Object[]{plugin.getClass().getSimpleName()});
+ logger.info(OWBLogConst.INFO_0013, new Object[]{plugin.getClass().getSimpleName()});
plugin.startUp();
ps.add(plugin);
}
@@ -102,7 +102,7 @@
}
else
{
- logger.debug(OWBLogConst.DEBUG_0010);
+ logger.debug("PluginLoader is already started.");
}
}
@@ -115,7 +115,7 @@
{
if(this.started.compareAndSet(true, false))
{
- logger.debug(OWBLogConst.DEBUG_0011);
+ logger.debug("PluginLoader shutDown called.");
if (plugins == null)
{
@@ -147,7 +147,7 @@
}
else
{
- logger.debug(OWBLogConst.DEBUG_0012);
+ logger.debug("PluginLoader is already shut down.");
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansResolver.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansResolver.java?rev=910337&r1=910336&r2=910337&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansResolver.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansResolver.java Mon Feb 15 21:15:32 2010
@@ -19,7 +19,6 @@
import org.apache.webbeans.WebBeansConstants;
import org.apache.webbeans.logger.WebBeansLogger;
import org.apache.webbeans.util.WebBeansUtil;
-import org.apache.webbeans.config.OWBLogConst;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -37,7 +36,7 @@
*/
public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException
{
- logger.debug(OWBLogConst.DEBUG_0002, new Object[]{systemId});
+ logger.debug("Resolving systemId with : ", new Object[]{systemId});
if (systemId.equals(WebBeansConstants.WEB_BEANS_XML_SYSID))
{
@@ -45,7 +44,7 @@
if (stream != null)
{
- logger.debug(OWBLogConst.DEBUG_0003, new Object[]{systemId});
+ logger.debug("Resolving is successful with systemId : ", new Object[]{systemId});
return createInputSource(stream, publicId, systemId);
}
}
@@ -57,12 +56,12 @@
if (stream != null)
{
- logger.debug(OWBLogConst.DEBUG_0003, new Object[]{systemId});
+ logger.debug("Resolving is successful with systemId : ", new Object[]{systemId});
return createInputSource(stream, publicId, systemId);
}
}
- logger.debug(OWBLogConst.DEBUG_0004, new Object[]{systemId});
+ logger.debug("Resolving failed using default SAXResolver for systemId : ", new Object[]{systemId});
return null;
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/resources/openwebbeans/Messages.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/resources/openwebbeans/Messages.properties?rev=910337&r1=910336&r2=910337&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/resources/openwebbeans/Messages.properties (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/resources/openwebbeans/Messages.properties Mon Feb 15 21:15:32 2010
@@ -12,29 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-#========= BEGINNING OF UNTRANSLATED MESSAGES =========================
-
-#debug messages:
-DEBUG_0000 = Some random debug text for use in testing.
-DEBUG_0001 = Application is configured as JSP. Adding EL Resolver.
-DEBUG_0002 = Resolving systemId with \:
-DEBUG_0003 = Resolving is successful with systemId \:
-DEBUG_0004 = Resolving failed using default SAXResolver for systemId \:
-DEBUG_0005 = Starting a new request \:
-DEBUG_0006 = Destroying a request \:
-DEBUG_0007 = Starting a session with session id \:
-DEBUG_0008 = Destroying a session with session id \:
-DEBUG_0009 = PluginLoader startUp called.
-DEBUG_0010 = PluginLoader is already started.
-DEBUG_0011 = PluginLoader shutDown called.
-DEBUG_0012 = PluginLoader is already shut down.
-
-
-#trace messages:
-TRACE_0000 = Some random trace text for use in testing.
-TRACE_0001 = Notifying with event payload \:
-
-#========= END OF UNTRANSLATED MESSAGES ===============================
#========= BEGIN TRANSLATING MESSAGES HERE ============================
@@ -44,57 +21,35 @@
TEXT_XML_CLASS = XML based Decorator Class \:
TEXT_CONFIG_PROP = Config properties [
TEXT_CONFIG_NOT_FOUND = ] not found. Using default settings.
-TEXT_CONFIG_FOUND = ] found at location :
+TEXT_CONFIG_FOUND = ] found at location \:
TEXT_OVERRIDING = . Overriding default settings.
TEXT_MB_IMPL = Managed Bean implementation class \:
TEXT_SAME_SCOPE = stereotypes must declare the same @Scope annotations.
-TEXT_JAVA_TYPENAME = Java type with name :
+TEXT_JAVA_TYPENAME = Java type with name \:
#info messages:
-INFO_0000 = Some random informational text for use in testing.
-INFO_0001 = Using discovery service implementation class : [{0}]
-INFO_0002 = OpenWebBeans Container is starting.
-INFO_0003 = Scanning classpaths for beans artifacts.
-INFO_0004 = Deploying scanned beans.
-INFO_0005 = OpenWebBeans Container has started, it took {0} ms.
-INFO_0006 = OpenWebBeans Container is stopping.
-INFO_0007 = OpenWebBeans Container has stopped.
-INFO_0008 = OpenWebBeans Container was stopped for context path, {0}
-INFO_0009 = Session is passivated. Session id \: [{0}]
-INFO_0010 = Session is activated. Session id : [{0}]
-INFO_0011 = Starting configuration of Web Beans {0}
-INFO_0012 = Finished configuration of Web Beans {0}
-INFO_0013 = Validation of injection points has started.
-INFO_0014 = Validation of the decorator's injection points has started.
-INFO_0015 = Validation of the interceptor's injection points has started.
-INFO_0016 = All injection points were validated successfully.
-INFO_0017 = Deploying configurations from class files has started.
-INFO_0018 = Found Managed Bean with class name : [{0}]
-INFO_0019 = Found Enterprise Bean with class name : [{0}]
-INFO_0020 = Deploying configurations from class files has ended.
-INFO_0021 = Deploying configurations from XML files has started.
-INFO_0022 = Deploying configurations from XML has ended succesfully.
-INFO_0023 = Configuring the Interceptors has started.
-INFO_0024 = Found Managed Bean Interceptor with class name : [{0}]
-INFO_0025 = Configuring the Interceptors has ended.
-INFO_0026 = Configuring the Decorators has started.
-INFO_0027 = Found Managed Bean Decorator with class name : [{0}]
-INFO_0028 = Configuring the Decorators has ended.
-INFO_0029 = Checking Specialization constraints has started.
-INFO_0030 = Checking Specialization constraints has ended.
-INFO_0031 = Checking StereoType constraints has started.
-INFO_0032 = Checking StereoType constraints has ended.
-INFO_0033 = Adding OpenWebBeansPlugin : {0}
-INFO_0041 = Destroying the conversation context with cid: [{0}]
-INFO_0042 = Restoring conversation with cid: [{0}]
-INFO_0043 = Creating a new transitional conversation with cid: [{0}]
+INFO_0001 = Using discovery service implementation class \: [{0}]
+INFO_0002 = OpenWebBeans Container has started, it took {0} ms.
+INFO_0003 = OpenWebBeans Container was stopped for context path, {0}
+INFO_0004 = Session id [{0}] is passivated.
+INFO_0005 = Session id [{0}] is activated.
+INFO_0006 = Starting configuration of Web Beans {0}
+INFO_0007 = Finished configuration of Web Beans {0}
+INFO_0008 = All injection points were validated successfully.
+INFO_0009 = Found Managed Bean with class name \: [{0}]
+INFO_0010 = Found Enterprise Bean with class name \: [{0}]
+INFO_0011 = Found Managed Bean Interceptor with class name \: [{0}]
+INFO_0012 = Found Managed Bean Decorator with class name \: [{0}]
+INFO_0013 = Adding OpenWebBeansPlugin \: {0}
+INFO_0014 = Destroying the conversation context with cid \: [{0}]
+INFO_0015 = Restoring conversation with cid \: [{0}]
+INFO_0016 = Creating a new transitional conversation with cid \: [{0}]
#warning messages:
-WARN_0000 = Some random warning text for use in testing.
WARN_0001 = No plugins to shutDown.
WARN_0002 = Alternative XML content is incorrect. Child of <alternatives> must be <class>,<stereotype> but found \:
WARN_0003 = Discovery service not found. Continue by using MetaDataDiscoveryStandard as a default.
@@ -105,30 +60,28 @@
#error messages:
-ERROR_0000 = Some random error text for use in testing.
ERROR_0001 = Unable to inject resource for : [{0}]
ERROR_0002 = Initialization of the WebBeans container has failed.
-ERROR_0003 = An exception has occured in the transactional observer.
+ERROR_0003 = An exception has occurred in the transactional observer.
ERROR_0004 = Unable to initialize InitialContext object.
-ERROR_0005 = Unable to bind object with name : [{0}]
-ERROR_0006 = Security exception. Cannot access decorator class: [{0}] method : [{1}]
-ERROR_0007 = Delegate field is not found on the given decorator class : [{0}]
-ERROR_0008 = Error occured while executing {0}
-ERROR_0009 = Error while shutting down the plugin : {0}
-ERROR_0010 = An error occured while closing the JMS instance.
-ERROR_0011 = Method security access violation for method : [{0}] in decorator class : [{1}]
-ERROR_0012 = Exception in calling method : [{0}] in decorator class : [{1}]. Look in the log for target checked exception.
+ERROR_0005 = Unable to bind object with name \: [{0}]
+ERROR_0006 = Security exception. Cannot access decorator class \: [{0}] method \: [{1}]
+ERROR_0007 = Delegate field is not found on the given decorator class \: [{0}]
+ERROR_0008 = Error occurred while executing {0}
+ERROR_0009 = Error while shutting down the plugin \: {0}
+ERROR_0010 = An error occurred while closing the JMS instance.
+ERROR_0011 = Method security access violation for method \: [{0}] in decorator class \: [{1}]
+ERROR_0012 = Exception in calling method \: [{0}] in decorator class \: [{1}]. Look in the log for target checked exception.
ERROR_0013 = Caught an Exception while starting a fresh session!
-ERROR_0014 = Illegal access exception for method : [{0}] in decorator class : [{1}]
-ERROR_0015 = Illegal access exception for field : [{0}] in decorator class : [{1}]
-ERROR_0016 = IllegalArgumentException has occured while calling the field: [{0}] on the class: [{1}]
-ERROR_0017 = IllegalAccessException has occured while calling the field: [{0}] on the class: [{1}]
+ERROR_0014 = Illegal access exception for method \: [{0}] in decorator class \: [{1}]
+ERROR_0015 = Illegal access exception for field \: [{0}] in decorator class \: [{1}]
+ERROR_0016 = IllegalArgumentException has occurred while calling the field \: [{0}] on the class \: [{1}]
+ERROR_0017 = IllegalAccessException has occurred while calling the field \: [{0}] on the class \: [{1}]
#fatal messages:
-FATAL_0000 = Some random fatal text for use in testing.
-FATAL_0001 = Exception thrown while destroying bean instance : {0}
+FATAL_0001 = Exception thrown while destroying bean instance \: {0}
FATAL_0002 = Unable to read root element of the given input stream.
@@ -140,9 +93,9 @@
EXCEPT_0003 = Specialized class [
EXCEPT_0004 = ] must extend another class.
EXCEPT_XML = XML Specialization Error \:
-EXCEPT_0005 = More than one class specialized the same super class :
+EXCEPT_0005 = More than one class specialized the same super class \:
EXCEPT_0006 = Caught Exceptions while sending shutdown to the following plugins \:
-EXCEPT_0007 = TransactionPhase not supported\:
+EXCEPT_0007 = TransactionPhase not supported \:
EXCEPT_0008 = Caught Exception while handling event object with type \:
EXCEPT_0009 = Unable to unbind object with name \:
EXCEPT_0010 = Unable to lookup object with name \:
Modified: openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java?rev=910337&r1=910336&r2=910337&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java (original)
+++ openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java Mon Feb 15 21:15:32 2010
@@ -56,7 +56,7 @@
if (conversation.isTransient())
{
- logger.info(OWBLogConst.INFO_0041, new Object[]{conversation.getId()});
+ logger.info(OWBLogConst.INFO_0014, new Object[]{conversation.getId()});
ContextFactory.destroyConversationContext();
}
else
@@ -85,7 +85,7 @@
if (conversation.isTransient())
{
- logger.info(OWBLogConst.INFO_0043, new Object[]{conversation.getId()});
+ logger.info(OWBLogConst.INFO_0016, new Object[]{conversation.getId()});
ContextFactory.initConversationContext(null);
//Not restore, throw exception
@@ -96,7 +96,7 @@
}
else
{
- logger.info(OWBLogConst.INFO_0042, new Object[]{conversation.getId()});
+ logger.info(OWBLogConst.INFO_0015, new Object[]{conversation.getId()});
//Conversation must be used by one thread at a time
ConversationImpl owbConversation = (ConversationImpl)conversation;
Modified: openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/openwebbeans/openwebbeans.properties?rev=910337&r1=910336&r2=910337&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/openwebbeans/openwebbeans.properties (original)
+++ openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/openwebbeans/openwebbeans.properties Mon Feb 15 21:15:32 2010
@@ -39,4 +39,7 @@
org.apache.webbeans.spi.JPAService=org.apache.webbeans.spi.se.JPAServicePersistenceImpl
#use the web metadata as default
-org.apache.webbeans.spi.ScannerService=org.apache.webbeans.test.tck.mock.TCKMetaDataDiscoveryImpl
\ No newline at end of file
+org.apache.webbeans.spi.ScannerService=org.apache.webbeans.test.tck.mock.TCKMetaDataDiscoveryImpl
+
+#use embedded openejb metadata discovery
+org.apache.webbeans.spi.deployer.UseEjbMetaDataDiscoveryService=true
\ No newline at end of file