You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rd...@apache.org on 2009/08/19 20:41:39 UTC
svn commit: r805921 -
/james/server/trunk/phoenix-deployment/src/java/org/apache/james/phoenix/PhoenixLoader.java
Author: rdonkin
Date: Wed Aug 19 18:41:39 2009
New Revision: 805921
URL: http://svn.apache.org/viewvc?rev=805921&view=rev
Log:
Improved naming
Modified:
james/server/trunk/phoenix-deployment/src/java/org/apache/james/phoenix/PhoenixLoader.java
Modified: james/server/trunk/phoenix-deployment/src/java/org/apache/james/phoenix/PhoenixLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/java/org/apache/james/phoenix/PhoenixLoader.java?rev=805921&r1=805920&r2=805921&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/java/org/apache/james/phoenix/PhoenixLoader.java (original)
+++ james/server/trunk/phoenix-deployment/src/java/org/apache/james/phoenix/PhoenixLoader.java Wed Aug 19 18:41:39 2009
@@ -38,15 +38,16 @@
private Logger logger;
- private final Map<String, Object> resources;
+ private final Map<String, Object> resourcesByName;
public PhoenixLoader() {
- resources = new HashMap<String, Object>();
- resources.put("org.apache.james.ServiceLocator", this);
+ resourcesByName = new HashMap<String, Object>();
+ resourcesByName.put("org.apache.james.ServiceLocator", this);
}
public Object get(String name) {
- return resources.get(name);
+ Object service = resourcesByName.get(name);
+ return service;
}
public void applicationFailure(Exception exception) {
@@ -60,14 +61,14 @@
* before initilisation any.
*/
public void applicationStarted() {
- for (Object resource : resources.values()) {
+ for (Object resource : resourcesByName.values()) {
Method[] methods = resource.getClass().getMethods();
for (Method method : methods) {
Resource resourceAnnotation = method.getAnnotation(Resource.class);
if (resourceAnnotation != null) {
final String name = resourceAnnotation.name();
final Object service = get(name);
- if (resource == null) {
+ if (service == null) {
if (logger.isWarnEnabled()) {
logger.warn("Unknown service: " + name);
}
@@ -75,6 +76,9 @@
try {
Object[] args = {service};
method.invoke(resource, args);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Set service " + service + " on " + resource);
+ }
} catch (IllegalAccessException e) {
throw new RuntimeException("Injection failed", e);
} catch (IllegalArgumentException e) {
@@ -88,13 +92,16 @@
}
try {
- for (Object object : resources.values()) {
- Method[] methods = object.getClass().getMethods();
+ for (Object resource : resourcesByName.values()) {
+ Method[] methods = resource.getClass().getMethods();
for (Method method : methods) {
PostConstruct postConstructAnnotation = method.getAnnotation(PostConstruct.class);
if (postConstructAnnotation != null) {
Object[] args = {};
- method.invoke(object, args);
+ method.invoke(resource, args);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Calling PostConstruct on " + resource);
+ }
}
}
}
@@ -121,7 +128,7 @@
public void blockAdded(BlockEvent event) {
final Object resource = event.getObject();
final String name = event.getName();
- resources.put(name, resource);
+ resourcesByName.put(name, resource);
}
/**
@@ -130,7 +137,7 @@
*/
public void blockRemoved(BlockEvent event) {
final String name = event.getName();
- resources.remove(name);
+ resourcesByName.remove(name);
}
public void enableLogging(Logger logger) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org