Revision: 15623
Author: gvagenas
Date: Fri Dec 3 10:12:08 2010
Log: Support injections in the DefaultSipInstanceManager
http://code.google.com/p/mobicents/source/detail?r=15623
Modified:
/branches/servers/sip-servlets/2.0/tomcat-7/src/main/java/org/mobicents/servlet/sip/annotations/DefaultSipInstanceManager.java
=======================================
---
/branches/servers/sip-servlets/2.0/tomcat-7/src/main/java/org/mobicents/servlet/sip/annotations/DefaultSipInstanceManager.java
Fri Nov 19 13:18:13 2010
+++
/branches/servers/sip-servlets/2.0/tomcat-7/src/main/java/org/mobicents/servlet/sip/annotations/DefaultSipInstanceManager.java
Fri Dec 3 10:12:08 2010
@@ -55,26 +55,26 @@
// Initialize fields annotations
Field[] fields = instance.getClass().getDeclaredFields();
for (int i = 0; i < fields.length; i++) {
- if (fields[i].isAnnotationPresent(Resource.class)) {
+ //First check against injections
+ if (injections != null &&
injections.containsKey(fields[i].getName())) {
+ lookupFieldResource(context, instance, fields[i],
+ injections.get(fields[i].getName()));
+ } else if (fields[i].isAnnotationPresent(Resource.class)) {
Resource annotation = (Resource)
fields[i].getAnnotation(Resource.class);
if(!lookupResourceInServletContext(instance, fields[i],
annotation.name()))
lookupFieldResource(context, instance, fields[i],
annotation.name());
- }
- if (fields[i].isAnnotationPresent(EJB.class)) {
+ } else if (fields[i].isAnnotationPresent(EJB.class)) {
EJB annotation = (EJB)
fields[i].getAnnotation(EJB.class);
lookupFieldResource(context, instance, fields[i],
annotation.name());
- }
- if (fields[i].isAnnotationPresent(WebServiceRef.class)) {
+ } else if
(fields[i].isAnnotationPresent(WebServiceRef.class)) {
WebServiceRef annotation =
(WebServiceRef)
fields[i].getAnnotation(WebServiceRef.class);
lookupFieldResource(context, instance, fields[i],
annotation.name());
- }
- if
(fields[i].isAnnotationPresent(PersistenceContext.class)) {
+ } else if
(fields[i].isAnnotationPresent(PersistenceContext.class)) {
PersistenceContext annotation =
(PersistenceContext)
fields[i].getAnnotation(PersistenceContext.class);
lookupFieldResource(context, instance, fields[i],
annotation.name());
- }
- if (fields[i].isAnnotationPresent(PersistenceUnit.class)) {
+ } else if
(fields[i].isAnnotationPresent(PersistenceUnit.class)) {
PersistenceUnit annotation =
(PersistenceUnit)
fields[i].getAnnotation(PersistenceUnit.class);
lookupFieldResource(context, instance, fields[i],
annotation.name());
@@ -114,9 +114,10 @@
Object lookedupResource = null;
boolean accessibility = false;
- if ((name != null) &&
- (name.length() > 0)) {
- lookedupResource = context.lookup(name);
+ String normalizedName = normalize(name);
+
+ if ((normalizedName != null) && (normalizedName.length() > 0)) {
+ lookedupResource = context.lookup(normalizedName);
} else {
if(field.getClass().getName().startsWith("javax.servlet.sip")) {
lookedupResource = context.lookup("sip/" +
instance.getClass().getName() + "/" + field.getName());
@@ -175,4 +176,11 @@
return null;
}
-}
+ private static String normalize(String jndiName){
+ if(jndiName != null && jndiName.startsWith("java:comp/env/")){
+ return jndiName.substring(14);
+ }
+ return jndiName;
+ }
+
+}