Author: rmannibucau
Date: Wed Dec 12 22:17:13 2012
New Revision: 1421017
URL: http://svn.apache.org/viewvc?rev=1421017&view=rev
Log:
TOMEE-647 generating a reference for all resourcebase
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1421017&r1=1421016&r2=1421017&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Wed Dec 12 22:17:13 2012
@@ -57,6 +57,7 @@ import org.apache.catalina.startup.SetNe
import org.apache.catalina.users.MemoryUserDatabase;
import org.apache.naming.ContextAccessController;
import org.apache.naming.ContextBindings;
+import org.apache.naming.ResourceEnvRef;
import org.apache.naming.ResourceRef;
import org.apache.openejb.AppContext;
import org.apache.openejb.BeanContext;
@@ -1114,23 +1115,23 @@ public class TomcatWebAppBuilder impleme
}
private static Reference createReference(final ResourceBase resource) {
+ final Reference ref;
if (resource instanceof ContextResource) {
final ContextResource cr = (ContextResource) resource;
- final Reference ref = new ResourceRef
- (resource.getType(), resource.getDescription(),
- cr.getScope(), cr.getAuth(),
- cr.getSingleton());
-
- final Iterator<String> params = resource.listProperties();
- while (params.hasNext()) {
- String paramName = params.next();
- String paramValue = (String) resource.getProperty(paramName);
- StringRefAddr refAddr = new StringRefAddr(paramName,
paramValue);
- ref.add(refAddr);
- }
- return ref;
+ ref = new ResourceRef(resource.getType(),
resource.getDescription(), cr.getScope(), cr.getAuth(), cr.getSingleton());
+ } else {
+ ref = new ResourceEnvRef(resource.getType());
}
- return null;
+
+ final Iterator<String> params = resource.listProperties();
+ while (params.hasNext()) {
+ String paramName = params.next();
+ String paramValue = (String) resource.getProperty(paramName);
+ StringRefAddr refAddr = new StringRefAddr(paramName, paramValue);
+ ref.add(refAddr);
+ }
+
+ return ref;
}
private static void updateInjections(final Collection<Injection>
injections, final ClassLoader classLoader, final boolean keepInjection) {
