Author: struberg
Date: Tue Sep 25 21:45:55 2012
New Revision: 1390170
URL: http://svn.apache.org/viewvc?rev=1390170&view=rev
Log:
OWB-694 fix wrong startup object message
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OWBLogConst.java
openwebbeans/trunk/webbeans-impl/src/main/resources/openwebbeans/Messages.properties
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
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=1390170&r1=1390169&r2=1390170&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
Tue Sep 25 21:45:55 2012
@@ -121,4 +121,5 @@ public class OWBLogConst
public static final String EXCEPT_0015 = "EXCEPT_0015"; // Passivation
bean \: [{0}] decorators must be passivating capable.
public static final String EXCEPT_0016 = "EXCEPT_0016"; // Passivation
bean \: [{0}] interceptors must be passivating capable.
public static final String EXCEPT_0017 = "EXCEPT_0017"; // Passivation
bean \: [{0}] interceptor \: [{1}] must have serializable injection points.
+ public static final String EXCEPT_0018 = "EXCEPT_0018"; // Wrong start
object.
}
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=1390170&r1=1390169&r2=1390170&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/resources/openwebbeans/Messages.properties
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/resources/openwebbeans/Messages.properties
Tue Sep 25 21:45:55 2012
@@ -111,6 +111,7 @@ EXCEPT_0014 = Multiple classes with name
EXCEPT_0015 = Passivation bean \: [{0}] decorators must be passivating capable.
EXCEPT_0016 = Passivation bean \: [{0}] interceptors must be passivating
capable.
EXCEPT_0017 = Passivation bean \: [{0}] interceptor \: [{1}] must have
serializable injection points.
+EXCEPT_0018 = Wrong startup object.
DEBUG_ADD_BYTYPE_CACHE_BEANS = Adding resolved beans with key [{0}] to cache.
DEBUG_ADD_BYNAME_CACHE_BEANS = Adding resolved EL beans with key [{0}] to
cache.
Modified:
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java?rev=1390170&r1=1390169&r2=1390170&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
(original)
+++
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
Tue Sep 25 21:45:55 2012
@@ -222,7 +222,7 @@ public final class WebContainerLifecycle
}
else
{
- throw new
WebBeansException(WebBeansLoggerFacade.getTokenString(OWBLogConst.EXCEPT_0002));
+ throw new
WebBeansException(WebBeansLoggerFacade.getTokenString(OWBLogConst.EXCEPT_0018));
}
}
