You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/12/31 18:53:12 UTC
svn commit: r1054152 - in /myfaces/extensions/cdi/trunk:
core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/
jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/
Author: gpetracek
Date: Fri Dec 31 17:53:12 2010
New Revision: 1054152
URL: http://svn.apache.org/viewvc?rev=1054152&view=rev
Log:
EXTCDI-113 first draft
Modified:
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/AbstractStartupObserver.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/JsfModuleStartupObserver.java
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/AbstractStartupObserver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/AbstractStartupObserver.java?rev=1054152&r1=1054151&r2=1054152&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/AbstractStartupObserver.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/AbstractStartupObserver.java Fri Dec 31 17:53:12 2010
@@ -71,21 +71,21 @@ public abstract class AbstractStartupObs
processedMethod.add(currentMethod.getName());
- info.append(" method-name:\t\t").append(currentMethod.getName());
+ info.append(" method:\t").append(currentMethod.getName());
info.append(separator);
Object value;
try
{
value = currentMethod.invoke(config);
- info.append(" method-value:\t").append(value.toString());
+ info.append(" value:\t").append(value.toString());
}
catch (IllegalAccessException e)
{
- info.append(" method-value:\t[unknown]");
+ info.append(" value:\t[unknown]");
}
catch (InvocationTargetException e)
{
- info.append(" method-value: [unknown]");
+ info.append(" value: [unknown]");
}
info.append(separator);
info.append(separator);
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java?rev=1054152&r1=1054151&r2=1054152&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java Fri Dec 31 17:53:12 2010
@@ -21,10 +21,13 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.CodiInformation;
import org.apache.myfaces.extensions.cdi.core.api.logging.Logger;
import org.apache.myfaces.extensions.cdi.core.api.projectstage.ProjectStage;
+import org.apache.myfaces.extensions.cdi.core.api.provider.BeanManagerProvider;
import org.apache.myfaces.extensions.cdi.core.api.startup.event.StartupEvent;
+import org.apache.myfaces.extensions.cdi.core.api.util.ClassUtils;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.BeanManager;
import javax.inject.Inject;
import java.io.Serializable;
import java.util.Map;
@@ -54,10 +57,20 @@ public class CoreStartupObserver extends
try
{
+ String cdiVersion = detectActiveCdiVersion();
+
//module info
StringBuilder info = new StringBuilder("[Started] MyFaces CODI (Extensions CDI) Core");
info.append(getCodiCoreInformation());
info.append(separator);
+
+ if(cdiVersion != null)
+ {
+ info.append(cdiVersion);
+ info.append(separator);
+ }
+ info.append(separator);
+
info.append("project-stage: ");
info.append(this.projectStage.toString());
info.append(separator);
@@ -67,28 +80,23 @@ public class CoreStartupObserver extends
info.append(separator);
//application info
- for(Map.Entry property : System.getProperties().entrySet())
- {
- if(property.getKey() instanceof String &&
- ((String) property.getKey()).startsWith("org.apache.myfaces.extensions.cdi"))
- {
- info.append("system-property-name:\t").append(property.getKey());
- info.append(separator);
-
- info.append("system-property-value:\t").append(property.getValue());
- info.append(separator);
- info.append(separator);
- }
- }
+ String systemProperties = getSystemPropertiesForCodi();
- for(Map.Entry<String, Serializable> contextParam : startupEvent.getApplicationParameters().entrySet())
+ if(systemProperties != null)
{
- info.append("param-name:\t\t").append(contextParam.getKey());
+ info.append("system-properties:");
info.append(separator);
+ info.append(systemProperties);
+ }
- info.append("param-value:\t").append(contextParam.getValue());
- info.append(separator);
+
+ String applicationParameters = getApplicationParameters(startupEvent);
+
+ if(applicationParameters != null)
+ {
+ info.append("application-parameters:");
info.append(separator);
+ info.append(applicationParameters);
}
//module config
@@ -104,6 +112,78 @@ public class CoreStartupObserver extends
}
}
+ private String getSystemPropertiesForCodi()
+ {
+ StringBuilder info = new StringBuilder("");
+ for(Map.Entry property : System.getProperties().entrySet())
+ {
+ if(property.getKey() instanceof String &&
+ ((String) property.getKey()).startsWith("org.apache.myfaces.extensions.cdi"))
+ {
+ info.append(" name:\t").append(property.getKey());
+ info.append(separator);
+
+ info.append(" value:\t").append(property.getValue());
+ info.append(separator);
+ info.append(separator);
+ }
+ }
+ String result = info.toString();
+
+ if("".equals(result))
+ {
+ return null;
+ }
+ return result;
+ }
+
+ private String getApplicationParameters(StartupEvent startupEvent)
+ {
+ StringBuilder info = new StringBuilder("");
+ for(Map.Entry<String, Serializable> contextParam : startupEvent.getApplicationParameters().entrySet())
+ {
+ info.append(" name:\t").append(contextParam.getKey());
+ info.append(separator);
+
+ info.append(" value:\t").append(contextParam.getValue());
+ info.append(separator);
+ info.append(separator);
+ }
+
+ String result = info.toString();
+
+ if("".equals(result))
+ {
+ return null;
+ }
+ return result;
+ }
+
+ private String detectActiveCdiVersion()
+ {
+ BeanManager cdiClass = BeanManagerProvider.getInstance().getBeanManager();
+
+ if(cdiClass == null)
+ {
+ return null;
+ }
+
+ String version = ClassUtils.getJarVersion(cdiClass.getClass());
+
+ String description = "Used CDI implementation: ";
+
+ if(cdiClass.getClass().getName().startsWith("org.apache"))
+ {
+ return description + "OpenWebBeans v" + version;
+ }
+ else if(cdiClass.getClass().getName().startsWith("org.jboss"))
+ {
+ return description + "Weld v" + version;
+ }
+ return null;
+
+ }
+
public String getCodiCoreInformation()
{
if(CodiInformation.VERSION != null && !CodiInformation.VERSION.startsWith("null"))
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/JsfModuleStartupObserver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/JsfModuleStartupObserver.java?rev=1054152&r1=1054151&r2=1054152&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/JsfModuleStartupObserver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/JsfModuleStartupObserver.java Fri Dec 31 17:53:12 2010
@@ -76,6 +76,7 @@ public class JsfModuleStartupObserver ex
if(jsfVersion != null)
{
info.append(jsfVersion);
+ info.append(separator);
}
info.append(separator);