You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2010/05/08 09:23:24 UTC
svn commit: r942332 -
/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
Author: djencks
Date: Sat May 8 07:23:24 2010
New Revision: 942332
URL: http://svn.apache.org/viewvc?rev=942332&view=rev
Log:
more non-admin object resource-env-refs
Modified:
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java?rev=942332&r1=942331&r2=942332&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java Sat May 8 07:23:24 2010
@@ -138,6 +138,14 @@ public class AdminObjectRefBuilder exten
// some other builder handled this entry already
continue;
}
+ String refType = getStringValue(resourceEnvRef.getResourceEnvRefType());
+ if (refType.equals("javax.ejb.TimerService") ||
+ refType.equals("javax.ejb.EntityContext") ||
+ refType.equals("javax.ejb.MessageDrivenContext") ||
+ refType.equals("javax.ejb.SessionContext") ||
+ refType.equals("javax.xml.ws.WebServiceContext")) {
+ continue;
+ }
addInjections(name, resourceEnvRef.getInjectionTargetArray(), componentContext);
String type = getStringValue(resourceEnvRef.getResourceEnvRefType());
GerResourceEnvRefType gerResourceEnvRef = refMap.remove(name);
@@ -379,11 +387,16 @@ public class AdminObjectRefBuilder exten
String resourceName = getResourceName(annotation, method, field);
String resourceType = getResourceType(annotation, method, field);
+ //ejb special cases
if (resourceType.equals("javax.ejb.SessionContext")) return true;
if (resourceType.equals("javax.ejb.MessageDrivenContext")) return true;
if (resourceType.equals("javax.ejb.EntityContext")) return true;
if (resourceType.equals("javax.ejb.TimerService")) return true;
+ //validator special cases
+ if (resourceType.equals("javax.validation.Validator")) return true;
+ if (resourceType.equals("javax.validation.ValidatorFactory")) return true;
+
//If it already exists in xml as a message-destination-ref or resource-env-ref, we are done.
MessageDestinationRefType[] messageDestinationRefs = annotatedApp.getMessageDestinationRefArray();
for (MessageDestinationRefType messageDestinationRef : messageDestinationRefs) {