You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2011/09/15 05:46:00 UTC
svn commit: r1170946 - in /geronimo/server/trunk/plugins:
bval/geronimo-bval-builder/src/main/java/org/apache/geronimo/bval/deployment/
connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/
connector-1_6/g...
Author: xuhaihong
Date: Thu Sep 15 03:45:59 2011
New Revision: 1170946
URL: http://svn.apache.org/viewvc?rev=1170946&view=rev
Log:
Update codes due to getInjectionTargets return value type changed to Set
Modified:
geronimo/server/trunk/plugins/bval/geronimo-bval-builder/src/main/java/org/apache/geronimo/bval/deployment/BValNamingBuilder.java
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java
geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaRefBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelper.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationHelper.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationHelper.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationHelper.java
geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/GBeanRefBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceRefBuilder.java
geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansNamingBuilder.java
Modified: geronimo/server/trunk/plugins/bval/geronimo-bval-builder/src/main/java/org/apache/geronimo/bval/deployment/BValNamingBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/bval/geronimo-bval-builder/src/main/java/org/apache/geronimo/bval/deployment/BValNamingBuilder.java?rev=1170946&r1=1170945&r2=1170946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/bval/geronimo-bval-builder/src/main/java/org/apache/geronimo/bval/deployment/BValNamingBuilder.java (original)
+++ geronimo/server/trunk/plugins/bval/geronimo-bval-builder/src/main/java/org/apache/geronimo/bval/deployment/BValNamingBuilder.java Thu Sep 15 03:45:59 2011
@@ -54,29 +54,29 @@ public class BValNamingBuilder extends A
super(defaultEnvironment);
}
- @Override
+ @Override
protected boolean willMergeEnvironment(JndiConsumer specDD, XmlObject plan) {
- // we always merge our information
- return true;
+ // we always merge our information
+ return true;
}
@Override
public void buildNaming(JndiConsumer specDD, XmlObject xmlObject1, Module module, Map<EARContext.Key, Object> sharedContext) throws DeploymentException {
try {
- // perform a lookup on the bound GBean and add this as a resource reference. If
- // we can't find one, then bind in a default validator.
+ // perform a lookup on the bound GBean and add this as a resource reference. If
+ // we can't find one, then bind in a default validator.
EARContext moduleContext = module.getEarContext();
AbstractName abstractName = moduleContext.getNaming().createChildName(module.getModuleName(), "ValidatorFactory", NameFactory.VALIDATOR_FACTORY);
- // this verifies that the bean exists...if not, bind to a default factory reference.
+ // this verifies that the bean exists...if not, bind to a default factory reference.
moduleContext.getGBeanInstance(abstractName);
String osgiJndiName = module.getEarContext().getNaming().toOsgiJndiName(abstractName);
String filter = "(osgi.jndi.service.name=" + osgiJndiName + ')';
- put("java:comp/ValidatorFactory", new ValidatorFactoryResourceReference(filter, ValidatorFactory.class.getName()), ReferenceType.RESOURCE_ENV, module.getJndiContext(), Collections.<InjectionTarget>emptyList(), sharedContext);
+ put("java:comp/ValidatorFactory", new ValidatorFactoryResourceReference(filter, ValidatorFactory.class.getName()), ReferenceType.RESOURCE_ENV, module.getJndiContext(), Collections.<InjectionTarget>emptySet(), sharedContext);
} catch (GBeanNotFoundException e) {
- // if we can't find one on the module, then bind to a default validator factory
- put("java:comp/ValidatorFactory", new DefaultValidatorFactoryReference(), ReferenceType.RESOURCE_ENV, module.getJndiContext(), Collections.<InjectionTarget>emptyList(), sharedContext);
+ // if we can't find one on the module, then bind to a default validator factory
+ put("java:comp/ValidatorFactory", new DefaultValidatorFactoryReference(), ReferenceType.RESOURCE_ENV, module.getJndiContext(), Collections.<InjectionTarget>emptySet(), sharedContext);
}
- put("java:comp/Validator", new DefaultValidatorReference(), ReferenceType.RESOURCE_ENV, module.getJndiContext(), Collections.<InjectionTarget>emptyList(), sharedContext);
+ put("java:comp/Validator", new DefaultValidatorReference(), ReferenceType.RESOURCE_ENV, module.getJndiContext(), Collections.<InjectionTarget>emptySet(), sharedContext);
}
@Override
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=1170946&r1=1170945&r2=1170946&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 Thu Sep 15 03:45:59 2011
@@ -138,13 +138,13 @@ public class AdminObjectRefBuilder exten
Set<AbstractNameQuery> query = new HashSet<AbstractNameQuery>();
query.add(transactionManager);
GBeanReference transactionManagerRef = new GBeanReference(module.getConfigId(), query, TransactionManager.class);
- put("java:comp/TransactionManager", transactionManagerRef, ReferenceType.RESOURCE_ENV, module.getJndiContext(), Collections.<InjectionTarget>emptyList(), sharedContext);
+ put("java:comp/TransactionManager", transactionManagerRef, ReferenceType.RESOURCE_ENV, module.getJndiContext(), Collections.<InjectionTarget>emptySet(), sharedContext);
GBeanReference transactionSynchronizationRef = new GBeanReference(module.getConfigId(), query, TransactionSynchronizationRegistry.class);
- put("java:comp/TransactionSynchronizationRegistry", transactionSynchronizationRef, ReferenceType.RESOURCE_ENV, module.getJndiContext(), Collections.<InjectionTarget>emptyList(), sharedContext);
+ put("java:comp/TransactionSynchronizationRegistry", transactionSynchronizationRef, ReferenceType.RESOURCE_ENV, module.getJndiContext(), Collections.<InjectionTarget>emptySet(), sharedContext);
}
- put("java:comp/Bundle", new BundleReference(), ReferenceType.RESOURCE_ENV, module.getJndiContext(), Collections.<InjectionTarget> emptyList(), sharedContext);
- put("java:comp/BundleContext", new BundleContextReference(), ReferenceType.RESOURCE_ENV, module.getJndiContext(), Collections.<InjectionTarget> emptyList(), sharedContext);
+ put("java:comp/Bundle", new BundleReference(), ReferenceType.RESOURCE_ENV, module.getJndiContext(), Collections.<InjectionTarget> emptySet(), sharedContext);
+ put("java:comp/BundleContext", new BundleContextReference(), ReferenceType.RESOURCE_ENV, module.getJndiContext(), Collections.<InjectionTarget> emptySet(), sharedContext);
XmlObject[] gerResourceEnvRefsUntyped = plan == null ? NO_REFS : plan.selectChildren(GER_ADMIN_OBJECT_REF_QNAME_SET);
Map<String, GerResourceEnvRefType> refMap = mapResourceEnvRefs(gerResourceEnvRefsUntyped);
@@ -470,7 +470,7 @@ public class AdminObjectRefBuilder exten
MessageDestinationRef messageDestinationRef = annotatedApp.getMessageDestinationRefMap().get(jndiName);
if (messageDestinationRef != null) {
if (method != null || field != null) {
- List<InjectionTarget> targets = messageDestinationRef.getInjectionTarget();
+ Set<InjectionTarget> targets = messageDestinationRef.getInjectionTarget();
if (!hasTarget(method, field, targets)) {
messageDestinationRef.getInjectionTarget().add(configureInjectionTarget(method, field));
}
@@ -481,7 +481,7 @@ public class AdminObjectRefBuilder exten
ResourceEnvRef resourceEnvRef = annotatedApp.getResourceEnvRefMap().get(jndiName);
if (resourceEnvRef != null) {
if (method != null || field != null) {
- List<InjectionTarget> targets = resourceEnvRef.getInjectionTarget();
+ Set<InjectionTarget> targets = resourceEnvRef.getInjectionTarget();
if (!hasTarget(method, field, targets)) {
resourceEnvRef.getInjectionTarget().add(configureInjectionTarget(method, field));
}
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.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/ResourceRefBuilder.java?rev=1170946&r1=1170945&r2=1170946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java Thu Sep 15 03:45:59 2011
@@ -442,7 +442,7 @@ public class ResourceRefBuilder extends
}
if (method != null || field != null) {
- List<InjectionTarget> targets = resourceRef.getInjectionTarget();
+ Set<InjectionTarget> targets = resourceRef.getInjectionTarget();
if (!hasTarget(method, field, targets)) {
resourceRef.getInjectionTarget().add(configureInjectionTarget(method, field));
}
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.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/datasource/deployment/DataSourceBuilder.java?rev=1170946&r1=1170945&r2=1170946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java Thu Sep 15 03:45:59 2011
@@ -60,7 +60,7 @@ public class DataSourceBuilder extends A
private final int defaultIdleTimeoutMinutes;
private final boolean defaultXATransactionCaching;
private final boolean defaultXAThreadCaching;
-
+
private final QNameSet dataSourceQNameSet;
public DataSourceBuilder(@ParamAttribute(name = "eeNamespaces") String[] eeNamespaces,
@@ -76,10 +76,10 @@ public class DataSourceBuilder extends A
this.defaultIdleTimeoutMinutes = defaultIdleTimeoutMinutes;
this.defaultXATransactionCaching = defaultXATransactionCaching;
this.defaultXAThreadCaching = defaultXAThreadCaching;
-
+
this.dataSourceQNameSet = buildQNameSet(eeNamespaces, "data-source");
}
-
+
public void buildNaming(JndiConsumer specDD, XmlObject plan, Module module, Map<EARContext.Key, Object> sharedContext) throws DeploymentException {
// step 1: process annotations and update deployment descriptor
@@ -111,25 +111,25 @@ public class DataSourceBuilder extends A
for (DataSource dataSource: dataSources) {
addDataSourceGBean(module, sharedContext, dataSource);
}
- }
+ }
}
private void addDataSourceGBean(Module module, Map<EARContext.Key, Object> sharedContext, DataSource ds)
throws DeploymentException {
-
+
String jndiName = ds.getKey();
-
+
if (lookupJndiContextMap(module, jndiName) != null) {
return;
}
-
+
String name = jndiName;
if (name.startsWith("java:")) {
name = name.substring(5);
}
-
+
EARContext earContext = module.getEarContext();
-
+
AbstractName dataSourceAbstractName = earContext.getNaming().createChildName(module.getModuleName(), name, "GBean");
DataSourceDescription dsDescription = createDataSourceDescription(ds);
@@ -144,12 +144,12 @@ public class DataSourceBuilder extends A
try {
Object ref = DataSourceService.buildReference(dsDescription);
- put(jndiName, ref, ReferenceType.DATA_SOURCE, module.getJndiContext(), Collections.<InjectionTarget>emptyList(), sharedContext);
+ put(jndiName, ref, ReferenceType.DATA_SOURCE, module.getJndiContext(), Collections.<InjectionTarget>emptySet(), sharedContext);
} catch (IOException e) {
throw new DeploymentException("Could not construct Reference for datasource " + dsDescription, e);
}
}
-
+
private DataSource processDefinition(DataSourceDefinition dsDefinition, JndiConsumer annotatedApp) {
DataSource dataSource = findDataSource(dsDefinition, annotatedApp);
boolean existing = dataSource != null;
@@ -157,71 +157,71 @@ public class DataSourceBuilder extends A
dataSource = new DataSource();
dataSource.setName(dsDefinition.name());
}
-
+
if (dataSource.getClassName() == null) {
dataSource.setClassName(dsDefinition.className());
}
-
+
if (dataSource.getDescription() == null && dsDefinition.description().trim().length() > 0) {
dataSource.setDescriptions(new Text[]{new Text(null, dsDefinition.description().trim())});
}
-
+
if (dataSource.getUser() == null && dsDefinition.user().trim().length() > 0) {
dataSource.setUser(dsDefinition.user().trim());
}
-
+
if (dataSource.getPassword() == null && dsDefinition.password().trim().length() > 0) {
dataSource.setPassword(dsDefinition.password().trim());
}
-
+
if (dataSource.getDatabaseName() == null && dsDefinition.databaseName().trim().length() > 0) {
dataSource.setDatabaseName(dsDefinition.databaseName().trim());
}
-
+
if (dataSource.getPortNumber() == null && dsDefinition.portNumber() != -1) {
dataSource.setPortNumber(dsDefinition.portNumber());
}
-
+
if (dataSource.getServerName() == null && dsDefinition.serverName().trim().length() > 0) {
dataSource.setServerName(dsDefinition.serverName().trim());
}
-
+
if (dataSource.getUrl() == null && dsDefinition.url().trim().length() > 0) {
dataSource.setUrl(dsDefinition.url().trim());
}
-
+
if (dataSource.getInitialPoolSize() == null && dsDefinition.initialPoolSize() != -1) {
dataSource.setInitialPoolSize(dsDefinition.initialPoolSize());
}
-
+
if (dataSource.getMaxPoolSize() == null && dsDefinition.maxPoolSize() != -1) {
dataSource.setMaxPoolSize(dsDefinition.maxPoolSize());
}
-
+
if (dataSource.getMinPoolSize() == null && dsDefinition.minPoolSize() != -1) {
dataSource.setMinPoolSize(dsDefinition.minPoolSize());
}
-
+
if (dataSource.getMaxIdleTime() == null && dsDefinition.maxIdleTime() != -1) {
dataSource.setMaxIdleTime(dsDefinition.maxIdleTime());
}
-
+
if (dataSource.getMaxStatements() == null && dsDefinition.maxStatements() != -1) {
dataSource.setMaxStatements(dsDefinition.maxStatements());
}
-
+
if (dataSource.getLoginTimeout() == null && dsDefinition.loginTimeout() != 0) {
dataSource.setLoginTimeout(dsDefinition.loginTimeout());
}
-
+
if (dataSource.getIsolationLevel() == null) {
- dataSource.setIsolationLevel(IsolationLevel.fromFlag(dsDefinition.isolationLevel()));
+ dataSource.setIsolationLevel(IsolationLevel.fromFlag(dsDefinition.isolationLevel()));
}
-
+
if (dataSource.getTransactional() == null) {
dataSource.setTransactional(dsDefinition.transactional());
}
-
+
if (dataSource.getProperty().size() == 0) {
String[] properties = dsDefinition.properties();
if (properties != null) {
@@ -231,7 +231,7 @@ public class DataSourceBuilder extends A
prop.setName(tokens[0]);
prop.setValue(tokens[1]);
dataSource.getProperty().add(prop);
- }
+ }
}
}
if (!existing) {
@@ -249,47 +249,47 @@ public class DataSourceBuilder extends A
return ds;
}
}
- return null;
+ return null;
}
-
+
private DataSourceDescription createDataSourceDescription(DataSource ds) {
DataSourceDescription dsDescription = new DataSourceDescription();
-
+
dsDescription.setName(ds.getName());
dsDescription.setClassName(ds.getClassName());
-
+
if (ds.getDescription() != null) {
dsDescription.setDescription(ds.getDescription().trim());
}
-
+
if (ds.getUrl() != null) {
dsDescription.setUrl(ds.getUrl().trim());
}
-
+
if (ds.getUser() != null) {
dsDescription.setUser(ds.getUser().trim());
}
-
+
if (ds.getPassword() != null) {
dsDescription.setPassword(ds.getPassword().trim());
}
-
+
if (ds.getDatabaseName() != null) {
dsDescription.setDatabaseName(ds.getDatabaseName().trim());
}
-
+
if (ds.getServerName() != null) {
dsDescription.setServerName(ds.getServerName().trim());
}
-
+
if (ds.getPortNumber() != null) {
dsDescription.setPortNumber(ds.getPortNumber());
}
-
+
if (ds.getLoginTimeout() != null) {
dsDescription.setLoginTimeout(ds.getLoginTimeout());
}
-
+
List<Property> props = ds.getProperty();
if (props != null) {
Map<String, String> properties = new HashMap<String, String>();
@@ -299,13 +299,13 @@ public class DataSourceBuilder extends A
}
dsDescription.setProperties(properties);
}
-
+
// transaction properties
-
+
if (ds.getTransactional()) {
dsDescription.setTransactional(ds.getTransactional());
}
-
+
if (ds.getIsolationLevel() != null) {
switch (ds.getIsolationLevel()) {
case TRANSACTION_READ_COMMITTED:
@@ -322,13 +322,13 @@ public class DataSourceBuilder extends A
break;
}
}
-
+
// pool properties
-
+
if (ds.getInitialPoolSize() != null) {
dsDescription.setInitialPoolSize(ds.getInitialPoolSize());
}
-
+
dsDescription.setMaxPoolSize(ds.getMaxPoolSize() != null? ds.getMaxPoolSize(): defaultMaxSize);
dsDescription.setMinPoolSize(ds.getMinPoolSize() != null? ds.getMinPoolSize(): defaultMinSize);
@@ -336,7 +336,7 @@ public class DataSourceBuilder extends A
if (ds.getMaxStatements() != null) {
dsDescription.setMaxStatements(ds.getMaxStatements());
}
-
+
dsDescription.setMaxIdleTime(ds.getMaxIdleTime() != null? ds.getMaxIdleTime(): defaultIdleTimeoutMinutes);
//geronimo specific properties
@@ -346,18 +346,18 @@ public class DataSourceBuilder extends A
return dsDescription;
}
-
+
public QNameSet getPlanQNameSet() {
- return QNameSet.EMPTY;
+ return QNameSet.EMPTY;
}
public QNameSet getSpecQNameSet() {
return dataSourceQNameSet;
}
-
+
@Override
public int getPriority() {
return 20;
}
-
+
}
Modified: geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaRefBuilder.java?rev=1170946&r1=1170945&r2=1170946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaRefBuilder.java Thu Sep 15 03:45:59 2011
@@ -50,7 +50,7 @@ public class CorbaRefBuilder extends Abs
private final SingleElementCollection<CorbaGBeanNameSource> corbaGBeanNameSourceCollection;
- public CorbaRefBuilder(@ParamAttribute(name = "defaultEnvironment")Environment defaultEnvironment,
+ public CorbaRefBuilder(@ParamAttribute(name = "defaultEnvironment")Environment defaultEnvironment,
@ParamReference(name="CorbaGBeanNameSource")Collection<CorbaGBeanNameSource> corbaGBeanNameSource) {
super(defaultEnvironment);
this.corbaGBeanNameSourceCollection = new SingleElementCollection<CorbaGBeanNameSource>(corbaGBeanNameSource);
@@ -70,8 +70,8 @@ public class CorbaRefBuilder extends Abs
AbstractNameQuery corbaName = corbaGBeanNameSource.getCorbaGBeanName();
if (corbaName != null) {
Artifact[] moduleId = module.getConfigId();
- put("java:comp/ORB", new ORBReference(moduleId, corbaName), ReferenceType.ORB, module.getJndiContext(), Collections.<InjectionTarget>emptyList(), sharedContext);
- put("java:comp/HandleDelegate", new HandleDelegateReference(moduleId, corbaName), ReferenceType.HANDLEDELEGATE, module.getJndiContext(), Collections.<InjectionTarget>emptyList(), sharedContext);
+ put("java:comp/ORB", new ORBReference(moduleId, corbaName), ReferenceType.ORB, module.getJndiContext(), Collections.<InjectionTarget>emptySet(), sharedContext);
+ put("java:comp/HandleDelegate", new HandleDelegateReference(moduleId, corbaName), ReferenceType.HANDLEDELEGATE, module.getJndiContext(), Collections.<InjectionTarget>emptySet(), sharedContext);
}
}
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelper.java?rev=1170946&r1=1170945&r2=1170946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelper.java Thu Sep 15 03:45:59 2011
@@ -22,7 +22,7 @@ package org.apache.geronimo.j2ee.deploym
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import java.util.List;
+import java.util.Set;
import org.apache.openejb.jee.InjectionTarget;
@@ -30,7 +30,7 @@ import org.apache.openejb.jee.InjectionT
* @version $Rev$ $Date$
*/
public class AnnotationHelper {
-
+
protected static String getName(String name, Method method, Field field) {
String resourceName = name;
if (resourceName.equals("")) {
@@ -44,7 +44,7 @@ public class AnnotationHelper {
}
return resourceName;
}
-
+
protected static String getInjectionJavaType(Method method, Field field) {
if (method != null) {
String injectionJavaType = method.getName().substring(3);
@@ -68,7 +68,7 @@ public class AnnotationHelper {
}
}
- protected static boolean hasTarget(Method method, Field field, List<InjectionTarget> targets) {
+ protected static boolean hasTarget(Method method, Field field, Set<InjectionTarget> targets) {
String injectionJavaType = getInjectionJavaType(method, field);
String injectionClass = getInjectionClass(method, field);
for (InjectionTarget target : targets) {
@@ -97,13 +97,13 @@ public class AnnotationHelper {
}
protected static String getJndiName(String name) {
- if (name.indexOf(':') == -1) {
+ if (name.indexOf(':') == -1) {
return "java:comp/env/" + name.trim();
} else {
return name.trim();
}
}
-
+
/**
* Validate deployment descriptor
*
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationHelper.java?rev=1170946&r1=1170945&r2=1170946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationHelper.java Thu Sep 15 03:45:59 2011
@@ -22,6 +22,7 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Set;
import javax.ejb.EJB;
import javax.ejb.EJBHome;
@@ -29,6 +30,7 @@ import javax.ejb.EJBLocalHome;
import javax.ejb.EJBs;
import javax.ejb.Local;
import javax.ejb.Remote;
+
import org.apache.openejb.jee.EjbLocalRef;
import org.apache.openejb.jee.EjbRef;
import org.apache.openejb.jee.EjbReference;
@@ -126,7 +128,7 @@ public final class EJBAnnotationHelper e
// Method-level annotation
for (Method method : methodsWithEJB) {
- EJB ejb = (EJB) method.getAnnotation(EJB.class);
+ EJB ejb = method.getAnnotation(EJB.class);
if (ejb != null) {
addEJB(annotatedApp, ejb, null, method, null);
}
@@ -134,7 +136,7 @@ public final class EJBAnnotationHelper e
// Field-level annotation
for (Field field : fieldsWithEJB) {
- EJB ejb = (EJB) field.getAnnotation(EJB.class);
+ EJB ejb = field.getAnnotation(EJB.class);
if (ejb != null) {
addEJB(annotatedApp, ejb, null, null, field);
}
@@ -261,10 +263,10 @@ public final class EJBAnnotationHelper e
String localRefName = getName(annotation.name(), method, field);
EjbLocalRef ejbLocalRef = annotatedApp.getEjbLocalRefMap().get(getJndiName(localRefName));
-
+
if (ejbLocalRef == null) {
try {
-
+
log.debug("addEJB(): Does not exist in DD: " + localRefName);
// Doesn't exist in deployment descriptor -- add new
@@ -300,19 +302,19 @@ public final class EJBAnnotationHelper e
if (!mappdedNameAnnotation.isEmpty()) {
ejbLocalRef.setMappedName(mappdedNameAnnotation);
}
-
+
// lookup
String lookupName = annotation.lookup();
if (!lookupName.isEmpty()) {
ejbLocalRef.setLookupName(lookupName);
}
-
+
// description
String descriptionAnnotation = annotation.description();
if (!descriptionAnnotation.isEmpty()) {
ejbLocalRef.setDescriptions(new Text[] {new Text(null, descriptionAnnotation)});
}
-
+
ejbLocalRef.setRefType(EjbReference.Type.LOCAL);
annotatedApp.getEjbLocalRef().add(ejbLocalRef);
}
@@ -320,10 +322,10 @@ public final class EJBAnnotationHelper e
log.debug("EJBAnnotationHelper: Exception caught while processing <ejb-local-ref>", e);
}
}
-
+
// injectionTarget
if (method != null || field != null) {
- List<InjectionTarget> targets = ejbLocalRef.getInjectionTarget();
+ Set<InjectionTarget> targets = ejbLocalRef.getInjectionTarget();
if (!hasTarget(method, field, targets)) {
ejbLocalRef.getInjectionTarget().add(configureInjectionTarget(method, field));
}
@@ -385,13 +387,13 @@ public final class EJBAnnotationHelper e
if (!lookupName.isEmpty()) {
ejbRef.setLookupName(lookupName);
}
-
+
// description
String descriptionAnnotation = annotation.description();
if (!descriptionAnnotation.isEmpty()) {
ejbRef.setDescriptions(new Text[] {new Text(null, descriptionAnnotation) });
}
-
+
ejbRef.setRefType(EjbReference.Type.REMOTE);
annotatedApp.getEjbRef().add(ejbRef);
}
@@ -399,10 +401,10 @@ public final class EJBAnnotationHelper e
log.debug("EJBAnnotationHelper: Exception caught while processing <ejb-ref>", e);
}
}
-
+
// injectionTarget
if (method != null || field != null) {
- List<InjectionTarget> targets = ejbRef.getInjectionTarget();
+ Set<InjectionTarget> targets = ejbRef.getInjectionTarget();
if (!hasTarget(method, field, targets)) {
ejbRef.getInjectionTarget().add(configureInjectionTarget(method, field));
}
@@ -464,25 +466,25 @@ public final class EJBAnnotationHelper e
if (!lookupName.isEmpty()) {
ejbRef.setLookupName(lookupName);
}
-
+
// description
String descriptionAnnotation = annotation.description();
if (!descriptionAnnotation.isEmpty()) {
ejbRef.setDescriptions(new Text[] {new Text(null, descriptionAnnotation) });
}
-
- ejbRef.setRefType(EjbReference.Type.UNKNOWN);
+
+ ejbRef.setRefType(EjbReference.Type.UNKNOWN);
//openejb sorts out ambiguous ejb refs.
annotatedApp.getEjbRef().add(ejbRef);
}
catch (Exception e) {
log.debug("EJBAnnotationHelper: Exception caught while processing <UNKNOWN>", e);
- }
+ }
}
-
+
// injectionTarget
if (method != null || field != null) {
- List<InjectionTarget> targets = ejbRef.getInjectionTarget();
+ Set<InjectionTarget> targets = ejbRef.getInjectionTarget();
if (!hasTarget(method, field, targets)) {
ejbRef.getInjectionTarget().add(configureInjectionTarget(method, field));
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationHelper.java?rev=1170946&r1=1170945&r2=1170946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationHelper.java Thu Sep 15 03:45:59 2011
@@ -23,11 +23,13 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
+import java.util.Set;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
import javax.persistence.PersistenceContexts;
import javax.persistence.PersistenceProperty;
+
import org.apache.geronimo.common.DeploymentException;
import org.apache.openejb.jee.InjectionTarget;
import org.apache.openejb.jee.JndiConsumer;
@@ -212,7 +214,7 @@ public final class PersistenceContextAnn
for (PersistenceContextRef persistenceContextRef : persistenceContextRefs) {
if (persistenceContextRef.getPersistenceContextRefName().trim().equals(persistenceContextRefName)) {
if (method != null || field != null) {
- List<InjectionTarget> targets = persistenceContextRef.getInjectionTarget();
+ Set<InjectionTarget> targets = persistenceContextRef.getInjectionTarget();
if (!hasTarget(method, field, targets)) {
persistenceContextRef.getInjectionTarget().add(configureInjectionTarget(method, field));
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationHelper.java?rev=1170946&r1=1170945&r2=1170946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationHelper.java Thu Sep 15 03:45:59 2011
@@ -23,9 +23,11 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
+import java.util.Set;
import javax.persistence.PersistenceUnit;
import javax.persistence.PersistenceUnits;
+
import org.apache.geronimo.common.DeploymentException;
import org.apache.openejb.jee.InjectionTarget;
import org.apache.openejb.jee.JndiConsumer;
@@ -210,7 +212,7 @@ public final class PersistenceUnitAnnota
for (PersistenceUnitRef persistenceUnitRef : persistenceUnitRefs) {
if (persistenceUnitRef.getPersistenceUnitRefName().trim().equals(persistenceUnitRefName)) {
if (method != null || field != null) {
- List<InjectionTarget> targets = persistenceUnitRef.getInjectionTarget();
+ Set<InjectionTarget> targets = persistenceUnitRef.getInjectionTarget();
if (!hasTarget(method, field, targets)) {
persistenceUnitRef.getInjectionTarget().add(configureInjectionTarget(method, field));
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java?rev=1170946&r1=1170945&r2=1170946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java Thu Sep 15 03:45:59 2011
@@ -150,7 +150,7 @@ public abstract class AbstractNamingBuil
* @param injectionTargets
* @param sharedContext
*/
- protected void put(String key, Object value, ReferenceType type, Map<JndiKey, Map<String, Object>> contexts, List<InjectionTarget> injectionTargets, Map<EARContext.Key, Object> sharedContext) {
+ protected void put(String key, Object value, ReferenceType type, Map<JndiKey, Map<String, Object>> contexts, Set<InjectionTarget> injectionTargets, Map<EARContext.Key, Object> sharedContext) {
key = normalize(key);
JndiKey jndiKey = keyFor(key);
Map<String, Object> scope = contexts.get(jndiKey);
@@ -334,7 +334,7 @@ public abstract class AbstractNamingBuil
return clazz;
}
- protected void addInjections(String jndiName, ReferenceType type, List<InjectionTarget> injectionTargets, Holder holder) {
+ protected void addInjections(String jndiName, ReferenceType type, Set<InjectionTarget> injectionTargets, Holder holder) {
for (InjectionTarget injectionTarget : injectionTargets) {
String targetName = injectionTarget.getInjectionTargetName().trim();
String targetClassName = injectionTarget.getInjectionTargetClass().trim();
@@ -354,7 +354,7 @@ public abstract class AbstractNamingBuil
return BASE_NAMING_QNAME;
}
- protected String inferAndCheckType(Module module, Bundle bundle, List<InjectionTarget> injectionTargets, String name, String typeName) throws DeploymentException {
+ protected String inferAndCheckType(Module module, Bundle bundle, Set<InjectionTarget> injectionTargets, String name, String typeName) throws DeploymentException {
Class<?> type = null;
if (typeName != null) {
try {
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java?rev=1170946&r1=1170945&r2=1170946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java Thu Sep 15 03:45:59 2011
@@ -22,7 +22,6 @@ import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -303,7 +302,7 @@ public class EnvironmentEntryBuilder ext
}
if (method != null || field != null) {
- List<InjectionTarget> targets = envEntry.getInjectionTarget();
+ Set<InjectionTarget> targets = envEntry.getInjectionTarget();
if (!hasTarget(method, field, targets)) {
envEntry.getInjectionTarget().add(configureInjectionTarget(method, field));
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/GBeanRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/GBeanRefBuilder.java?rev=1170946&r1=1170945&r2=1170946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/GBeanRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/GBeanRefBuilder.java Thu Sep 15 03:45:59 2011
@@ -93,7 +93,7 @@ public class GBeanRefBuilder extends Abs
String refName = gbeanRef.getRefName();
- put(refName, new GBeanReference(module.getConfigId(), queries, gBeanType), ReferenceType.GBEAN, module.getJndiContext(), Collections.<InjectionTarget> emptyList(), sharedContext);
+ put(refName, new GBeanReference(module.getConfigId(), queries, gBeanType), ReferenceType.GBEAN, module.getJndiContext(), Collections.<InjectionTarget> emptySet(), sharedContext);
}
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java?rev=1170946&r1=1170945&r2=1170946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java Thu Sep 15 03:45:59 2011
@@ -22,11 +22,12 @@ import java.lang.reflect.Method;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
+import java.util.Set;
import javax.annotation.Resource;
import javax.xml.namespace.QName;
+
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.service.EnvironmentBuilder;
import org.apache.geronimo.gbean.GBeanInfo;
@@ -241,7 +242,7 @@ public class SwitchingServiceRefBuilder
for (ServiceRef serviceRef : serviceRefs) {
if (serviceRef.getServiceRefName().trim().equals(resourceName)) {
if (method != null || field != null) {
- List<InjectionTarget> targets = serviceRef.getInjectionTarget();
+ Set<InjectionTarget> targets = serviceRef.getInjectionTarget();
if (!hasTarget(method, field, targets)) {
serviceRef.getInjectionTarget().add(configureInjectionTarget(method, field));
}
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java?rev=1170946&r1=1170945&r2=1170946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java Thu Sep 15 03:45:59 2011
@@ -119,12 +119,12 @@ public class EjbRefBuilder extends Abstr
addRefs(specDD, refMap, localRefMap, sharedContext);
- Map<String, List<InjectionTarget>> injectionsMap = new HashMap<String, List<InjectionTarget>>();
+ Map<String, Set<InjectionTarget>> injectionsMap = new HashMap<String, Set<InjectionTarget>>();
for (Map.Entry<String, EjbRef> entry: specDD.getEjbRefMap().entrySet()) {
injectionsMap.put(entry.getKey(), entry.getValue().getInjectionTarget());
}
for (Map.Entry<String, EjbLocalRef> entry: specDD.getEjbLocalRefMap().entrySet()) {
- List<InjectionTarget> injectionTargets = injectionsMap.get(entry.getKey());
+ Set<InjectionTarget> injectionTargets = injectionsMap.get(entry.getKey());
if (injectionTargets != null) {
injectionTargets.addAll(entry.getValue().getInjectionTarget());
} else {
@@ -186,9 +186,9 @@ public class EjbRefBuilder extends Abstr
ReferenceType referenceType = ejbLocalRefNames.contains(name) ? ReferenceType.EJB_LOCAL : ReferenceType.EJB;
String fullName = "java:" + name;
- List<InjectionTarget> injections = injectionsMap.get(fullName);
+ Set<InjectionTarget> injections = injectionsMap.get(fullName);
if(injections == null) {
- injections = Collections.<InjectionTarget>emptyList();
+ injections = Collections.<InjectionTarget>emptySet();
}
if (lookupJndiContextMap(module, fullName) != null) {
@@ -238,7 +238,7 @@ public class EjbRefBuilder extends Abstr
* so that they could be used in application client.
*
*/
- private void handleJndiUrlReference(Object value, ReferenceType ReferenceType, Map<JndiKey, Map<String, Object>> moduleJndiContext, Map<String, List<InjectionTarget>> injectionsMap,
+ private void handleJndiUrlReference(Object value, ReferenceType ReferenceType, Map<JndiKey, Map<String, Object>> moduleJndiContext, Map<String, Set<InjectionTarget>> injectionsMap,
Map<EARContext.Key, Object> sharedContext) {
if (!(value instanceof JndiUrlReference)) {
@@ -263,9 +263,9 @@ public class EjbRefBuilder extends Abstr
name = "java:" + name;
- List<InjectionTarget> injections = injectionsMap.get(name);
+ Set<InjectionTarget> injections = injectionsMap.get(name);
if (injections == null) {
- injections = Collections.emptyList();
+ injections = Collections.emptySet();
}
put(name, valueToConvert, ReferenceType, moduleJndiContext, injections, sharedContext);
}
Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceRefBuilder.java?rev=1170946&r1=1170945&r2=1170946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceRefBuilder.java Thu Sep 15 03:45:59 2011
@@ -134,7 +134,7 @@ public class PersistenceRefBuilder exten
String persistenceUnitRefName = gerPersistenceUnitRef.getPersistenceUnitRefName();
AbstractNameQuery persistenceUnitNameQuery = findPersistenceUnit(gerPersistenceUnitRef, localConfiguration);
PersistenceUnitReference reference = new PersistenceUnitReference(module.getConfigId(), persistenceUnitNameQuery);
- put(persistenceUnitRefName, reference, ReferenceType.PERSISTENCE_UNIT, module.getJndiContext(), Collections.<InjectionTarget>emptyList(), sharedContext);
+ put(persistenceUnitRefName, reference, ReferenceType.PERSISTENCE_UNIT, module.getJndiContext(), Collections.<InjectionTarget>emptySet(), sharedContext);
} catch (DeploymentException e) {
problems.add(e);
}
@@ -184,7 +184,7 @@ public class PersistenceRefBuilder exten
addProperties(gerPersistenceContextRef, properties);
AbstractNameQuery persistenceUnitNameQuery = findPersistenceUnit(gerPersistenceContextRef, localConfiguration);
PersistenceContextReference reference = new PersistenceContextReference(module.getConfigId(), persistenceUnitNameQuery, transactionScoped, properties);
- put(persistenceContextRefName, reference, ReferenceType.PERSISTENCE_CONTEXT, module.getJndiContext(), Collections.<InjectionTarget> emptyList(), sharedContext);
+ put(persistenceContextRefName, reference, ReferenceType.PERSISTENCE_CONTEXT, module.getJndiContext(), Collections.<InjectionTarget> emptySet(), sharedContext);
} catch (DeploymentException e) {
problems.add(e);
}
Modified: geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansNamingBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansNamingBuilder.java?rev=1170946&r1=1170945&r2=1170946&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansNamingBuilder.java (original)
+++ geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansNamingBuilder.java Thu Sep 15 03:45:59 2011
@@ -43,7 +43,7 @@ import org.apache.xmlbeans.XmlObject;
public class OpenWebBeansNamingBuilder extends AbstractNamingBuilder {
@Override
public void buildNaming(JndiConsumer specDD, XmlObject plan, Module module, Map<EARContext.Key, Object> sharedContext) throws DeploymentException {
- put("java:comp/BeanManager", new BeanManagerReference(), ReferenceType.RESOURCE_ENV, module.getJndiContext(), Collections.<InjectionTarget>emptyList(), sharedContext);
+ put("java:comp/BeanManager", new BeanManagerReference(), ReferenceType.RESOURCE_ENV, module.getJndiContext(), Collections.<InjectionTarget>emptySet(), sharedContext);
}
@Override